cmake: Remove ENABLE_X86_SHANI from bitcoin-build-config.h

hebasto · hebasto · commit 1e900528d245 · 2025-05-20T11:12:56.000+01:00
`ENABLE_X86_SHANI` is already conditionally defined for the
`bitcoin_crypto` target, so defining it in `bitcoin-build-config.h` is
redundant.
diff --git a/cmake/bitcoin-build-config.h.in b/cmake/bitcoin-build-config.h.in
@@ -42,9 +42,6 @@
 /* Define to 1 to enable wallet functions. */
 #cmakedefine ENABLE_WALLET 1
 
-/* Define this symbol to build code that uses x86 SHA-NI intrinsics */
-#cmakedefine ENABLE_X86_SHANI 1
-
 /* Define to 1 if you have the declaration of `fork', and to 0 if you don't.
    */
 #cmakedefine01 HAVE_DECL_FORK
diff --git a/cmake/introspection.cmake b/cmake/introspection.cmake
@@ -200,7 +200,6 @@ if(NOT MSVC)
     " HAVE_X86_SHANI
     CXXFLAGS ${X86_SHANI_CXXFLAGS}
   )
-  set(ENABLE_X86_SHANI ${HAVE_X86_SHANI})
 
   # Check for ARMv8 SHA-NI intrinsics.
   set(ARM_SHANI_CXXFLAGS -march=armv8-a+crypto)
diff --git a/test/lint/test_runner/src/main.rs b/test/lint/test_runner/src/main.rs
@@ -619,7 +619,6 @@ fn lint_includes_build_config() -> LintResult {
                     // These are exceptions which don't use bitcoin-build-config.h, rather CMakeLists.txt adds
                     // these cppflags manually.
                     ":(exclude)src/crypto/sha256_arm_shani.cpp",
-                    ":(exclude)src/crypto/sha256_x86_shani.cpp",
                 ]),
         )
         .expect("grep failed");

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,6 @@ if(NOT MSVC)`
`200`	`200`	`" HAVE_X86_SHANI`
`201`	`201`	`CXXFLAGS ${X86_SHANI_CXXFLAGS}`
`202`	`202`	`)`
`203`		`- set(ENABLE_X86_SHANI ${HAVE_X86_SHANI})`
`204`	`203`
`205`	`204`	`# Check for ARMv8 SHA-NI intrinsics.`
`206`	`205`	`set(ARM_SHANI_CXXFLAGS -march=armv8-a+crypto)`
Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,6 @@ fn lint_includes_build_config() -> LintResult {`
`619`	`619`	`// These are exceptions which don't use bitcoin-build-config.h, rather CMakeLists.txt adds`
`620`	`620`	`// these cppflags manually.`
`621`	`621`	`":(exclude)src/crypto/sha256_arm_shani.cpp",`
`622`		`- ":(exclude)src/crypto/sha256_x86_shani.cpp",`
`623`	`622`	`]),`
`624`	`623`	`)`
`625`	`624`	`.expect("grep failed");`