From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 6CF193858D28; Tue, 2 Apr 2024 15:57:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6CF193858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1712073458; bh=WC1MTB/ZoncwtsqNaKYNS1mUsz5Sme+FwrFr1mxzjMk=; h=From:To:Subject:Date:From; b=ryQYcj6LMHIDWo4ZIybV7GRSJQ6HoeU7hqzpVPcCMZ/yflXRNtIbvxrXuwLBFDySK g/a9So0U0c85OznAL0cdd+KmOgKmhYj/qxym5l7kPJV9S9PdolIEnWif3eSGMhLIao a+WvywG9iSf+pQcBiMLvedLYGZ+BuJuTqsWR+x+I= 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: dd997dc997bd84cf61c5362bd437e77c142cd625 X-Git-Newrev: 96cbbf7d349697b0d072f9ee30a0afacb8bc8b55 Message-Id: <20240402155738.6CF193858D28@sourceware.org> Date: Tue, 2 Apr 2024 15:57:37 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=96cbbf7d349697b0d072f9ee30a0afacb8bc8b55 commit 96cbbf7d349697b0d072f9ee30a0afacb8bc8b55 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