aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2023-12-20 11:11:48 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2024-04-17 16:12:41 -0300
commitb68361a19f5020d24f18f86babc153b094338cf1 (patch)
tree66904aae409e8af8aed282b33dde4deb4900b22b
parent4a17a44be54cd9db56117641c3e21c994cf31e27 (diff)
downloadglibc-b68361a19f5020d24f18f86babc153b094338cf1.zip
glibc-b68361a19f5020d24f18f86babc153b094338cf1.tar.gz
glibc-b68361a19f5020d24f18f86babc153b094338cf1.tar.bz2
x86: Use -mshstk instead of '#pragma GCC target'
-rw-r--r--sysdeps/x86_64/Makefile4
-rw-r--r--sysdeps/x86_64/tst-cet-legacy-10a-static.c1
-rw-r--r--sysdeps/x86_64/tst-cet-legacy-10a.c1
3 files changed, 2 insertions, 4 deletions
diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
index ce949db..9e19cf7 100644
--- a/sysdeps/x86_64/Makefile
+++ b/sysdeps/x86_64/Makefile
@@ -354,8 +354,8 @@ CFLAGS-tst-cet-legacy-mod-6c.c += -fcf-protection
CFLAGS-tst-cet-legacy-7.c += -fcf-protection=none
CFLAGS-tst-cet-legacy-10.c += -mshstk
CFLAGS-tst-cet-legacy-10-static.c += -mshstk
-CFLAGS-tst-cet-legacy-10a.c += -fcf-protection=none
-CFLAGS-tst-cet-legacy-10a-static.c += -fcf-protection=none
+CFLAGS-tst-cet-legacy-10a.c += -fcf-protection=none -mshstk
+CFLAGS-tst-cet-legacy-10a-static.c += -fcf-protection=none -mshstk
tst-cet-legacy-4-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=SHSTK
tst-cet-legacy-6-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=SHSTK
diff --git a/sysdeps/x86_64/tst-cet-legacy-10a-static.c b/sysdeps/x86_64/tst-cet-legacy-10a-static.c
index 05073a5..ecc1208 100644
--- a/sysdeps/x86_64/tst-cet-legacy-10a-static.c
+++ b/sysdeps/x86_64/tst-cet-legacy-10a-static.c
@@ -1,2 +1 @@
-#pragma GCC target ("shstk")
#include "tst-cet-legacy-10.c"
diff --git a/sysdeps/x86_64/tst-cet-legacy-10a.c b/sysdeps/x86_64/tst-cet-legacy-10a.c
index 05073a5..ecc1208 100644
--- a/sysdeps/x86_64/tst-cet-legacy-10a.c
+++ b/sysdeps/x86_64/tst-cet-legacy-10a.c
@@ -1,2 +1 @@
-#pragma GCC target ("shstk")
#include "tst-cet-legacy-10.c"