* ld-elf/group3b.d: Disable for generic linker targets.

	* ld-elf/linkonce2.d: Likewise.
	* ld-scripts/empty-address-2a.d: Disable for frv and aout,oldld.
	* ld-scripts/empty-address-2b.d: Likewise.
	* ld-scripts/rgn-at5.s: Don't use .word.
	* ld-scripts/rgn-at5.d: Update.

7 files changed, 25 insertions, 12 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index c350f5a..f0e83c3 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-16  Alan Modra  <amodra@gmail.com>
+
+	* ld-elf/group3b.d: Disable for generic linker targets.
+	* ld-elf/linkonce2.d: Likewise.
+	* ld-scripts/empty-address-2a.d: Disable for frv and aout,oldld.
+	* ld-scripts/empty-address-2b.d: Likewise.
+	* ld-scripts/rgn-at5.s: Don't use .word.
+	* ld-scripts/rgn-at5.d: Update.
+
 2010-09-10  Alan Modra  <amodra@gmail.com>
 
 	* ld-gc/abi-note.d: Exclude aout and oldld targets.
diff --git a/ld/testsuite/ld-elf/group3b.d b/ld/testsuite/ld-elf/group3b.d
index a961301..f2f663c 100644
--- a/ld/testsuite/ld-elf/group3b.d
+++ b/ld/testsuite/ld-elf/group3b.d
@@ -2,6 +2,8 @@
 #source: group3a.s
 #ld: -T group.ld
 #readelf: -s
+#notarget arc-*-* d30v-*-* dlx-*-* i960-*-* or32-*-* pj*-*-*
+
 Symbol table '.symtab' contains .* entries:
 #...
 .*: 0+1000 +0 +OBJECT +GLOBAL +HIDDEN +. foo
diff --git a/ld/testsuite/ld-elf/linkonce2.d b/ld/testsuite/ld-elf/linkonce2.d
index 16b7cd0..c8dcf64 100644
--- a/ld/testsuite/ld-elf/linkonce2.d
+++ b/ld/testsuite/ld-elf/linkonce2.d
@@ -2,6 +2,7 @@
 #source: linkonce1b.s
 #ld: -emit-relocs
 #objdump: -r
+#notarget arc-*-* d30v-*-* dlx-*-* i960-*-* or32-*-* pj*-*-*
 
 .*:     file format .*
 
diff --git a/ld/testsuite/ld-scripts/empty-address-2a.d b/ld/testsuite/ld-scripts/empty-address-2a.d
index 15fc65c..689db61 100644
--- a/ld/testsuite/ld-scripts/empty-address-2a.d
+++ b/ld/testsuite/ld-scripts/empty-address-2a.d
@@ -1,7 +1,7 @@
 #source: empty-address-2.s
 #ld: -Ttext 0x0000000 -Tdata 0x2000000 -T empty-address-2a.t
 #nm: -n
-#notarget: frv-*-*linux*
+#notarget: frv-*-*linux* *-*-linux*aout *-*-linux*oldld
 #...
 0+0 T _start
 #...
diff --git a/ld/testsuite/ld-scripts/empty-address-2b.d b/ld/testsuite/ld-scripts/empty-address-2b.d
index 29b8069..0c58946 100644
--- a/ld/testsuite/ld-scripts/empty-address-2b.d
+++ b/ld/testsuite/ld-scripts/empty-address-2b.d
@@ -1,7 +1,7 @@
 #source: empty-address-2.s
 #ld: -Ttext 0x0000000 -Tdata 0x2000000 -T empty-address-2b.t
 #nm: -n
-#notarget: frv-*-*linux*
+#notarget: frv-*-*linux* *-*-linux*aout *-*-linux*oldld
 #...
 0+0 T _start
 #...
diff --git a/ld/testsuite/ld-scripts/rgn-at5.d b/ld/testsuite/ld-scripts/rgn-at5.d
index 1a37794..e33b34b 100644
--- a/ld/testsuite/ld-scripts/rgn-at5.d
+++ b/ld/testsuite/ld-scripts/rgn-at5.d
@@ -11,8 +11,9 @@
 
 Sections:
 Idx +Name +Size +VMA +LMA +File off +Algn +Flags
-  0 .sec0 +0+2 +0+02000 +0+2000 +0+02000 +.*
-  1 .sec1 +0+2 +0+01000 +0+012c +0+01000 +.*
-  2 .sec2 +0+2 +0+04000 +0+603c +0+04000 +.*
-  3 .sec3 +0+2 +0+05000 +0+412c +0+03000 +.*
-  4 .sec4 +0+2 +0+02002 +0+2002 +0+02002 +.*
+  0 .sec0 +0+4 +0+02000 +0+2000 +0+02000 +.*
+  1 .sec1 +0+4 +0+01000 +0+012c +0+01000 +.*
+  2 .sec2 +0+4 +0+04000 +0+603c +0+04000 +.*
+  3 .sec3 +0+4 +0+05000 +0+412c +0+03000 +.*
+  4 .sec4 +0+4 +0+02004 +0+2004 +0+02004 +.*
+#pass
diff --git a/ld/testsuite/ld-scripts/rgn-at5.s b/ld/testsuite/ld-scripts/rgn-at5.s
index dbb63ea..ce8576c 100644
--- a/ld/testsuite/ld-scripts/rgn-at5.s
+++ b/ld/testsuite/ld-scripts/rgn-at5.s
@@ -1,14 +1,14 @@
 	.section .sec0, "a"
-	.word 0
+	.long 0
 
 	.section .sec1, "a"
-	.word 0x11
+	.long 0x11
 
 	.section .sec2, "a"
-	.word 0x22
+	.long 0x22
 
 	.section .sec3, "a"
-	.word 0x33
+	.long 0x33
 
 	.section .sec4, "a"
-	.word 0x44
+	.long 0x44