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-02-09 10:29:18 -0300
commit95875f9a30e6bd2661287e0a5d38a73ec39540d8 (patch)
tree8e265494736013ca17ed329c3ccee6cfb9a93034
parent5e3f17afa6350ac47cc0d349d240cc00f1172b94 (diff)
downloadglibc-95875f9a30e6bd2661287e0a5d38a73ec39540d8.tar
glibc-95875f9a30e6bd2661287e0a5d38a73ec39540d8.tar.gz
glibc-95875f9a30e6bd2661287e0a5d38a73ec39540d8.tar.bz2
glibc-95875f9a30e6bd2661287e0a5d38a73ec39540d8.zip
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 90f4ecfd26..0cdfe6e9ef 100644
--- a/sysdeps/x86_64/Makefile
+++ b/sysdeps/x86_64/Makefile
@@ -351,8 +351,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 05073a5d1e..ecc1208e35 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 05073a5d1e..ecc1208e35 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"