From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <azanella@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1791)
	id B8357385842B; Fri, 28 Oct 2022 17:45:43 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B8357385842B
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1666979144;
	bh=Opgz+V1Ws93+u7B62p7aEUTqyw4bZgiiV7eC4g1Codk=;
	h=From:To:Subject:Date:From;
	b=Zy0xBaAZyPbYMSW5ORrsLPzHzUvxjK0Pa0yVlg0tAh4oPqfEqZ4nwRa4Wx3az4T7K
	 gDOJ5Q339aALNhZqQw65UtAycrMDG0IZBDrkb1Yva5pupMnUrUYdI84RD/1lvyWZRU
	 /7xUJmdYJOPryHi7t0hXlMCkXIuA9iLT638JOFpE=
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: f2cf6c126b8195aa790bf3687e33eab0f57b3156
X-Git-Newrev: d5fa049e574462766be6cdf9fde101122f722ac5
Message-Id: <20221028174544.B8357385842B@sourceware.org>
Date: Fri, 28 Oct 2022 17:45:43 +0000 (GMT)
List-Id: <glibc-cvs.sourceware.org>

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

commit d5fa049e574462766be6cdf9fde101122f722ac5
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 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 <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>