Skip to content

Commit 028476e

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

File tree

4 files changed

+1
-12
lines changed

4 files changed

+1
-12
lines changed

cmake/bitcoin-build-config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
/* Copyright year */
3030
#define COPYRIGHT_YEAR @COPYRIGHT_YEAR@
3131

32-
/* Define this symbol to build code that uses ARMv8 SHA-NI intrinsics */
33-
#cmakedefine ENABLE_ARM_SHANI 1
34-
3532
/* Define if external signer support is enabled */
3633
#cmakedefine ENABLE_EXTERNAL_SIGNER 1
3734

cmake/introspection.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,5 +217,4 @@ if(NOT MSVC)
217217
" HAVE_ARM_SHANI
218218
CXXFLAGS ${ARM_SHANI_CXXFLAGS}
219219
)
220-
set(ENABLE_ARM_SHANI ${HAVE_ARM_SHANI})
221220
endif()

src/crypto/sha256.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <bitcoin-build-config.h> // IWYU pragma: keep
6-
75
#include <crypto/sha256.h>
86
#include <crypto/common.h>
97

test/lint/test_runner/src/main.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -614,12 +614,7 @@ fn lint_includes_build_config() -> LintResult {
614614
"*.cpp",
615615
"*.h",
616616
])
617-
.args(get_pathspecs_default_excludes())
618-
.args([
619-
// These are exceptions which don't use bitcoin-build-config.h, rather CMakeLists.txt adds
620-
// these cppflags manually.
621-
":(exclude)src/crypto/sha256_arm_shani.cpp",
622-
]),
617+
.args(get_pathspecs_default_excludes()),
623618
)
624619
.expect("grep failed");
625620
git()

0 commit comments

Comments
 (0)