Skip to content

Commit bd6c5e4

Browse files
author
MacroFake
committed
Merge bitcoin#25246: Revert "build: more robustly check for fcf-protection support"
a7973bf Revert "build: more robustly check for fcf-protection support" (fanquake) Pull request description: We no-longer support Clang 7 (bitcoin#24164). Introduced in bitcoin#20720. This reverts commit e9189a7. ACKs for top commit: hebasto: re-ACK a7973bf Tree-SHA512: 82559637f21a97434ab29f908ebda1aada08b0786cbbf0b4d11085241942314c3f04261a624c5cd2cb3c94c99046b56626830da6b9775981ab4ba10d5979f998
2 parents b9ef5a1 + a7973bf commit bd6c5e4

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

configure.ac

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -935,10 +935,7 @@ if test "$use_hardening" != "no"; then
935935
AX_CHECK_COMPILE_FLAG([-Wstack-protector], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"])
936936
AX_CHECK_COMPILE_FLAG([-fstack-protector-all], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"])
937937

938-
dnl -fcf-protection used with Clang 7 causes ld to emit warnings:
939-
dnl ld: error: ... <corrupt x86 feature size: 0x8>
940-
dnl Use CHECK_LINK_FLAG & --fatal-warnings to ensure we won't use the flag in this case.
941-
AX_CHECK_LINK_FLAG([-fcf-protection=full], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fcf-protection=full"], [], [$LDFLAG_WERROR])
938+
AX_CHECK_COMPILE_FLAG([-fcf-protection=full], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fcf-protection=full"])
942939

943940
case $host in
944941
*mingw*)

0 commit comments

Comments
 (0)