diff --git a/cmake/bitcoin-build-config.h.in b/cmake/bitcoin-build-config.h.in index a3710a834ad..bf3ddcd7ff6 100644 --- a/cmake/bitcoin-build-config.h.in +++ b/cmake/bitcoin-build-config.h.in @@ -29,9 +29,6 @@ /* Copyright year */ #define COPYRIGHT_YEAR @COPYRIGHT_YEAR@ -/* Define this symbol to build code that uses ARMv8 SHA-NI intrinsics */ -#cmakedefine ENABLE_ARM_SHANI 1 - /* Define if external signer support is enabled */ #cmakedefine ENABLE_EXTERNAL_SIGNER 1 diff --git a/cmake/introspection.cmake b/cmake/introspection.cmake index 585a6bcb0a0..fb94a120553 100644 --- a/cmake/introspection.cmake +++ b/cmake/introspection.cmake @@ -217,5 +217,4 @@ if(NOT MSVC) " HAVE_ARM_SHANI CXXFLAGS ${ARM_SHANI_CXXFLAGS} ) - set(ENABLE_ARM_SHANI ${HAVE_ARM_SHANI}) endif() diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp index 09c5d3123e8..902ebf18a6f 100644 --- a/src/crypto/sha256.cpp +++ b/src/crypto/sha256.cpp @@ -2,8 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include // IWYU pragma: keep - #include #include diff --git a/test/lint/test_runner/src/main.rs b/test/lint/test_runner/src/main.rs index d87fab833e1..c2f82573352 100644 --- a/test/lint/test_runner/src/main.rs +++ b/test/lint/test_runner/src/main.rs @@ -614,12 +614,7 @@ fn lint_includes_build_config() -> LintResult { "*.cpp", "*.h", ]) - .args(get_pathspecs_default_excludes()) - .args([ - // 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", - ]), + .args(get_pathspecs_default_excludes()), ) .expect("grep failed"); git()