From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 7B7FD3858285; Wed, 7 Feb 2024 14:11:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7B7FD3858285 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1707315075; bh=Fh+5tCp2zPxSDLqdy11ZYdCnhR/G3uKPI6OJCq1VAMA=; h=From:To:Subject:Date:From; b=spSnuYiysGi8QLAWB1QSMbSSXkbGE4roSrJbzTAGR2BwmpuR1OwdVgmA+lepd+nqN naXOWg+Oj/aWwjbio/ue/BUVMNHZD/e0hsovOF6r/Ws3Epa/MV6aH5l9HdKzRtA2nO VDoKOBJgkB+6gcosmxiNtb6mN7Vq04eKso3LPzzM= 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: 4ed709b90d0c171aa6d31f920010cf0ec783b537 X-Git-Newrev: 1f757ff9dd261205a16f6d6fe387e54765c3a9df Message-Id: <20240207141115.7B7FD3858285@sourceware.org> Date: Wed, 7 Feb 2024 14:11:15 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1f757ff9dd261205a16f6d6fe387e54765c3a9df commit 1f757ff9dd261205a16f6d6fe387e54765c3a9df 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 1e7a8df514..083b83a9fa 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 7770f46640..cfadeff31e 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 9c793680e4..587ad5f5ef 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