Date: Thu, 31 May 2018 20:31:08 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471237 - head/emulators/citra/files Message-ID: <201805312031.w4VKV8Rf004678@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu May 31 20:31:08 2018 New Revision: 471237 URL: https://svnweb.freebsd.org/changeset/ports/471237 Log: emulators/citra: unbreak on aarch64 after r471186 externals/cryptopp/cryptopp/rijndael-simd.cpp:126:25: error: use of undeclared identifier 'vaeseq_u8' uint8x16_t r1 = vaeseq_u8(data, key); ^ externals/cryptopp/cryptopp/sha-simd.cpp:109:25: error: use of undeclared identifier 'vsha1cq_u32' uint32x4_t r1 = vsha1cq_u32 (data1, 0, data2); ^ Added: head/emulators/citra/files/patch-externals_cryptopp_CMakeLists.txt (contents, props changed) Added: head/emulators/citra/files/patch-externals_cryptopp_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/citra/files/patch-externals_cryptopp_CMakeLists.txt Thu May 31 20:31:08 2018 (r471237) @@ -0,0 +1,68 @@ +https://github.com/citra-emu/citra/pull/3790 + +--- externals/cryptopp/CMakeLists.txt.orig 2018-05-30 05:54:21 UTC ++++ externals/cryptopp/CMakeLists.txt +@@ -133,6 +133,7 @@ set(cryptopp_SOURCES + cryptopp/authenc.cpp + cryptopp/basecode.cpp + cryptopp/ccm.cpp ++ cryptopp/crc-simd.cpp + cryptopp/des.cpp + cryptopp/dessp.cpp + cryptopp/dll.cpp +@@ -140,6 +141,7 @@ set(cryptopp_SOURCES + cryptopp/ecp.cpp + cryptopp/filters.cpp + cryptopp/fips140.cpp ++ cryptopp/gcm-simd.cpp + cryptopp/gf2n.cpp + cryptopp/gfpcrypt.cpp + cryptopp/hex.cpp +@@ -151,6 +153,7 @@ set(cryptopp_SOURCES + cryptopp/modes.cpp + cryptopp/mqueue.cpp + cryptopp/nbtheory.cpp ++ cryptopp/neon-simd.cpp + cryptopp/oaep.cpp + cryptopp/osrng.cpp + cryptopp/pubkey.cpp +@@ -190,18 +193,39 @@ endif() + + if ((CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT CRYPTOPP_DISABLE_ASM) + check_cxx_compiler_flag(-msse2 CRYPTOPP_HAS_MSSE2) ++ check_cxx_compiler_flag(-mssse3 CRYPTOPP_HAS_MSSSE3) + check_cxx_compiler_flag(-msse4.1 CRYPTOPP_HAS_MSSE41) + check_cxx_compiler_flag(-msse4.2 CRYPTOPP_HAS_MSSE42) + check_cxx_compiler_flag(-maes CRYPTOPP_HAS_MAES) ++ check_cxx_compiler_flag(-mpclmul CRYPTOPP_HAS_PCLMUL) + check_cxx_compiler_flag(-msha CRYPTOPP_HAS_MSHA) ++ check_cxx_compiler_flag(-march=armv8-a+crc CRYPTOPP_HAS_ARMV8_CRC32) ++ check_cxx_compiler_flag(-march=armv8-a+crypto CRYPTOPP_HAS_ARMV8_CRYPTO) + if (CRYPTOPP_HAS_MSSE2) + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/sse-simd.cpp PROPERTIES COMPILE_FLAGS "-msse2") + endif() ++ if (CRYPTOPP_HAS_MSSSE3 AND CRYPTOPP_HAS_MAES AND CRYPTOPP_HAS_PCLMUL) ++ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/gcm-simd.cpp ++ PROPERTIES COMPILE_FLAGS "-mssse3 -maes -mpclmul") ++ endif() + if (CRYPTOPP_HAS_MSSE41 AND CRYPTOPP_HAS_MAES) + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/rijndael-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1 -maes") + endif() ++ if (CRYPTOPP_HAS_MSSE42) ++ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/crc-simd.cpp ++ PROPERTIES COMPILE_FLAGS "-msse4.2") ++ endif() + if (CRYPTOPP_HAS_MSSE42 AND CRYPTOPP_HAS_MSHA) + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/sha-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.2 -msha") ++ endif() ++ if (CRYPTOPP_HAS_ARMV8_CRC32) ++ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/crc-simd.cpp ++ PROPERTIES COMPILE_FLAGS "-march=armv8-a+crc") ++ endif() ++ if (CRYPTOPP_HAS_ARMV8_CRYPTO) ++ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/rijndael-simd.cpp ++ ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/sha-simd.cpp ++ PROPERTIES COMPILE_FLAGS "-march=armv8-a+crypto") + endif() + endif() +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805312031.w4VKV8Rf004678>