about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2024-01-05 10:41:03 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2024-01-09 13:55:51 -0300
commita0cfc48e8a67506e3f0b2d3ea5e04b45408b3683 (patch)
tree3519bb0197c69bbbefbb5d611b11c03e87a1187d /sysdeps
parent25f1e16ef03a6a8fb1701c4647d46c564480d88c (diff)
downloadglibc-a0cfc48e8a67506e3f0b2d3ea5e04b45408b3683.tar.gz
glibc-a0cfc48e8a67506e3f0b2d3ea5e04b45408b3683.tar.xz
glibc-a0cfc48e8a67506e3f0b2d3ea5e04b45408b3683.zip
i386: Fail if configured with --enable-cet
Since it is only supported for x86_64.

Checked on i686-linux-gnu.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/i386/configure8
-rw-r--r--sysdeps/i386/configure.ac7
2 files changed, 8 insertions, 7 deletions
diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure
index cd63d314fa..84656cef6e 100644
--- 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 b7d9436557..7f68e6210a 100644
--- 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.