* ld-elf/pr14926.d: Disable for d10v, msp, xstormy.

	* ld-elf/sec-to-seg.exp: Choose correct variant output to suit
	updated microblaze page size.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index f5563e4..325c680 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-14  Alan Modra  <amodra@gmail.com>
+
+       * ld-elf/pr14926.d: Disable for d10v, msp, xstormy.
+       * ld-elf/sec-to-seg.exp: Choose correct variant output to suit
+       updated microblaze page size.
+
 2013-01-10  Will Newton <will.newton@imgtec.com>
 
        * ld-elf/merge.d: Mark Meta as xfail.

diff --git a/ld/testsuite/ld-elf/pr14926.d b/ld/testsuite/ld-elf/pr14926.d
index 0160a99..148c8b4 100644 (file)
--- a/ld/testsuite/ld-elf/pr14926.d
+++ b/ld/testsuite/ld-elf/pr14926.d
@@ -1,5 +1,7 @@
 #ld: -Ttext=0x60
 #readelf: -S --wide
+#notarget: d10v-*-* msp*-*-* xstormy*-*-*
+# the above targets use memory regions that don't allow 0x60 for .text
 
 #...
   \[[ 0-9]+\] \.text[ \t]+PROGBITS[ \t]+0*60[ \t]+.*

diff --git a/ld/testsuite/ld-elf/sec-to-seg.exp b/ld/testsuite/ld-elf/sec-to-seg.exp
index 43c5ab1..c963055 100644 (file)
--- a/ld/testsuite/ld-elf/sec-to-seg.exp
+++ b/ld/testsuite/ld-elf/sec-to-seg.exp
@@ -83,7 +83,6 @@ if {    [istarget avr-*-*]
      || [istarget ip2k-*-*]
      || [istarget m32r-*-*]
      || [istarget m88k-*-*]
-     || [istarget microblaze-*-*]
      || [istarget moxie-*-*]
      || [istarget msp430-*-*]
      || [istarget mt-*-*]