Update x86 linker tests for --disable-x86-relax-relocations

Pass -mrelax-relocations=yes to x86 linker tests, which require relax
relocations, to support --disable-x86-relax-relocations.

	* testsuite/ld-i386/i386.exp: Assemble gotpc1.o and pr19319b.o
	with -mrelax-relocations=yes.
	* testsuite/ld-i386/lea1a.d (as): Add -mrelax-relocations=yes.
	* testsuite/ld-i386/lea1b.d (as): Likewise.
	* testsuite/ld-i386/lea1d.d (as): Likewise.
	* testsuite/ld-i386/lea1e.d (as): Likewise.
	* testsuite/ld-i386/lea1f.d (as): Likewise.
	* testsuite/ld-i386/load7.d (as): Likewise.
	* testsuite/ld-i386/mov1b.d (as): Likewise.
	* testsuite/ld-i386/pr19175.d (as): Likewise.
	* testsuite/ld-ifunc/ifunc-13-i386.d (as): Likewise.
	* testsuite/ld-ifunc/ifunc-21-i386.d (as): Likewise.
	* testsuite/ld-ifunc/ifunc-22-i386.d (as): Likewise.
	* testsuite/ld-x86-64/x86-64.exp: Assemble gotpcrel1a.o,
	gotpcrel1b.o and gotpcrel1c.o with -mrelax-relocations=yes.

13 files changed, 17 insertions, 19 deletions

diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 8e662806b8c..d30f9fb53b4 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -664,7 +664,7 @@ if { [isnative]
 	[list \
 	    "Build gotpc1.o" \
 	    "-r -nostdlib" \
-	    "" \
+	    "-Wa,-mrelax-relocations=yes" \
 	    { got1a.S got1b.c got1c.c } \
 	    "" \
 	    "gotpc1.o" \
@@ -672,7 +672,7 @@ if { [isnative]
 	[list \
 	    "Build gotpc1" \
 	    "-Wl,--as-needed tmpdir/gotpc1.o tmpdir/got1d.so" \
-	    "-Wa,-mrelax-relocations=yes" \
+	    "" \
 	    { dummy.s } \
 	    {{objdump {-dw} got1.dd}} \
 	    "got1" \
@@ -688,7 +688,7 @@ if { [isnative]
 	[list \
 	    "Build pr19319" \
 	    "-pie -nostdlib -nostartfiles tmpdir/pr19319.so" \
-	    "" \
+	    "-Wa,-mrelax-relocations=yes" \
 	    { pr19319b.S } \
 	    {{objdump {-dw} pr19319.dd}} \
 	    "pr19319" \
diff --git a/ld/testsuite/ld-i386/lea1a.d b/ld/testsuite/ld-i386/lea1a.d
index d8825227008..b84ad7fb812 100644
--- a/ld/testsuite/ld-i386/lea1a.d
+++ b/ld/testsuite/ld-i386/lea1a.d
@@ -1,5 +1,5 @@
 #source: lea1.s
-#as: --32
+#as: --32 -mrelax-relocations=yes
 #ld: -Bsymbolic -shared -melf_i386
 #objdump: -dw
 
diff --git a/ld/testsuite/ld-i386/lea1b.d b/ld/testsuite/ld-i386/lea1b.d
index b3f6507d177..b2bc6cb856f 100644
--- a/ld/testsuite/ld-i386/lea1b.d
+++ b/ld/testsuite/ld-i386/lea1b.d
@@ -1,5 +1,5 @@
 #source: lea1.s
-#as: --32
+#as: --32 -mrelax-relocations=yes
 #ld: -pie -melf_i386
 #objdump: -dw
 
diff --git a/ld/testsuite/ld-i386/lea1d.d b/ld/testsuite/ld-i386/lea1d.d
index 7deab262d62..0b583d2cd5a 100644
--- a/ld/testsuite/ld-i386/lea1d.d
+++ b/ld/testsuite/ld-i386/lea1d.d
@@ -1,5 +1,5 @@
 #source: lea1.s
-#as: --32
+#as: --32 -mrelax-relocations=yes
 #ld: -Bsymbolic -shared -melf_i386
 #readelf: -Sw
 
diff --git a/ld/testsuite/ld-i386/lea1e.d b/ld/testsuite/ld-i386/lea1e.d
index ae669581c37..253943d5c4b 100644
--- a/ld/testsuite/ld-i386/lea1e.d
+++ b/ld/testsuite/ld-i386/lea1e.d
@@ -1,5 +1,5 @@
 #source: lea1.s
-#as: --32
+#as: --32 -mrelax-relocations=yes
 #ld: -pie -melf_i386
 #readelf: -Sw
 
diff --git a/ld/testsuite/ld-i386/lea1f.d b/ld/testsuite/ld-i386/lea1f.d
index 3c16996c641..1b773189e03 100644
--- a/ld/testsuite/ld-i386/lea1f.d
+++ b/ld/testsuite/ld-i386/lea1f.d
@@ -1,5 +1,5 @@
 #source: lea1.s
-#as: --32
+#as: --32 -mrelax-relocations=yes
 #ld: -melf_i386
 #readelf: -Sw
 
diff --git a/ld/testsuite/ld-i386/load7.d b/ld/testsuite/ld-i386/load7.d
index 898dc3900d1..47eb809f2b8 100644
--- a/ld/testsuite/ld-i386/load7.d
+++ b/ld/testsuite/ld-i386/load7.d
@@ -1,4 +1,4 @@
-#as: --32
+#as: --32 -mrelax-relocations=yes
 #ld: -shared -melf_i386 --version-script load7.map
 #objdump: -dw
 
diff --git a/ld/testsuite/ld-i386/mov1b.d b/ld/testsuite/ld-i386/mov1b.d
index 1b7cc2fa727..aaeeb638494 100644
--- a/ld/testsuite/ld-i386/mov1b.d
+++ b/ld/testsuite/ld-i386/mov1b.d
@@ -1,5 +1,5 @@
 #source: mov1.s
-#as: --32
+#as: --32 -mrelax-relocations=yes
 #ld: -pie -melf_i386 --no-dynamic-linker
 #objdump: -dw
 
diff --git a/ld/testsuite/ld-i386/pr19175.d b/ld/testsuite/ld-i386/pr19175.d
index 3f2edb12306..aaf929f2218 100644
--- a/ld/testsuite/ld-i386/pr19175.d
+++ b/ld/testsuite/ld-i386/pr19175.d
@@ -1,5 +1,5 @@
 #source: pr19175.s
-#as: --32
+#as: --32 -mrelax-relocations=yes
 #ld: -Bsymbolic -shared -melf_i386 -T pr19175.t
 #objdump: -dw
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-13-i386.d b/ld/testsuite/ld-ifunc/ifunc-13-i386.d
index 746945b43c8..677fa9284c3 100644
--- a/ld/testsuite/ld-ifunc/ifunc-13-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-13-i386.d
@@ -1,7 +1,7 @@
 #source: ifunc-13a-i386.s
 #source: ifunc-13b-i386.s
 #ld: -shared -m elf_i386 -z nocombreloc
-#as: --32
+#as: --32 -mrelax-relocations=yes
 #readelf: -r --wide
 #target: x86_64-*-* i?86-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-21-i386.d b/ld/testsuite/ld-ifunc/ifunc-21-i386.d
index 36fcfc093e1..e609dbe74af 100644
--- a/ld/testsuite/ld-ifunc/ifunc-21-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-21-i386.d
@@ -1,5 +1,5 @@
 #ld: -m elf_i386
-#as: --32
+#as: --32 -mrelax-relocations=yes
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
 
diff --git a/ld/testsuite/ld-ifunc/ifunc-22-i386.d b/ld/testsuite/ld-ifunc/ifunc-22-i386.d
index 36fcfc093e1..e609dbe74af 100644
--- a/ld/testsuite/ld-ifunc/ifunc-22-i386.d
+++ b/ld/testsuite/ld-ifunc/ifunc-22-i386.d
@@ -1,5 +1,5 @@
 #ld: -m elf_i386
-#as: --32
+#as: --32 -mrelax-relocations=yes
 #objdump: -dw
 #target: x86_64-*-* i?86-*-*
 
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 3f4d737bee9..b3ceaa1c621 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -718,18 +718,16 @@ if { [isnative] && [which $CC] != 0 } {
 	    "gotpcrel1d.so" \
 	] \
 	[list \
-	    "Build libgotpcrel1.a" \
-	    "" \
+	    "Build gotpcrel1a.o gotpcrel1b.o gotpcrel1c.o" \
 	    "" \
+	    "-Wa,-mrelax-relocations=yes" \
 	    { gotpcrel1a.S gotpcrel1b.c gotpcrel1c.c } \
-	    "" \
-	    "libgotpcrel1.a" \
 	] \
 	[list \
 	    "Build gotpcrel1" \
 	    "-Wl,--as-needed tmpdir/gotpcrel1a.o tmpdir/gotpcrel1b.o tmpdir/gotpcrel1c.o tmpdir/gotpcrel1d.so" \
-	    "-Wa,-mrelax-relocations=yes" \
 	    { dummy.s } \
+	    "" \
 	    {{objdump {-dw} gotpcrel1.dd}} \
 	    "gotpcrel1" \
 	] \