summary refs log tree commit diff
path: root/sysdeps/x86
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2021-12-10 13:00:09 -0800
committerH.J. Lu <hjl.tools@gmail.com>2021-12-10 14:01:34 -0800
commitea5814467a02c9d2d7608b6445c5d60e2a81d3ee (patch)
treeb4f4894ae2fb8781f862940484b84bdf059d2678 /sysdeps/x86
parentf1eeef945d49c72eb13654bd30b5904e89b4626f (diff)
downloadglibc-ea5814467a02c9d2d7608b6445c5d60e2a81d3ee.tar.gz
glibc-ea5814467a02c9d2d7608b6445c5d60e2a81d3ee.tar.xz
glibc-ea5814467a02c9d2d7608b6445c5d60e2a81d3ee.zip
x86-64: Remove LD_PREFER_MAP_32BIT_EXEC support [BZ #28656]
Remove the LD_PREFER_MAP_32BIT_EXEC environment variable support since
the first PT_LOAD segment is no longer executable due to defaulting to
-z separate-code.

This fixes [BZ #28656].

Reviewed-by: Florian Weimer <fweimer@redhat.com>
Diffstat (limited to 'sysdeps/x86')
-rw-r--r--sysdeps/x86/cpu-tunables.c7
-rw-r--r--sysdeps/x86/include/cpu-features-preferred_feature_index_1.def1
2 files changed, 0 insertions, 8 deletions
diff --git a/sysdeps/x86/cpu-tunables.c b/sysdeps/x86/cpu-tunables.c
index 61b05e5b1d..957db3ad22 100644
--- a/sysdeps/x86/cpu-tunables.c
+++ b/sysdeps/x86/cpu-tunables.c
@@ -258,13 +258,6 @@ TUNABLE_CALLBACK (set_hwcaps) (tunable_val_t *valp)
 		 20);
 	    }
 	  break;
-	case 21:
-	    {
-	      CHECK_GLIBC_IFUNC_PREFERRED_BOTH (n, cpu_features,
-						Prefer_MAP_32BIT_EXEC,
-						disable, 21);
-	    }
-	  break;
 	case 23:
 	    {
 	      CHECK_GLIBC_IFUNC_PREFERRED_NEED_BOTH
diff --git a/sysdeps/x86/include/cpu-features-preferred_feature_index_1.def b/sysdeps/x86/include/cpu-features-preferred_feature_index_1.def
index 1530d594b3..8250bfcbec 100644
--- a/sysdeps/x86/include/cpu-features-preferred_feature_index_1.def
+++ b/sysdeps/x86/include/cpu-features-preferred_feature_index_1.def
@@ -26,7 +26,6 @@ BIT (I586)
 BIT (I686)
 BIT (Slow_SSE4_2)
 BIT (AVX_Fast_Unaligned_Load)
-BIT (Prefer_MAP_32BIT_EXEC)
 BIT (Prefer_No_VZEROUPPER)
 BIT (Prefer_ERMS)
 BIT (Prefer_No_AVX512)