aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2022-03-25 16:41:34 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2024-02-09 10:29:18 -0300
commit9b337dd4e799033c8a5689da1d87e506a4059189 (patch)
tree0dd6958522f5ecb7c107f9191e9d66078f12e7fe
parent0d9d1f3feb3afe4e577c00091ede83a7ccadaa72 (diff)
downloadglibc-9b337dd4e799033c8a5689da1d87e506a4059189.tar
glibc-9b337dd4e799033c8a5689da1d87e506a4059189.tar.gz
glibc-9b337dd4e799033c8a5689da1d87e506a4059189.tar.bz2
glibc-9b337dd4e799033c8a5689da1d87e506a4059189.zip
Undef attribute_relro on internal tests that include tls.h
So it does not clash with global definition.
-rw-r--r--elf/tst-ptrguard1.c2
-rw-r--r--elf/tst-stackguard1.c2
-rw-r--r--nptl/tst-stackguard1.c2
3 files changed, 6 insertions, 0 deletions
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 <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 7770f46640..cfadeff31e 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 9c793680e4..587ad5f5ef 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>