From 06a84499d7e5100686c4757e68df3223bc2ed716 Mon Sep 17 00:00:00 2001 From: XMRig Date: Mon, 22 Oct 2018 23:08:29 +0700 Subject: [PATCH] Fixed MSYS2 build & copyright --- src/Summary.cpp | 1 + src/common/xmrig.h | 1 + src/core/cpu/AdvancedCpuInfo.cpp | 1 + src/crypto/Asm.cpp | 1 + src/crypto/asm/win64/cnv2_main_loop.S | 6 ++++++ src/crypto/asm/win64/cnv2_main_loop.asm | 7 +++++++ src/workers/CpuThread.cpp | 1 + 7 files changed, 18 insertions(+) diff --git a/src/Summary.cpp b/src/Summary.cpp index 71c456a5..f010d70b 100644 --- a/src/Summary.cpp +++ b/src/Summary.cpp @@ -5,6 +5,7 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 SChernykh * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify diff --git a/src/common/xmrig.h b/src/common/xmrig.h index 840a9148..20306d1c 100644 --- a/src/common/xmrig.h +++ b/src/common/xmrig.h @@ -5,6 +5,7 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 SChernykh * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify diff --git a/src/core/cpu/AdvancedCpuInfo.cpp b/src/core/cpu/AdvancedCpuInfo.cpp index 74ddd9e8..a9152136 100644 --- a/src/core/cpu/AdvancedCpuInfo.cpp +++ b/src/core/cpu/AdvancedCpuInfo.cpp @@ -5,6 +5,7 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 SChernykh * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify diff --git a/src/crypto/Asm.cpp b/src/crypto/Asm.cpp index 9ef04bf9..88812c6c 100644 --- a/src/crypto/Asm.cpp +++ b/src/crypto/Asm.cpp @@ -5,6 +5,7 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 SChernykh * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify diff --git a/src/crypto/asm/win64/cnv2_main_loop.S b/src/crypto/asm/win64/cnv2_main_loop.S index 78eb1185..1be27c64 100644 --- a/src/crypto/asm/win64/cnv2_main_loop.S +++ b/src/crypto/asm/win64/cnv2_main_loop.S @@ -3,6 +3,7 @@ .section .text .global cnv2_mainloop_ivybridge_asm .global cnv2_mainloop_ryzen_asm +.global cnv2_mainloop_bulldozer_asm .global cnv2_double_mainloop_sandybridge_asm ALIGN 16 @@ -15,6 +16,11 @@ cnv2_mainloop_ryzen_asm: #include "../cnv2_main_loop_ryzen.inc" ret 0 +ALIGN 16 +cnv2_mainloop_bulldozer_asm: + #include "../cnv2_main_loop_bulldozer.inc" + ret 0 + ALIGN 16 cnv2_double_mainloop_sandybridge_asm: #include "../cnv2_double_main_loop_sandybridge.inc" diff --git a/src/crypto/asm/win64/cnv2_main_loop.asm b/src/crypto/asm/win64/cnv2_main_loop.asm index d9522267..557f1ab6 100644 --- a/src/crypto/asm/win64/cnv2_main_loop.asm +++ b/src/crypto/asm/win64/cnv2_main_loop.asm @@ -1,6 +1,7 @@ _TEXT_CNV2_MAINLOOP SEGMENT PAGE READ EXECUTE PUBLIC cnv2_mainloop_ivybridge_asm PUBLIC cnv2_mainloop_ryzen_asm +PUBLIC cnv2_mainloop_bulldozer_asm PUBLIC cnv2_double_mainloop_sandybridge_asm ALIGN 64 @@ -15,6 +16,12 @@ cnv2_mainloop_ryzen_asm PROC ret 0 cnv2_mainloop_ryzen_asm ENDP +ALIGN 64 +cnv2_mainloop_bulldozer_asm PROC + INCLUDE cnv2_main_loop_bulldozer.inc + ret 0 +cnv2_mainloop_bulldozer_asm ENDP + ALIGN 64 cnv2_double_mainloop_sandybridge_asm PROC INCLUDE cnv2_double_main_loop_sandybridge.inc diff --git a/src/workers/CpuThread.cpp b/src/workers/CpuThread.cpp index aee26b0d..b6e91a65 100644 --- a/src/workers/CpuThread.cpp +++ b/src/workers/CpuThread.cpp @@ -5,6 +5,7 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 SChernykh * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify