aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/ChangeLog13
-rw-r--r--config/cet.m416
-rw-r--r--config/plugins.m42
3 files changed, 28 insertions, 3 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index 721c47e..8a5dcb3 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,16 @@
+2018-04-05 H.J. Lu <hongjiu.lu@intel.com>
+
+ Sync with GCC
+ 2018-04-05 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR gas/22318
+ * plugins.m4 (AC_PLUGINS): Use dlsym to check if libdl is needed.
+
+ 2018-02-14 Igor Tsimbalist <igor.v.tsimbalist@intel.com>
+
+ PR target/84148
+ * cet.m4: Check if target support multi-byte NOPS (SSE).
+
2018-02-06 Eric Botcazou <ebotcazou@adacore.com>
* gcc-plugin.m4 (GCC_ENABLE_PLUGINS): Remove -q option passed to grep.
diff --git a/config/cet.m4 b/config/cet.m4
index 715f4bd..23dd1f7 100644
--- a/config/cet.m4
+++ b/config/cet.m4
@@ -5,15 +5,24 @@ dnl
AC_DEFUN([GCC_CET_FLAGS],[dnl
GCC_ENABLE(cet, default, ,[enable Intel CET in target libraries],
permit yes|no|default)
+AC_MSG_CHECKING([for CET support])
+
case "$host" in
i[[34567]]86-*-linux* | x86_64-*-linux*)
case "$enable_cet" in
default)
- # Check if assembler supports CET.
+ # Check if target supports multi-byte NOPs
+ # and if assembler supports CET insn.
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[],
- [asm ("setssbsy");])],
+ [
+#if !defined(__SSE2__)
+#error target does not support multi-byte NOPs
+#else
+asm ("setssbsy");
+#endif
+ ])],
[enable_cet=yes],
[enable_cet=no])
;;
@@ -34,5 +43,8 @@ case "$host" in
esac
if test x$enable_cet = xyes; then
$1="-fcf-protection -mcet"
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
fi
])
diff --git a/config/plugins.m4 b/config/plugins.m4
index 513c690..c6acebc 100644
--- a/config/plugins.m4
+++ b/config/plugins.m4
@@ -16,6 +16,6 @@ AC_DEFUN([AC_PLUGINS],
[plugins=$maybe_plugins]
)
if test "$plugins" = "yes"; then
- AC_SEARCH_LIBS([dlopen], [dl])
+ AC_SEARCH_LIBS([dlsym], [dl])
fi
])