Bug gas/1894 Bug gas/1895

* gas/all/gas.exp (redef3): xfail on hppa*-*-hpux*.
	* gas/all/redef.d: Add -j "\$DATA\$".  Modify regexp to check for
	"$DATA$" as well as ".data".
	* gas/all/redef2.d: Likewise.

gas/testsuite/ChangeLog

@@ -1,5 +1,11 @@
 2005-11-20  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
+	Bug gas/1894 Bug gas/1895
+	* gas/all/gas.exp (redef3): xfail on hppa*-*-hpux*.
+	* gas/all/redef.d: Add -j "\$DATA\$".  Modify regexp to check for
+	"$DATA$" as well as ".data".
+	* gas/all/redef2.d: Likewise.
+
 	Bug gas/1879
 	* gas/all/weakref1.d: Check for "$CODE$" as well as ".text".
 	* gas/all/weakref1.s: Indent "-ld1 = l".

gas/testsuite/gas/all/gas.exp

@@ -85,8 +85,8 @@ case $target_triplet in {
 	    "pdp11-*-*" "vax*-*-*" "z8k-*-*"
 	run_dump_test redef2
 	setup_xfail "*-*-aix*" "*-*-coff" "*-*-cygwin" "*-*-mingw*" "*-*-pe*" \
-	    "bfin-*-*" "*c4x*-*-*" "crx*-*-*" "h8300*-*-*" "m68hc*-*-*" \
-	    "maxq-*-*" "or32-*-*" "pdp11-*-*" "vax*-*-*" "z8k-*-*"
+	    "bfin-*-*" "*c4x*-*-*" "crx*-*-*" "h8300*-*-*" "hppa*-*-hpux*" \
+	    "m68hc*-*-*" "maxq-*-*" "or32-*-*" "pdp11-*-*" "vax*-*-*" "z8k-*-*"
 	run_dump_test redef3
 	setup_xfail "*c4x*-*-*"
 	gas_test_error "redef4.s" "" ".set for symbol already used as label"

gas/testsuite/gas/all/redef.d

@@ -1,8 +1,8 @@
-#objdump: -s -j .data
+#objdump: -s -j .data -j "\$DATA\$"
 #name: .equ redefinitions
 
 .*: .*
 
-Contents of section .data:
+Contents of section (\.data|\$DATA\$):
  0000 00000000 0[04]00000[04] 0[08]00000[08] 0[0c]00000[0c][ 	]+................[ 	]*
 #pass

gas/testsuite/gas/all/redef2.d

@@ -1,4 +1,4 @@
-#objdump: -rsj .data
+#objdump: -rs -j .data -j "\$DATA\$"
 #name: .equ redefinitions (2)
 
 .*: .*
@@ -9,7 +9,7 @@ RELOCATION RECORDS FOR .*
 0+08.*xtrn
 0+10.*(sym|\.data(\+0x0+10)?)
 #...
-Contents of section \.data:
+Contents of section (\.data|\$DATA\$):
  0000 00000000 11111111 00000000 22222222[ 	]+................[ 	]*
  0010 [01]00000[01]0 .*
 #pass