aboutsummaryrefslogtreecommitdiff
path: root/libobjc
diff options
context:
space:
mode:
Diffstat (limited to 'libobjc')
-rw-r--r--libobjc/ChangeLog5
-rwxr-xr-xlibobjc/configure7
2 files changed, 10 insertions, 2 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index accabfb..5f42020 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-15 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR bootstrap/95147
+ * configure: Regenerated.
+
2020-05-14 H.J. Lu <hongjiu.lu@intel.com>
* configure: Regenerated.
diff --git a/libobjc/configure b/libobjc/configure
index 018c9db..6975a72 100755
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -3466,6 +3466,8 @@ case "$host" in
auto)
# Check if target supports multi-byte NOPs
# and if assembler supports CET insn.
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -fcf-protection"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3489,6 +3491,7 @@ else
enable_cet=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
;;
yes)
# Check if assembler supports CET.
@@ -10775,7 +10778,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10778 "configure"
+#line 10781 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10881,7 +10884,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10884 "configure"
+#line 10887 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H