1
1
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-05-17 23:56:39 +00:00

Merge bitcoin/bitcoin#25246: Revert "build: more robustly check for fcf-protection support"

a7973bf8f46a7fe1c70d33a1098da6aba66baaed Revert "build: more robustly check for fcf-protection support" (fanquake)

Pull request description:

  We no-longer support Clang 7 (#24164). Introduced in #20720.

  This reverts commit e9189a750b237eba1befc6b16c12c2cee3e0176c.

ACKs for top commit:
  hebasto:
    re-ACK a7973bf8f46a7fe1c70d33a1098da6aba66baaed

Tree-SHA512: 82559637f21a97434ab29f908ebda1aada08b0786cbbf0b4d11085241942314c3f04261a624c5cd2cb3c94c99046b56626830da6b9775981ab4ba10d5979f998
This commit is contained in:
MacroFake 2022-05-31 09:36:54 +02:00
commit bd6c5e4108
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548

View File

@ -935,10 +935,7 @@ if test "$use_hardening" != "no"; then
AX_CHECK_COMPILE_FLAG([-Wstack-protector], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"])
AX_CHECK_COMPILE_FLAG([-fstack-protector-all], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"])
dnl -fcf-protection used with Clang 7 causes ld to emit warnings:
dnl ld: error: ... <corrupt x86 feature size: 0x8>
dnl Use CHECK_LINK_FLAG & --fatal-warnings to ensure we won't use the flag in this case.
AX_CHECK_LINK_FLAG([-fcf-protection=full], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fcf-protection=full"], [], [$LDFLAG_WERROR])
AX_CHECK_COMPILE_FLAG([-fcf-protection=full], [HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fcf-protection=full"])
case $host in
*mingw*)