+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.
 
 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])
        ;;
 esac
 if test x$enable_cet = xyes; then
   $1="-fcf-protection -mcet"
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
 fi
 ])
 
     [plugins=$maybe_plugins]
   )
   if test "$plugins" = "yes"; then
-    AC_SEARCH_LIBS([dlopen], [dl])
+    AC_SEARCH_LIBS([dlsym], [dl])
   fi
 ])