Bug gas/1879

	* gas/all/weakref1.d: Check for "$CODE$" as well as ".text".
	* gas/all/weakref1.s: Indent "-ld1 = l".
	* gas/all/weakref1g.d: Remove --no-sort option.
	* gas/all/weakref1l.d: Likewise.
	* gas/all/weakref1u.d: Likewise.  Sort expected results.
	* gas/all/weakref1w.d: Likewise.
	* gas/all/weakref2.s: Indent directives.
	* gas/all/weakref3.s: Likewise.

9 files changed, 49 insertions, 37 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index dafe704..f06098c 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2005-11-20  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	Bug gas/1879
+	* gas/all/weakref1.d: Check for "$CODE$" as well as ".text".
+	* gas/all/weakref1.s: Indent "-ld1 = l".
+	* gas/all/weakref1g.d: Remove --no-sort option.
+	* gas/all/weakref1l.d: Likewise.
+	* gas/all/weakref1u.d: Likewise.  Sort expected results.
+	* gas/all/weakref1w.d: Likewise.
+	* gas/all/weakref2.s: Indent directives.
+	* gas/all/weakref3.s: Likewise.
+
 2005-11-17  Jan Beulich  <jbeulich@novell.com>
 
 	* gas/all/cond.s: Also check ifdef works on equates and
diff --git a/gas/testsuite/gas/all/weakref1.d b/gas/testsuite/gas/all/weakref1.d
index ab8f484..dadd280 100644
--- a/gas/testsuite/gas/all/weakref1.d
+++ b/gas/testsuite/gas/all/weakref1.d
@@ -6,7 +6,7 @@
 #not-target: alpha*-*-osf* *-*-ecoff pdp11-*-aout
 
 #...
-RELOCATION RECORDS FOR \[\.text\]:
+RELOCATION RECORDS FOR \[(\.text|\$CODE\$)\]:
 OFFSET +TYPE +VALUE *
 # the rest of this file is generated with the following script:
 # # script begin
diff --git a/gas/testsuite/gas/all/weakref1.s b/gas/testsuite/gas/all/weakref1.s
index 0c48c27..ce550d8 100644
--- a/gas/testsuite/gas/all/weakref1.s
+++ b/gas/testsuite/gas/all/weakref1.s
@@ -189,7 +189,7 @@ l:
 /* d# target symbol definitions */
 	.weakref Wld1, ld1
 	.long Wld1
-ld1 = l
+	ld1 = l
 
 	.weakref Wld2, ld2
 	.long Wld2
diff --git a/gas/testsuite/gas/all/weakref1g.d b/gas/testsuite/gas/all/weakref1g.d
index 999a3fc..039c599 100644
--- a/gas/testsuite/gas/all/weakref1g.d
+++ b/gas/testsuite/gas/all/weakref1g.d
@@ -1,4 +1,4 @@
-#nm: --defined-only --extern-only --no-sort
+#nm: --defined-only --extern-only
 #name: weakref tests, global syms
 #source: weakref1.s
 # see weakref1.d for comments on the not-targets
diff --git a/gas/testsuite/gas/all/weakref1l.d b/gas/testsuite/gas/all/weakref1l.d
index 7d92578..05ba458 100644
--- a/gas/testsuite/gas/all/weakref1l.d
+++ b/gas/testsuite/gas/all/weakref1l.d
@@ -1,4 +1,4 @@
-#nm: --defined-only --no-sort
+#nm: --defined-only
 #name: weakref tests, local syms
 #source: weakref1.s
 # aix drops local symbols
diff --git a/gas/testsuite/gas/all/weakref1u.d b/gas/testsuite/gas/all/weakref1u.d
index e46c196..f140add 100644
--- a/gas/testsuite/gas/all/weakref1u.d
+++ b/gas/testsuite/gas/all/weakref1u.d
@@ -1,4 +1,4 @@
-#nm: --undefined-only --no-sort
+#nm: --undefined-only
 #name: weakref tests, strong undefined syms
 #source: weakref1.s
 # aout turns undefined into *ABS* symbols.
@@ -39,11 +39,11 @@
 #...
 .* U uc9
 #...
-.* U um5
+.* U ud5
 #...
 .* U uh8
 #...
 .* U uh9
 #...
-.* U ud5
+.* U um5
 #pass
diff --git a/gas/testsuite/gas/all/weakref1w.d b/gas/testsuite/gas/all/weakref1w.d
index d5ddb88..4598776 100644
--- a/gas/testsuite/gas/all/weakref1w.d
+++ b/gas/testsuite/gas/all/weakref1w.d
@@ -1,4 +1,4 @@
-#nm: --undefined-only --no-sort
+#nm: --undefined-only
 #name: weakref tests, weak undefined syms
 #source: weakref1.s
 # see weakref1.d for comments on the not-targets
@@ -16,41 +16,41 @@
 #...
 .* w wc1
 #...
-.* w ww1
+.* w wh2
 #...
-.* w ww2
+.* w wh3
 #...
-.* w ww3
+.* w wh4
 #...
-.* w ww4
+.* w wh5
 #...
-.* w ww5
+.* w wh6
 #...
-.* w ww6
+.* w wh7
 #...
-.* w ww7
+.* w wm6
 #...
-.* w ww8
+.* w wm7
 #...
-.* w ww9
+.* w wm8
 #...
-.* w ww10
+.* w ww1
 #...
-.* w wm6
+.* w ww10
 #...
-.* w wm7
+.* w ww2
 #...
-.* w wm8
+.* w ww3
 #...
-.* w wh2
+.* w ww4
 #...
-.* w wh3
+.* w ww5
 #...
-.* w wh4
+.* w ww6
 #...
-.* w wh5
+.* w ww7
 #...
-.* w wh6
+.* w ww8
 #...
-.* w wh7
+.* w ww9
 #pass
diff --git a/gas/testsuite/gas/all/weakref2.s b/gas/testsuite/gas/all/weakref2.s
index 0f9cdc7..049f1ec 100644
--- a/gas/testsuite/gas/all/weakref2.s
+++ b/gas/testsuite/gas/all/weakref2.s
@@ -1,5 +1,5 @@
-.weakref a,b
-.weakref b,c
-.weakref c,d
-.weakref d,e
-.weakref e,a
+	.weakref a,b
+	.weakref b,c
+	.weakref c,d
+	.weakref d,e
+	.weakref e,a
diff --git a/gas/testsuite/gas/all/weakref3.s b/gas/testsuite/gas/all/weakref3.s
index 9e5219a..48f6987 100644
--- a/gas/testsuite/gas/all/weakref3.s
+++ b/gas/testsuite/gas/all/weakref3.s
@@ -1,5 +1,5 @@
-.weakref e,a
-.weakref d,e
-.weakref c,d
-.weakref b,c
-.weakref a,b
+	.weakref e,a
+	.weakref d,e
+	.weakref c,d
+	.weakref b,c
+	.weakref a,b