From 500c05ddbe989926d6b1298bfc88e6788426e0ef Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@mips.com>
Date: Tue, 10 Jul 2018 16:56:46 -0700
Subject: [PATCH] MIPS/ld/testsuite: Limit export class call reloc tests to DSO
 targets

Only run MIPS/LD export class call relocation tests with shared library
targets, avoiding:

.../ld/ld-new: -shared not supported

linker errors and removing:

FAIL: MIPS export class call relocation test (o32)

regressions with `mipsel-ps2-elf' and `mips64el-ps2-elf' targets.

	ld/
	* testsuite/ld-mips-elf/mips-elf.exp: Limit export class call
	relocation tests to shared library targets.
---
 ld/ChangeLog                          |  5 ++++
 ld/testsuite/ld-mips-elf/mips-elf.exp | 36 +++++++++++++++------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 09ddc21b65..01e9465a22 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-10  Maciej W. Rozycki  <macro@mips.com>
+
+	* testsuite/ld-mips-elf/mips-elf.exp: Limit export class call
+	relocation tests to shared library targets.
+
 2018-07-10  Alan Modra  <amodra@gmail.com>
 
 	* testsuite/lib/ld-lib.exp (check_gc_sections_available): Return 0
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 1a563400ef..6aae2f9959 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -1050,23 +1050,27 @@ run_dump_test "mips16-and-micromips"
 
 # Export class call relocation tests.
 set abis [concat o32 [expr {$has_newabi ? "n32 n64" : ""}]]
-foreach { abi } $abis {
-    set loadaddr [string map \
-	{o32 0x12340000 n32 0x12340000 n64 0x123456789abc0000} $abi]
-    set suff [subst \
-	[expr { $irix \
-		? [string map {o32 o32-irix n32 n32 n64 n64} $abi] \
-		: $abi }]]
-    run_ld_link_tests [list \
-	[list \
-	    "MIPS export class call relocation test ($abi)" \
-	    "$abi_ldflags($abi) -shared -Ttext $loadaddr -T export-class-call16.ld" "" \
-	    "$abi_asflags($abi) -mips3 -KPIC" \
-	    [list export-class-call16-${abi}.s export-class-call16-def.s] \
+if [check_shared_lib_support] {
+    foreach { abi } $abis {
+	set loadaddr [string map \
+	    {o32 0x12340000 n32 0x12340000 n64 0x123456789abc0000} $abi]
+	set suff [subst \
+	    [expr { $irix \
+		    ? [string map {o32 o32-irix n32 n32 n64 n64} $abi] \
+		    : $abi }]]
+	run_ld_link_tests [list \
 	    [list \
-		"objdump -d export-class-call16-${suff}.dd" \
-		"readelf -A export-class-call16-${abi}.gd"] \
-	    "export-class-call16-${abi}.so"]]
+		"MIPS export class call relocation test ($abi)" \
+		"$abi_ldflags($abi) -shared -Ttext $loadaddr\
+		 -T export-class-call16.ld" \
+		"" \
+		"$abi_asflags($abi) -mips3 -KPIC" \
+		[list export-class-call16-${abi}.s export-class-call16-def.s] \
+		[list \
+		    "objdump -d export-class-call16-${suff}.dd" \
+		    "readelf -A export-class-call16-${abi}.gd"] \
+		"export-class-call16-${abi}.so"]]
+    }
 }
 
 # Magic __ehdr_start symbol tests.