From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <azanella@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1791)
	id DD9FD3858430; Wed, 30 Aug 2023 12:40:36 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD9FD3858430
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1693399236;
	bh=WUC0fUOJIU0YZW0Uk2m9CvMF3KRU4JsIysSfjA3bvVo=;
	h=From:To:Subject:Date:From;
	b=x+XOoaHEm+6wTXhHyuhtPXl68+t3CuFcNCaDRfF4+m5UkJByJ3+fnBxt2JQtZGnfa
	 aT26eyC9gRpyvsaVdo/KulKtkX7v3U2ttAJzb8/Dqnwv9uwR2wJUQE71abJbvHnZBs
	 REohrYpmYWPmKnrZ0oTWQqNyrTRuJ+aTdqmNP8qM=
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: e916c73c425230c0cd981b50b886ceefc2191de5
X-Git-Newrev: 5d7429474a486f9da126a666697a15dd8c14f582
Message-Id: <20230830124036.DD9FD3858430@sourceware.org>
Date: Wed, 30 Aug 2023 12:40:36 +0000 (GMT)
List-Id: <glibc-cvs.sourceware.org>

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

commit 5d7429474a486f9da126a666697a15dd8c14f582
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 5e94c290f2..fcedc0cd8d 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 e03b242e7e..4f715334eb 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 7308b9d37a..2019d06f5d 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>