From b68361a19f5020d24f18f86babc153b094338cf1 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 20 Dec 2023 11:11:48 -0300 Subject: x86: Use -mshstk instead of '#pragma GCC target' --- sysdeps/x86_64/Makefile | 4 ++-- sysdeps/x86_64/tst-cet-legacy-10a-static.c | 1 - sysdeps/x86_64/tst-cet-legacy-10a.c | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index ce949dba27..9e19cf7e87 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 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" -- cgit 1.4.1