From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 8732A385829B; Wed, 7 Feb 2024 14:13:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8732A385829B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1707315229; bh=Ph8BjeMIXDdIn228Z4/Hn5dpPKXI/x4LQAjkuD9aLF8=; h=From:To:Subject:Date:From; b=UcY108Wl2egiboygbH77aep5UcPJg5v1dROL6bu6vaFTaXRbNZF68OiYpYhzIaxqy Ll4KG55cImdz8BQijAgYEsQj+WIXE8wSF6dFEUOjMWIoIhYYg4wMHqhYNi8vyaDfAt v2yeo/LTlq/ywwjf4uKVAAkZmoDWrBly24A1ZArA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] x86: Use -mshstk instead of '#pragma GCC target' X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 9ced8ef12a11b7d8dc19a05f2f5cf8ce89e61190 X-Git-Newrev: 8e3b2f2c87eb631679cff69c6abb6ba9add1edfd Message-Id: <20240207141349.8732A385829B@sourceware.org> Date: Wed, 7 Feb 2024 14:13:49 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8e3b2f2c87eb631679cff69c6abb6ba9add1edfd commit 8e3b2f2c87eb631679cff69c6abb6ba9add1edfd Author: Adhemerval Zanella Date: Wed Dec 20 11:11:48 2023 -0300 x86: Use -mshstk instead of '#pragma GCC target' Diff: --- 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 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"