i386: Fail if configured with --enable-cet

Since it is only supported for x86_64.

Checked on i686-linux-gnu.

(cherry picked from commit a0cfc48e8a67506e3f0b2d3ea5e04b45408b3683)

diff --git a/INSTALL b/INSTALL
index d583ca7b4452912273f1435af8f861c4403b2c6b..4365d909a20b35373eabe699097a59d5b78205c3 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -147,8 +147,7 @@ if ‘CFLAGS’ is specified it must enable optimization.  For example:
      ‘--enable-cet=permissive’, CET is disabled when dlopening a non CET
      enabled shared library in CET enabled application.
 
-     NOTE: ‘--enable-cet’ has been tested for x86_64 and x32 on non-CET
-     and CET processors.
+     NOTE: ‘--enable-cet’ is only supported on x86_64 and x32.
 
 ‘--enable-memory-tagging’
      Enable memory tagging support if the architecture supports it.

diff --git a/NEWS b/NEWS
index 65b5903622a10176d19cdf796b404d8e3fa33990..77e89c96195be01c5534a79e37a2607d83df9df0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,8 +7,8 @@ using `glibc' in the "product" field.
 \f
 Version 2.38.1
 
-* Sync with Linux kernel 6.6 shadow stack interface.  Since only x86-64
-  is supported, --enable-cet is ignored for i386.
+* Sync with Linux kernel 6.6 shadow stack interface.  The --enable-cet
+  configure option in only supported on x86-64.
 
 Deprecated and removed features, and other changes affecting compatibility:
 

diff --git a/manual/install.texi b/manual/install.texi
index 2af7f35c4e39ac7f9261da188f13fa59968c60c9..479a49c7dc5c0d9cbd85ba9655546fd93e501be3 100644 (file)
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -175,8 +175,7 @@ enabled shared library in CET enabled application.  With
 @option{--enable-cet=permissive}, CET is disabled when dlopening a
 non CET enabled shared library in CET enabled application.
 
-NOTE: @option{--enable-cet} has been tested for x86_64 and x32
-on non-CET and CET processors.
+NOTE: @option{--enable-cet} is only supported on x86_64 and x32.
 
 @item --enable-memory-tagging
 Enable memory tagging support if the architecture supports it.  When

diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure
index cd63d314faf6265e1e33aa439e1d3198e47b1705..84656cef6efb83d2dd40830bc6c897d285fc8868 100644 (file)
--- a/sysdeps/i386/configure
+++ b/sysdeps/i386/configure
@@ -1,10 +1,10 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/i386.
 
-# CET is only supported for x86-64.  Set enable-cet to "no" to allow
-# "ifneq ($(enable-cet),no)" in x86 Makefiles.
-config_vars="$config_vars
-enable-cet = "no""
+# CET is only supported for x86-64.
+if test $enable_cet != no; then
+  as_fn_error $? "\"CET is only supported on x86_64 or x32\"" "$LINENO" 5
+fi
 
 # We no longer support i386 since it lacks the atomic instructions
 # required to implement NPTL threading.

diff --git a/sysdeps/i386/configure.ac b/sysdeps/i386/configure.ac
index b7d94365573307f0c6e7c0222edbc16bdda13cf8..7f68e6210a81f328a831ea6c79a4a3bef838009f 100644 (file)
--- a/sysdeps/i386/configure.ac
+++ b/sysdeps/i386/configure.ac
@@ -1,9 +1,10 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/i386.
 
-# CET is only supported for x86-64.  Set enable-cet to "no" to allow
-# "ifneq ($(enable-cet),no)" in x86 Makefiles.
-LIBC_CONFIG_VAR([enable-cet], ["no"])
+# CET is only supported for x86-64.
+if test $enable_cet != no; then
+  AC_MSG_ERROR(["CET is only supported on x86_64 or x32"])
+fi
 
 # We no longer support i386 since it lacks the atomic instructions
 # required to implement NPTL threading.