From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 4667B382A2F5; Thu, 28 Sep 2023 17:56:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4667B382A2F5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1695923772; bh=j+IoMYBFs0fGWypENhXRHUcUUprNUp4YtSBjBTsfwyM=; h=From:To:Subject:Date:From; b=Q0d5W9Zg6WYwUXIxwp10yWWXHCNAyArH+SH2JT1fKVUskmut07sdpKimp0M2FCBOH jyn0IBxn1xhFtwcsPovVXeoOgQIHGhn4g1SEyXRLCsgZzgwbzHi0KWhxIz+9icYLLe 4qgm198yGn8VGiuUst2PHbWL34pjVzYU/jIbC5qk= 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] Undef attribute_relro on internal tests that include tls.h X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 7821059736a5c3ab58be92c16cffed1bc2f6863a X-Git-Newrev: 2170940c8eed0a91140646bbcadc02c4daf3cbda Message-Id: <20230928175612.4667B382A2F5@sourceware.org> Date: Thu, 28 Sep 2023 17:56:12 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2170940c8eed0a91140646bbcadc02c4daf3cbda commit 2170940c8eed0a91140646bbcadc02c4daf3cbda Author: Adhemerval Zanella Date: Fri Mar 25 16:41:34 2022 -0300 Undef attribute_relro on internal tests that include tls.h So it does not clash with global definition. Diff: --- elf/tst-ptrguard1.c | 2 ++ elf/tst-stackguard1.c | 2 ++ nptl/tst-stackguard1.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/elf/tst-ptrguard1.c b/elf/tst-ptrguard1.c index 5e94c290f2..fcedc0cd8d 100644 --- a/elf/tst-ptrguard1.c +++ b/elf/tst-ptrguard1.c @@ -22,6 +22,8 @@ #include #include #include +#undef attribute_relro +#define attribute_relro #include #include diff --git a/elf/tst-stackguard1.c b/elf/tst-stackguard1.c index e03b242e7e..4f715334eb 100644 --- a/elf/tst-stackguard1.c +++ b/elf/tst-stackguard1.c @@ -23,6 +23,8 @@ #include #include #include +#undef attribute_relro +#define attribute_relro #include #include diff --git a/nptl/tst-stackguard1.c b/nptl/tst-stackguard1.c index 7308b9d37a..2019d06f5d 100644 --- a/nptl/tst-stackguard1.c +++ b/nptl/tst-stackguard1.c @@ -24,6 +24,8 @@ #include #include #include +#undef attribute_relro +#define attribute_relro #include #include