@@ -, +, @@ 
---
 config/cet.m4       | 8 ++++++++
 libiberty/configure | 8 ++++++++
 2 files changed, 16 insertions(+)
--- a/config/cet.m4	
+++ a/config/cet.m4	
@@ -67,6 +67,14 @@ case "$host" in
     may_have_cet=yes
     cet_save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -fcf-protection"
+    case "$host" in
+      i[[345]]86-*-linux*)
+	if test x$enable_cet = xauto; then
+	  # Disable Intel CET by default for i386, i486 and i586 hosts.
+	  enable_cet=no
+	fi
+        ;;
+    esac;
     case "$enable_cet" in
       auto)
 	# Check if target supports multi-byte NOPs
--- a/libiberty/configure	
+++ a/libiberty/configure	
@@ -5429,6 +5429,14 @@ case "$host" in
     may_have_cet=yes
     cet_save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -fcf-protection"
+    case "$host" in
+      i[345]86-*-linux*)
+	if test x$enable_cet = xauto; then
+	  # Disable Intel CET by default for i386, i486 and i586 hosts.
+	  enable_cet=no
+	fi
+        ;;
+    esac;
     case "$enable_cet" in
       auto)
 	# Check if target supports multi-byte NOPs
--