From: Roland McGrath <mcgrathr@google.com>
Date: Mon, 15 Nov 2021 19:09:17 +0000 (-0800)
Subject: ld: Fix testsuite failures under --enable-textrel-check=error
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d029b54d9c57232b812a32889b445f0db8958e0a;p=binutils-gdb.git

ld: Fix testsuite failures under --enable-textrel-check=error

ld/
	* testsuite/ld-aarch64/dt_textrel.d: Pass explicit -z notext in
	case ld was configured with --enable-textrel-check=error.
	* testsuite/ld-aarch64/pr22764.d: Likewise.
	* testsuite/ld-aarch64/pr20402.d: Likewise.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index c613b398046..c23af57d1cb 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2021-11-15  Roland McGrath  <mcgrathr@google.com>
+
+	* testsuite/ld-aarch64/dt_textrel.d: Pass explicit -z notext in
+	case ld was configured with --enable-textrel-check=error.
+	* testsuite/ld-aarch64/pr22764.d: Likewise.
+	* testsuite/ld-aarch64/pr20402.d: Likewise.
+
 2021-10-25  Nick Alcock  <nick.alcock@oracle.com>
 
 	* testsuite/ld-ctf/nonrepresentable-member.*: New test.
diff --git a/ld/testsuite/ld-aarch64/dt_textrel.d b/ld/testsuite/ld-aarch64/dt_textrel.d
index 356fea8c400..ec823a5337d 100644
--- a/ld/testsuite/ld-aarch64/dt_textrel.d
+++ b/ld/testsuite/ld-aarch64/dt_textrel.d
@@ -1,6 +1,6 @@
 #source: dt_textrel.s
 #target: [check_shared_lib_support]
-#ld: -shared
+#ld: -shared -z notext
 #readelf: -d
 #...
 .*TEXTREL.*
diff --git a/ld/testsuite/ld-aarch64/pr20402.d b/ld/testsuite/ld-aarch64/pr20402.d
index 0c7ca17b83f..d237ac78a9e 100644
--- a/ld/testsuite/ld-aarch64/pr20402.d
+++ b/ld/testsuite/ld-aarch64/pr20402.d
@@ -1,5 +1,5 @@
 #target: [check_shared_lib_support]
-#ld: -pie -defsym foo=0x1 -defsym bar=0x2
+#ld: -pie -defsym foo=0x1 -defsym bar=0x2 -z notext
 #readelf: -r
 
 Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
diff --git a/ld/testsuite/ld-aarch64/pr22764.d b/ld/testsuite/ld-aarch64/pr22764.d
index 4830d223cec..3980b7d9a40 100644
--- a/ld/testsuite/ld-aarch64/pr22764.d
+++ b/ld/testsuite/ld-aarch64/pr22764.d
@@ -1,6 +1,6 @@
 #source: pr22764.s
 #target: [check_shared_lib_support]
-#ld: -shared -T relocs.ld -defsym sym_abs1=0x1 -defsym sym_abs2=0x2 -defsym sym_abs3=0x3 -e0 --emit-relocs
+#ld: -shared -T relocs.ld -defsym sym_abs1=0x1 -defsym sym_abs2=0x2 -defsym sym_abs3=0x3 -e0 --emit-relocs -z notext
 #notarget: aarch64_be-*-*
 #objdump: -dr
 #...