From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id A6C8A385840C; Tue, 4 Oct 2022 13:03:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A6C8A385840C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1664888609; bh=I98e8VX2+F3WfBdDWqHHgElzIbnYt0CHMDibBO90GiI=; h=From:To:Subject:Date:From; b=f0KtGpe4oPwRZeFI9EDeSy7tG01WqGlTIRYJduKE/R7gppJUaM2MMfAYUfJbLA8dq xdDocixvJ/Gx8wpLrZ3BEcjRFYJsRc0Jdm6Loy4FUQ4Di23+kkXgKXtlPdQQPjKRjc QiLK8elz5OPKk4qdLatEoXUfpTMEEFE37Soi3GeI= 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: 8d62a70716961de1f1032849e6cd92ef1a9d1c63 X-Git-Newrev: d0d9fd24dd23c1c6c03491b1a9f619cd386c1009 Message-Id: <20221004130329.A6C8A385840C@sourceware.org> Date: Tue, 4 Oct 2022 13:03:29 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d0d9fd24dd23c1c6c03491b1a9f619cd386c1009 commit d0d9fd24dd23c1c6c03491b1a9f619cd386c1009 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 dffcb5a805..9faceaf5c5 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 050784319a..b6cc490d28 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 3460c01819..060c2fb212 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