From 1e900528d2450177a50eed15b36d2e6c226c2f4e Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sun, 18 May 2025 16:13:32 +0100
Subject: [PATCH] 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.
---
 cmake/bitcoin-build-config.h.in   | 3 ---
 cmake/introspection.cmake         | 1 -
 test/lint/test_runner/src/main.rs | 1 -
 3 files changed, 5 deletions(-)

diff --git a/cmake/bitcoin-build-config.h.in b/cmake/bitcoin-build-config.h.in
index c79f5227c28..a3710a834ad 100644
--- 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
index 271dfcd0f84..585a6bcb0a0 100644
--- 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
index 62b7b2389f3..d87fab833e1 100644
--- 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");