From dfc43940242f10b54eb5afd2125d91f849df0b2e Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 21 Jan 2016 15:20:57 +0000
Subject: [PATCH] Fix linker testsuite failures for ARM netbsdelf target.

	PR ld/19453
	* testsuite/ld-arm/arm-elf.exp: Skip tests that do not work for
	the arm-netbsdelf target.
---
 ld/ChangeLog                    |  4 ++++
 ld/testsuite/ld-arm/arm-elf.exp | 26 +++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2a80d41a6fc..c13a202bc29 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,9 @@
 2016-01-21  Nick Clifton  <nickc@redhat.com>
 
+	PR ld/19453
+	* testsuite/ld-arm/arm-elf.exp: Skip tests that do not work for
+	the arm-netbsdelf target.
+
 	PR ld/19455
 	* testsuite/ld-arm/vxworks1-lib.dd: Update for current
 	disassmebler output.
diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index 89cec661b4b..258a3eacab5 100644
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -66,7 +66,7 @@ if { ![is_elf_format] || ![istarget "arm*-*-*"] } {
 # nm: Apply nm options on result.  Compare with regex (last arg).
 # readelf: Apply readelf options on result.  Compare with regex (last arg).
 
-set armelftests_common {
+set armelftests_common_1 {
     {"Group relocations" "-Ttext 0x8000 -Tdata 0x3000000 --section-start alpha=0xeef0 --section-start beta=0xffeef0" "" "" {group-relocs.s}
      {{objdump -dr group-relocs.d}}
      "group-relocs"}
@@ -177,10 +177,16 @@ set armelftests_common {
      "stm32l4xx-fix-it-block"}
     {"Unwinding and -gc-sections" "-gc-sections" "" "" {gc-unwind.s}
      {{objdump -sj.data gc-unwind.d}}
-     "gc-unwind"}
+	"gc-unwind"}
+}
+
+set armelftests_common_2 { 
     {"script-type" "-static -T script-type.ld" "" "" {script-type.s}
-     {{readelf -s script-type.sym}}
-     "script-type"}
+	{{readelf -s script-type.sym}}
+	"script-type"}
+}
+
+set armelftests_common_3 {
     {"callweak" "-static -T arm.ld" "" "" {callweak.s}
      {{objdump -dr callweak.d}}
      "callweak"}
@@ -231,6 +237,13 @@ set armelftests_common {
      "thumb1-adds"}
 }
 
+run_ld_link_tests $armelftests_common_1
+if { ![istarget "arm*-*-netbsdelf"] } {
+    run_ld_link_tests $armelftests_common_2
+}
+run_ld_link_tests $armelftests_common_3
+
+
 set armelftests_nonacl {
     {"Thumb-1 BL" "-Ttext 0x1000 --section-start .foo=0x401000" "" "" {thumb1-bl.s}
      {{objdump -dr thumb1-bl.d}}
@@ -313,7 +326,6 @@ set armelftests_nonacl {
      "thumb1-noread-not-present-mixing-two-section"}
 }
 
-run_ld_link_tests $armelftests_common
 if { ![istarget "arm*-*-nacl*"] } {
     run_ld_link_tests $armelftests_nonacl
 }
@@ -338,6 +350,10 @@ run_dump_test "rel32-reject-pie"
 
 # Exclude non-ARM-EABI targets.
 
+if { [istarget "arm*-*-netbsdelf"] } {
+    return
+}
+
 if { ![istarget "arm*-*-*eabi*"] && ![istarget "arm*-*-nacl*"] } {
     # Special variants of these tests, as a different farcall stub is
     # generated for a non-ARM-EABI target: indeed in such a case,
-- 
2.30.2