* ld-elf/sec64k.exp: For frv-linux use "aw" sections.

	* ld-elf/seg.d: Cater for GNU_STACK segment.
	* ld-elf/symbol1ref.s: Use data section.
	* ld-elf/symbol2ref.s: Likewise.
	* ld-scripts/empty-address-1.d: Don't run on frv-linux.
	* ld-scripts/empty-address-2a.d: Likewise.
	* ld-scripts/empty-address-2b.d: Likewise.
	* ld-scripts/empty-aligned.d: Likewise.
	* ld-elf/extract-symbol-1sym.d: Tolerate extra target supplied syms.
	* ld-scripts/sort_b_a-1.d: Likewise.
	* ld-scripts/sort_b_a.d: Likewise.
	* ld-scripts/sort_b_a_a-1.d: Likewise.
	* ld-scripts/sort_b_a_a-2.d: Likewise.
	* ld-scripts/sort_b_a_a-3.d: Likewise.
	* ld-scripts/sort_b_a_n-1.d: Likewise.
	* ld-scripts/sort_b_a_n-2.d: Likewise.
	* ld-scripts/sort_b_a_n-3.d: Likewise.
	* ld-scripts/sort_b_n-1.d: Likewise.
	* ld-scripts/sort_b_n.d: Likewise.
	* ld-scripts/sort_b_n_a-1.d: Likewise.
	* ld-scripts/sort_b_n_a-2.d: Likewise.
	* ld-scripts/sort_b_n_a-3.d: Likewise.
	* ld-scripts/sort_b_n_n-1.d: Likewise.
	* ld-scripts/sort_b_n_n-2.d: Likewise.
	* ld-scripts/sort_b_n_n-3.d: Likewise.
	* ld-scripts/sort_no-1.d: Likewise.
	* ld-scripts/sort_no-2.d: Likewise.

28 files changed, 188 insertions, 4 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 4aad9dc..e11aa76 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,33 @@
+2009-09-09  Alan Modra  <amodra@bigpond.net.au>
+
+	* ld-elf/sec64k.exp: For frv-linux use "aw" sections.
+	* ld-elf/seg.d: Cater for GNU_STACK segment.
+	* ld-elf/symbol1ref.s: Use data section.
+	* ld-elf/symbol2ref.s: Likewise.
+	* ld-scripts/empty-address-1.d: Don't run on frv-linux.
+	* ld-scripts/empty-address-2a.d: Likewise.
+	* ld-scripts/empty-address-2b.d: Likewise.
+	* ld-scripts/empty-aligned.d: Likewise.
+	* ld-elf/extract-symbol-1sym.d: Tolerate extra target supplied syms.
+	* ld-scripts/sort_b_a-1.d: Likewise.
+	* ld-scripts/sort_b_a.d: Likewise.
+	* ld-scripts/sort_b_a_a-1.d: Likewise.
+	* ld-scripts/sort_b_a_a-2.d: Likewise.
+	* ld-scripts/sort_b_a_a-3.d: Likewise.
+	* ld-scripts/sort_b_a_n-1.d: Likewise.
+	* ld-scripts/sort_b_a_n-2.d: Likewise.
+	* ld-scripts/sort_b_a_n-3.d: Likewise.
+	* ld-scripts/sort_b_n-1.d: Likewise.
+	* ld-scripts/sort_b_n.d: Likewise.
+	* ld-scripts/sort_b_n_a-1.d: Likewise.
+	* ld-scripts/sort_b_n_a-2.d: Likewise.
+	* ld-scripts/sort_b_n_a-3.d: Likewise.
+	* ld-scripts/sort_b_n_n-1.d: Likewise.
+	* ld-scripts/sort_b_n_n-2.d: Likewise.
+	* ld-scripts/sort_b_n_n-3.d: Likewise.
+	* ld-scripts/sort_no-1.d: Likewise.
+	* ld-scripts/sort_no-2.d: Likewise.
+
 2009-09-08  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
 
         * ld-elf/merge.d: xfail cr16-*-*.
diff --git a/ld/testsuite/ld-elf/extract-symbol-1sym.d b/ld/testsuite/ld-elf/extract-symbol-1sym.d
index f372932..4069191 100644
--- a/ld/testsuite/ld-elf/extract-symbol-1sym.d
+++ b/ld/testsuite/ld-elf/extract-symbol-1sym.d
@@ -4,8 +4,14 @@
 #objcopy_linked_file: --extract-symbol
 #nm: -n
 #xfail: "hppa*-*-*"
+#...
 0*00010010 T B
+#...
 0*00020123 T C
+#...
 0*00030000 A _entry
+#...
 0*00040000 A linker_symbol
+#...
 0*12345678 A D
+#pass
\ No newline at end of file
diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp
index bab47c3..285e83a 100644
--- a/ld/testsuite/ld-elf/sec64k.exp
+++ b/ld/testsuite/ld-elf/sec64k.exp
@@ -70,7 +70,11 @@ for { set i 0 } { $i < $max_sec / $secs_per_file } { incr i } {
     # They should get separate section entries even without -r.
     puts $ofd " .altmacro"
     puts $ofd " .macro sec secn, secp"
-    puts $ofd "  .section .foo.\\secn,\"ax\""
+    if {![istarget "frv-*-*linux*"]} then {
+	puts $ofd "  .section .foo.\\secn,\"ax\""
+    } else {
+	puts $ofd "  .section .foo.\\secn,\"aw\""
+    }
     puts $ofd "  .global foo_\\secn"
     puts $ofd "foo_\\secn:"
     puts $ofd "  .dc.a foo_\\secp"
diff --git a/ld/testsuite/ld-elf/seg.d b/ld/testsuite/ld-elf/seg.d
index c858c13..d9436ae 100644
--- a/ld/testsuite/ld-elf/seg.d
+++ b/ld/testsuite/ld-elf/seg.d
@@ -10,10 +10,12 @@ Program Headers:
 #...
   LOAD           .*
   LOAD           0x0*001000 0xf*fffff000 0xf*fffff000 0x0*1000 0x0*1000 .*
-
+# FRV adds a PT_GNU_STACK header
+#...
  Section to Segment mapping:
   Segment Sections...
    00     .*
 # On MIPS, the first segment is for .reginfo.
 #...
    0.     reset boot 
+#pass
diff --git a/ld/testsuite/ld-elf/symbol1ref.s b/ld/testsuite/ld-elf/symbol1ref.s
index 15725cb..99df499 100644
--- a/ld/testsuite/ld-elf/symbol1ref.s
+++ b/ld/testsuite/ld-elf/symbol1ref.s
@@ -1,3 +1,3 @@
-	.text
+	.data
 	.dc.a symbol1
 
diff --git a/ld/testsuite/ld-elf/symbol2ref.s b/ld/testsuite/ld-elf/symbol2ref.s
index d2710f9..0a1a9eb 100644
--- a/ld/testsuite/ld-elf/symbol2ref.s
+++ b/ld/testsuite/ld-elf/symbol2ref.s
@@ -1,3 +1,3 @@
-	.text
+	.data
 	.dc.a Foo
 
diff --git a/ld/testsuite/ld-scripts/empty-address-1.d b/ld/testsuite/ld-scripts/empty-address-1.d
index 99fac1e..29301ea 100644
--- a/ld/testsuite/ld-scripts/empty-address-1.d
+++ b/ld/testsuite/ld-scripts/empty-address-1.d
@@ -1,5 +1,6 @@
 #ld: -T empty-address-1.t
 #nm: -n
+#notarget: frv-*-*linux*
 #...
 0+0 T _start
 #...
diff --git a/ld/testsuite/ld-scripts/empty-address-2a.d b/ld/testsuite/ld-scripts/empty-address-2a.d
index d831d5f..15fc65c 100644
--- a/ld/testsuite/ld-scripts/empty-address-2a.d
+++ b/ld/testsuite/ld-scripts/empty-address-2a.d
@@ -1,6 +1,7 @@
 #source: empty-address-2.s
 #ld: -Ttext 0x0000000 -Tdata 0x2000000 -T empty-address-2a.t
 #nm: -n
+#notarget: frv-*-*linux*
 #...
 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 514fd68..29b8069 100644
--- a/ld/testsuite/ld-scripts/empty-address-2b.d
+++ b/ld/testsuite/ld-scripts/empty-address-2b.d
@@ -1,6 +1,7 @@
 #source: empty-address-2.s
 #ld: -Ttext 0x0000000 -Tdata 0x2000000 -T empty-address-2b.t
 #nm: -n
+#notarget: frv-*-*linux*
 #...
 0+0 T _start
 #...
diff --git a/ld/testsuite/ld-scripts/empty-aligned.d b/ld/testsuite/ld-scripts/empty-aligned.d
index 4b7b84b..283ef64 100644
--- a/ld/testsuite/ld-scripts/empty-aligned.d
+++ b/ld/testsuite/ld-scripts/empty-aligned.d
@@ -2,6 +2,7 @@
 #ld: -T empty-aligned.t
 #readelf: -l --wide
 #xfail: "hppa64-*-*"
+#notarget: frv-*-*linux*
 
 #...
 Program Headers:
diff --git a/ld/testsuite/ld-scripts/sort_b_a-1.d b/ld/testsuite/ld-scripts/sort_b_a-1.d
index eaa917d..325193c 100644
--- a/ld/testsuite/ld-scripts/sort_b_a-1.d
+++ b/ld/testsuite/ld-scripts/sort_b_a-1.d
@@ -3,7 +3,12 @@
 #name: --sort-section alignment
 #nm: -n
 
+#...
 0[0-9a-f]* t text3
+#...
 0[0-9a-f]* t text1
+#...
 0[0-9a-f]* t text
+#...
 0[0-9a-f]* t text2
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_a.d b/ld/testsuite/ld-scripts/sort_b_a.d
index 78fe1f1..0f55808 100644
--- a/ld/testsuite/ld-scripts/sort_b_a.d
+++ b/ld/testsuite/ld-scripts/sort_b_a.d
@@ -3,7 +3,12 @@
 #name: SORT_BY_ALIGNMENT
 #nm: -n
 
+#...
 0[0-9a-f]* t text3
+#...
 0[0-9a-f]* t text1
+#...
 0[0-9a-f]* t text
+#...
 0[0-9a-f]* t text2
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_a_a-1.d b/ld/testsuite/ld-scripts/sort_b_a_a-1.d
index 4f70646..930f748 100644
--- a/ld/testsuite/ld-scripts/sort_b_a_a-1.d
+++ b/ld/testsuite/ld-scripts/sort_b_a_a-1.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_ALIGNMENT(SORT_BY_ALIGNMENT())
 #nm: -n
 
+#...
 0[0-9a-f]* t text3b
+#...
 0[0-9a-f]* t text3a
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_a_a-2.d b/ld/testsuite/ld-scripts/sort_b_a_a-2.d
index 65919a4..3e7d158 100644
--- a/ld/testsuite/ld-scripts/sort_b_a_a-2.d
+++ b/ld/testsuite/ld-scripts/sort_b_a_a-2.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_ALIGNMENT(SORT_BY_ALIGNMENT()) --sort-section alignment
 #nm: -n
 
+#...
 0[0-9a-f]* t text3b
+#...
 0[0-9a-f]* t text3a
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_a_a-3.d b/ld/testsuite/ld-scripts/sort_b_a_a-3.d
index 21b7732..b1b0600 100644
--- a/ld/testsuite/ld-scripts/sort_b_a_a-3.d
+++ b/ld/testsuite/ld-scripts/sort_b_a_a-3.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_ALIGNMENT(SORT_BY_ALIGNMENT()) --sort-section name
 #nm: -n
 
+#...
 0[0-9a-f]* t text3b
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t text3a
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_a_n-1.d b/ld/testsuite/ld-scripts/sort_b_a_n-1.d
index 62363bc..dd5c613 100644
--- a/ld/testsuite/ld-scripts/sort_b_a_n-1.d
+++ b/ld/testsuite/ld-scripts/sort_b_a_n-1.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_ALIGNMENT(SORT_BY_NAME())
 #nm: -n
 
+#...
 0[0-9a-f]* t text3b
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t text3a
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_a_n-2.d b/ld/testsuite/ld-scripts/sort_b_a_n-2.d
index 7402836..f87ddd5 100644
--- a/ld/testsuite/ld-scripts/sort_b_a_n-2.d
+++ b/ld/testsuite/ld-scripts/sort_b_a_n-2.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_ALIGNMENT(SORT_BY_NAME()) --sort-section name
 #nm: -n
 
+#...
 0[0-9a-f]* t text3b
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t text3a
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_a_n-3.d b/ld/testsuite/ld-scripts/sort_b_a_n-3.d
index 4421c77..bf7ee4e 100644
--- a/ld/testsuite/ld-scripts/sort_b_a_n-3.d
+++ b/ld/testsuite/ld-scripts/sort_b_a_n-3.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_ALIGNMENT(SORT_BY_NAME()) --sort-section alignment
 #nm: -n
 
+#...
 0[0-9a-f]* t text3b
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t text3a
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_n-1.d b/ld/testsuite/ld-scripts/sort_b_n-1.d
index 42bdcf9..76d60b6 100644
--- a/ld/testsuite/ld-scripts/sort_b_n-1.d
+++ b/ld/testsuite/ld-scripts/sort_b_n-1.d
@@ -3,7 +3,12 @@
 #name: --sort-section name
 #nm: -n
 
+#...
 0[0-9a-f]* t text
+#...
 0[0-9a-f]* t text1
+#...
 0[0-9a-f]* t text2
+#...
 0[0-9a-f]* t text3
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_n.d b/ld/testsuite/ld-scripts/sort_b_n.d
index 531a756..5ef07b2 100644
--- a/ld/testsuite/ld-scripts/sort_b_n.d
+++ b/ld/testsuite/ld-scripts/sort_b_n.d
@@ -3,7 +3,12 @@
 #name: SORT_BY_NAME
 #nm: -n
 
+#...
 0[0-9a-f]* t text
+#...
 0[0-9a-f]* t text1
+#...
 0[0-9a-f]* t text2
+#...
 0[0-9a-f]* t text3
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_n_a-1.d b/ld/testsuite/ld-scripts/sort_b_n_a-1.d
index ee123bf..22d6848 100644
--- a/ld/testsuite/ld-scripts/sort_b_n_a-1.d
+++ b/ld/testsuite/ld-scripts/sort_b_n_a-1.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_NAME(SORT_BY_ALIGNMENT())
 #nm: -n
 
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#...
 0[0-9a-f]* t text3b
+#...
 0[0-9a-f]* t text3a
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_n_a-2.d b/ld/testsuite/ld-scripts/sort_b_n_a-2.d
index 82f1805..4c9d8fe 100644
--- a/ld/testsuite/ld-scripts/sort_b_n_a-2.d
+++ b/ld/testsuite/ld-scripts/sort_b_n_a-2.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_NAME(SORT_BY_ALIGNMENT()) --sort-section alignment
 #nm: -n
 
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#...
 0[0-9a-f]* t text3b
+#...
 0[0-9a-f]* t text3a
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_n_a-3.d b/ld/testsuite/ld-scripts/sort_b_n_a-3.d
index 5f3c863..6657046 100644
--- a/ld/testsuite/ld-scripts/sort_b_n_a-3.d
+++ b/ld/testsuite/ld-scripts/sort_b_n_a-3.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_NAME(SORT_BY_ALIGNMENT()) --sort-section alignment
 #nm: -n
 
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#...
 0[0-9a-f]* t text3b
+#...
 0[0-9a-f]* t text3a
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_n_n-1.d b/ld/testsuite/ld-scripts/sort_b_n_n-1.d
index 0bc18ae..b2b2dbe 100644
--- a/ld/testsuite/ld-scripts/sort_b_n_n-1.d
+++ b/ld/testsuite/ld-scripts/sort_b_n_n-1.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_NAME(SORT_BY_NAME())
 #nm: -n
 
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#...
 0[0-9a-f]* t text3a
+#...
 0[0-9a-f]* t text3b
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_n_n-2.d b/ld/testsuite/ld-scripts/sort_b_n_n-2.d
index 834bf90..15b66e4 100644
--- a/ld/testsuite/ld-scripts/sort_b_n_n-2.d
+++ b/ld/testsuite/ld-scripts/sort_b_n_n-2.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_NAME(SORT_BY_NAME()) --sort-section name
 #nm: -n
 
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#...
 0[0-9a-f]* t text3a
+#...
 0[0-9a-f]* t text3b
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_b_n_n-3.d b/ld/testsuite/ld-scripts/sort_b_n_n-3.d
index 7ba8a8b..b99f7e1 100644
--- a/ld/testsuite/ld-scripts/sort_b_n_n-3.d
+++ b/ld/testsuite/ld-scripts/sort_b_n_n-3.d
@@ -4,11 +4,20 @@
 #name: SORT_BY_NAME(SORT_BY_NAME()) --sort-section alignment
 #nm: -n
 
+#...
 0[0-9a-f]* t texta
+#...
 0[0-9a-f]* t textb
+#...
 0[0-9a-f]* t text1a
+#...
 0[0-9a-f]* t text1b
+#...
 0[0-9a-f]* t text2a
+#...
 0[0-9a-f]* t text2b
+#...
 0[0-9a-f]* t text3b
+#...
 0[0-9a-f]* t text3a
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_no-1.d b/ld/testsuite/ld-scripts/sort_no-1.d
index aef7863..c5f5593 100644
--- a/ld/testsuite/ld-scripts/sort_no-1.d
+++ b/ld/testsuite/ld-scripts/sort_no-1.d
@@ -3,7 +3,12 @@
 #name: no SORT_BY_NAME/SORT_BY_ALIGNMENT/SORT
 #nm: -n
 
+#...
 0[0-9a-f]* t text
+#...
 0[0-9a-f]* t text2
+#...
 0[0-9a-f]* t text3
+#...
 0[0-9a-f]* t text1
+#pass
diff --git a/ld/testsuite/ld-scripts/sort_no-2.d b/ld/testsuite/ld-scripts/sort_no-2.d
index ddcd1c1..e0943d5 100644
--- a/ld/testsuite/ld-scripts/sort_no-2.d
+++ b/ld/testsuite/ld-scripts/sort_no-2.d
@@ -3,7 +3,12 @@
 #name: no SORT_BY_NAME/SORT_BY_ALIGNMENT/SORT
 #nm: -n
 
+#...
 0[0-9a-f]* t text
+#...
 0[0-9a-f]* t text2
+#...
 0[0-9a-f]* t text3
+#...
 0[0-9a-f]* t text1
+#pass