Date: Sunday, December 15, 2019 @ 07:15:14 Author: kpcyrd Revision: 537717
Correctly disable AVX2 instructions Modified: monero/trunk/PKGBUILD Deleted: monero/trunk/no-avx2.patch ---------------+ PKGBUILD | 9 +++------ no-avx2.patch | 25 ------------------------- 2 files changed, 3 insertions(+), 31 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-12-15 05:27:38 UTC (rev 537716) +++ PKGBUILD 2019-12-15 07:15:14 UTC (rev 537717) @@ -17,8 +17,7 @@ "git+https://github.com/trezor/trezor-common.git" "git+https://github.com/tevador/randomx" "monero.sysusers" - "monero.tmpfiles" - "no-avx2.patch") + "monero.tmpfiles") sha512sums=('SKIP' 'SKIP' 'SKIP' @@ -26,8 +25,7 @@ 'SKIP' 'SKIP' '2e4ecf3f305dab46e166f50c0451dd969927b485df544aebcf8115a65444573e6d57a8ac6bea64ce5ab4b5cce2c70f913d9ac3bce561c59acf89851edc76a22c' - 'ae3c300548e6ba5fdf6a203146e5dcaf1955c3e19820c0bb3a73bb70ec5629a3af00d43dac95b6f3832ded5c480e872d829981a63206016d4a64f3940b713357' - 'a6ed21f23c8951e36200845421d395c1a56a064af64435ac3eef1e516678997fda4b452cd1da440e8fac7437971f81a901511dac27bbb1ff35ed631dcfe47c70') + 'ae3c300548e6ba5fdf6a203146e5dcaf1955c3e19820c0bb3a73bb70ec5629a3af00d43dac95b6f3832ded5c480e872d829981a63206016d4a64f3940b713357') prepare() { cd "${pkgname}" @@ -38,13 +36,12 @@ git config submodule.external/trezor-common.url "$srcdir/trezor-common" git config submodule.external/randomx.url "$srcdir/randomx" git submodule update - patch --forward --strip=1 --input="${srcdir}/no-avx2.patch" } build() { cd "${pkgname}" mkdir -p build && cd build - cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release ../ + cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release -D ARCH=default ../ make } Deleted: no-avx2.patch =================================================================== --- no-avx2.patch 2019-12-15 05:27:38 UTC (rev 537716) +++ no-avx2.patch 2019-12-15 07:15:14 UTC (rev 537717) @@ -1,25 +0,0 @@ -diff --git a/external/randomx/CMakeLists.txt b/external/randomx/CMakeLists.txt -index 40f0354..3bacafa 100644 ---- a/external/randomx/CMakeLists.txt -+++ b/external/randomx/CMakeLists.txt -@@ -102,20 +102,6 @@ if (ARCH_ID STREQUAL "x86_64" OR ARCH_ID STREQUAL "x86-64" OR ARCH_ID STREQUAL " - set_property(SOURCE src/jit_compiler_x86_static.S PROPERTY LANGUAGE C) - set_property(SOURCE src/jit_compiler_x86_static.S PROPERTY XCODE_EXPLICIT_FILE_TYPE sourcecode.asm) - -- if(ARCH STREQUAL "native") -- add_flag("-march=native") -- else() -- # default build has hardware AES enabled (software AES can be selected at runtime) -- add_flag("-maes") -- check_c_compiler_flag(-mssse3 HAVE_SSSE3) -- if(HAVE_SSSE3) -- set_source_files_properties(src/argon2_ssse3.c COMPILE_FLAGS -mssse3) -- endif() -- check_c_compiler_flag(-mavx2 HAVE_AVX2) -- if(HAVE_AVX2) -- set_source_files_properties(src/argon2_avx2.c COMPILE_FLAGS -mavx2) -- endif() -- endif() - endif() - - # PowerPC