diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2024-01-03 12:09:23 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2024-01-04 06:08:55 -0800 |
| commit | bbfb54930cdd85269504a34b362e77a3ac2a207a (patch) | |
| tree | 1e6790858eae27d2762760ca2a3315db2afa8f17 /sysdeps/i386 | |
| parent | 0d4a2f3576ebd92ca0001645a533bf70289f264e (diff) | |
| download | glibc-bbfb54930cdd85269504a34b362e77a3ac2a207a.tar.gz glibc-bbfb54930cdd85269504a34b362e77a3ac2a207a.tar.xz glibc-bbfb54930cdd85269504a34b362e77a3ac2a207a.zip | |
i386: Ignore --enable-cet
Since shadow stack is only supported for x86-64, ignore --enable-cet for i386. Always setting $(enable-cet) for i386 to "no" to support ifneq ($(enable-cet),no) in x86 Makefiles. We can't use ifeq ($(enable-cet),yes) since $(enable-cet) can be "yes", "no" or "permissive". Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/i386')
| -rw-r--r-- | sysdeps/i386/configure | 5 | ||||
| -rw-r--r-- | sysdeps/i386/configure.ac | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure index f5c3a281ac..cd63d314fa 100644 --- a/sysdeps/i386/configure +++ b/sysdeps/i386/configure @@ -1,6 +1,11 @@ # 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"" + # We no longer support i386 since it lacks the atomic instructions # required to implement NPTL threading. if test "$config_machine" = i386; then diff --git a/sysdeps/i386/configure.ac b/sysdeps/i386/configure.ac index 234ef2454a..b7d9436557 100644 --- a/sysdeps/i386/configure.ac +++ b/sysdeps/i386/configure.ac @@ -1,6 +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"]) + # We no longer support i386 since it lacks the atomic instructions # required to implement NPTL threading. if test "$config_machine" = i386; then |