From 8b9a915daf91027050ad7145853ce8874034e60b Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 28 Jun 2016 12:43:14 +0100
Subject: [PATCH] Fix RX and M68HC11 linker testsuite failures.

ld	* testsuite/ld-elf/merge.d: Add m68hc11 to list of targets that
	expect to fail this test.
	* testsuite/ld-scripts/overlay-size.d: Skip the entire test for
	RX.
	* testsuite/ld-scripts/rgn-at10.d: No longer expect this test to
	fail for the RX.
	* testsuite/ld-scripts/rgn-at11.d: Likewise.
	* testsuite/ld-scripts/rgn-at2.d: Likewise.
	* testsuite/ld-scripts/rgn-at6.d: Likewise.
	* testsuite/ld-scripts/rgn-at7.d: Likewise.
	* testsuite/ld-scripts/rgn-at8.d: Likewise.
---
 ld/testsuite/ld-elf/merge.d            | 2 +-
 ld/testsuite/ld-scripts/overlay-size.d | 2 +-
 ld/testsuite/ld-scripts/rgn-at10.d     | 1 -
 ld/testsuite/ld-scripts/rgn-at11.d     | 1 -
 ld/testsuite/ld-scripts/rgn-at2.d      | 3 ---
 ld/testsuite/ld-scripts/rgn-at6.d      | 1 -
 ld/testsuite/ld-scripts/rgn-at7.d      | 1 -
 ld/testsuite/ld-scripts/rgn-at8.d      | 1 -
 8 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ld/testsuite/ld-elf/merge.d b/ld/testsuite/ld-elf/merge.d
index f3ed882..818959d 100644
--- a/ld/testsuite/ld-elf/merge.d
+++ b/ld/testsuite/ld-elf/merge.d
@@ -4,7 +4,7 @@
 #xfail: "bfin-*-*" "cr16-*-*" "cris*-*-*" "crx-*-*" "d10v-*-*" "d30v-*-*"
 #xfail: "dlx-*-*" "fr30-*-*" "frv-*-*" "hppa*64*-*-*" "h8300-*-*" "score-*-*"
 #xfail: "i370-*-*" "i860-*-*" "i960-*-*" "ip2k-*-*" "iq2000-*-*" "lm32-*-*"
-#xfail: "mcore-*-*" "mn102*-*-*" "ms1-*-*" "mep-*-*"
+#xfail: "mcore-*-*" "mn102*-*-*" "ms1-*-*" "mep-*-*" "m68hc11-*-*"
 #xfail: "or32-*-*" "pj-*-*" "sparc*-*-*" "tic6x-*-*" "vax-*-*" "xstormy16-*-*"
 #xfail: "xtensa*-*-*" "metag-*-*" "ft32-*-*"
 
diff --git a/ld/testsuite/ld-scripts/overlay-size.d b/ld/testsuite/ld-scripts/overlay-size.d
index 4e60150..541f216 100644
--- a/ld/testsuite/ld-scripts/overlay-size.d
+++ b/ld/testsuite/ld-scripts/overlay-size.d
@@ -2,7 +2,7 @@
 # name: overlay size
 # objdump: --headers
 # map: overlay-size-map.d
-# xfail: rx-*-*
+# notarget: rx-*-*
 #   FAILS on the RX because the linker has to set LMA == VMA for the
 #   Renesas loader.
 #
diff --git a/ld/testsuite/ld-scripts/rgn-at10.d b/ld/testsuite/ld-scripts/rgn-at10.d
index 73ebfcc..a1f6e0c 100644
--- a/ld/testsuite/ld-scripts/rgn-at10.d
+++ b/ld/testsuite/ld-scripts/rgn-at10.d
@@ -1,7 +1,6 @@
 #source: rgn-at10.s
 #ld: -T rgn-at10.t
 #objdump: -h --wide
-#xfail: rx-*-*
 # Test that lma is adjusted in case the section start vma is aligned and
 # lma_region != region if requested by script.  Make sure this works with
 # non-load sections.
diff --git a/ld/testsuite/ld-scripts/rgn-at11.d b/ld/testsuite/ld-scripts/rgn-at11.d
index 297ae46..900991f 100644
--- a/ld/testsuite/ld-scripts/rgn-at11.d
+++ b/ld/testsuite/ld-scripts/rgn-at11.d
@@ -1,7 +1,6 @@
 #source: rgn-at11.s
 #ld: -T rgn-at11.t
 #objdump: -h --wide
-#xfail: rx-*-*
 # Test that lma is not adjusted in case the section start vma is aligned and
 # lma_region != region if not requested by script.
 # Fails for RX because it ignores the LMA (for compatibility with Renesas tools)
diff --git a/ld/testsuite/ld-scripts/rgn-at2.d b/ld/testsuite/ld-scripts/rgn-at2.d
index 8fd5f1a..4656d65 100644
--- a/ld/testsuite/ld-scripts/rgn-at2.d
+++ b/ld/testsuite/ld-scripts/rgn-at2.d
@@ -2,9 +2,6 @@
 # source: rgn-at.s
 # ld: -T rgn-at2.t
 # objdump: -w -h
-# xfail: rx-*-*
-#   FAILS on the RX because the linker has to set LMA == VMA for the
-#   Renesas loader.
 
 .*:     file format .*
 
diff --git a/ld/testsuite/ld-scripts/rgn-at6.d b/ld/testsuite/ld-scripts/rgn-at6.d
index 80f9b8a..c706faf 100644
--- a/ld/testsuite/ld-scripts/rgn-at6.d
+++ b/ld/testsuite/ld-scripts/rgn-at6.d
@@ -1,7 +1,6 @@
 #source: rgn-at6.s
 #ld: -T rgn-at6.t
 #objdump: -h --wide
-#xfail: rx-*-*
 # Test that lma is aligned as for vma when lma_region==region.
 
 #...
diff --git a/ld/testsuite/ld-scripts/rgn-at7.d b/ld/testsuite/ld-scripts/rgn-at7.d
index a12ca17..7bb596b 100644
--- a/ld/testsuite/ld-scripts/rgn-at7.d
+++ b/ld/testsuite/ld-scripts/rgn-at7.d
@@ -1,7 +1,6 @@
 #source: rgn-at6.s
 #ld: -T rgn-at7.t
 #objdump: -h --wide
-#xfail: rx-*-*
 # Test that lma is only aligned by script when lma_region!=region.
 
 #...
diff --git a/ld/testsuite/ld-scripts/rgn-at8.d b/ld/testsuite/ld-scripts/rgn-at8.d
index c9d6350..52725aa 100644
--- a/ld/testsuite/ld-scripts/rgn-at8.d
+++ b/ld/testsuite/ld-scripts/rgn-at8.d
@@ -1,7 +1,6 @@
 #source: rgn-at6.s
 #ld: -T rgn-at8.t
 #objdump: -h --wide
-#xfail: rx-*-*
 # Test that lma is aligned when lma_region!=region and requested by script.
 
 #...
-- 
2.7.4