From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <azanella@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1791)
 id BE606385800E; Mon,  4 Apr 2022 12:58:26 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BE606385800E
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Adhemerval Zanella <azanella@sourceware.org>
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 <adhemerval.zanella@linaro.org>
X-Git-Refname: refs/heads/azanella/clang
X-Git-Oldrev: 9bb7fa436f8891a6e5c031518f7cbe5f2843c9a7
X-Git-Newrev: 892dfe716844b9ca5144c88231b124295276e1b3
Message-Id: <20220404125826.BE606385800E@sourceware.org>
Date: Mon,  4 Apr 2022 12:58:26 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Apr 2022 12:58:26 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=892dfe716844b9ca5144c88231b124295276e1b3

commit 892dfe716844b9ca5144c88231b124295276e1b3
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
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 variables.

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 <string.h>
 #include <sys/wait.h>
 #include <stackguard-macros.h>
+#undef attribute_relro
+#define attribute_relro
 #include <tls.h>
 #include <unistd.h>
 
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 <string.h>
 #include <sys/wait.h>
 #include <stackguard-macros.h>
+#undef attribute_relro
+#define attribute_relro
 #include <tls.h>
 #include <unistd.h>
 
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 <string.h>
 #include <sys/wait.h>
 #include <stackguard-macros.h>
+#undef attribute_relro
+#define attribute_relro
 #include <tls.h>
 #include <unistd.h>