Skip to content

Commit 1e90052

Browse files
committed
cmake: Remove ENABLE_X86_SHANI from bitcoin-build-config.h
`ENABLE_X86_SHANI` is already conditionally defined for the `bitcoin_crypto` target, so defining it in `bitcoin-build-config.h` is redundant.
1 parent 8689628 commit 1e90052

File tree

3 files changed

+0
-5
lines changed

3 files changed

+0
-5
lines changed

cmake/bitcoin-build-config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
/* Define to 1 to enable wallet functions. */
4343
#cmakedefine ENABLE_WALLET 1
4444

45-
/* Define this symbol to build code that uses x86 SHA-NI intrinsics */
46-
#cmakedefine ENABLE_X86_SHANI 1
47-
4845
/* Define to 1 if you have the declaration of `fork', and to 0 if you don't.
4946
*/
5047
#cmakedefine01 HAVE_DECL_FORK

cmake/introspection.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ if(NOT MSVC)
200200
" HAVE_X86_SHANI
201201
CXXFLAGS ${X86_SHANI_CXXFLAGS}
202202
)
203-
set(ENABLE_X86_SHANI ${HAVE_X86_SHANI})
204203

205204
# Check for ARMv8 SHA-NI intrinsics.
206205
set(ARM_SHANI_CXXFLAGS -march=armv8-a+crypto)

test/lint/test_runner/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,6 @@ fn lint_includes_build_config() -> LintResult {
619619
// These are exceptions which don't use bitcoin-build-config.h, rather CMakeLists.txt adds
620620
// these cppflags manually.
621621
":(exclude)src/crypto/sha256_arm_shani.cpp",
622-
":(exclude)src/crypto/sha256_x86_shani.cpp",
623622
]),
624623
)
625624
.expect("grep failed");

0 commit comments

Comments
 (0)