[patch] redef testsuite fixes for hppa*-*-hpux*

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[patch] redef testsuite fixes for hppa*-*-hpux*

John David Anglin-4
The enclosed patch xfails redef3.s on hppa*-*-hpux*.  The .comm directive
under hpux isn't compatible with that used in the test.  This resolves
gas/1894.  There are issues with redef3.d but I didn't bother fixing them.

The changes to redef.d fix this test on hppa2.0-hp-hpux11.11.  This resolves
gas/1895.

The changes to redef2.d are similar to those for redef.d.  They are a step
forward in resolving gas/1896.  However, we are left with the following issue:

/xxx/gnu/binutils-2.15.90/objdir/gas/testsuite/../../binutils/objdump  -rs dump.
o > dump.out
regexp_diff match failure
regexp "^0+00.*(here|\.data)$"
line   "00000000 R_DATA_ONE_SYMBOL  sym"
FAIL: .equ redefinitions (2)

Ok?

Dave
--
J. David Anglin                                  [hidden email]
National Research Council of Canada              (613) 990-0752 (FAX: 952-6602)

2005-11-20  John David Anglin  <[hidden email]>

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

Index: gas/all/gas.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/all/gas.exp,v
retrieving revision 1.39
diff -u -3 -p -r1.39 gas.exp
--- gas/all/gas.exp 17 Nov 2005 07:29:28 -0000 1.39
+++ gas/all/gas.exp 20 Nov 2005 23:56:58 -0000
@@ -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"
Index: gas/all/redef.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/all/redef.d,v
retrieving revision 1.1
diff -u -3 -p -r1.1 redef.d
--- gas/all/redef.d 11 Oct 2005 11:16:17 -0000 1.1
+++ gas/all/redef.d 20 Nov 2005 23:56:58 -0000
@@ -1,8 +1,8 @@
-#objdump: -s -j .data
+#objdump: -s
 #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
Index: gas/all/redef2.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/all/redef2.d,v
retrieving revision 1.2
diff -u -3 -p -r1.2 redef2.d
--- gas/all/redef2.d 17 Nov 2005 07:29:28 -0000 1.2
+++ gas/all/redef2.d 20 Nov 2005 23:56:58 -0000
@@ -1,4 +1,4 @@
-#objdump: -rsj .data
+#objdump: -rs
 #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
Reply | Threaded
Open this post in threaded view
|

Re: [patch] redef testsuite fixes for hppa*-*-hpux*

Alan Modra
On Sun, Nov 20, 2005 at 09:39:16PM -0500, John David Anglin wrote:
> -#objdump: -s -j .data
> +#objdump: -s

I think there is a good chance that this will break other targets.
Better would be to use -j .data -j $DATA$.  OK with that change here and
in the other place you remove -j.

--
Alan Modra
IBM OzLabs - Linux Technology Centre
Reply | Threaded
Open this post in threaded view
|

Re: [patch] redef testsuite fixes for hppa*-*-hpux*

John David Anglin-4
> On Sun, Nov 20, 2005 at 09:39:16PM -0500, John David Anglin wrote:
> > -#objdump: -s -j .data
> > +#objdump: -s
>
> I think there is a good chance that this will break other targets.
> Better would be to use -j .data -j $DATA$.  OK with that change here and
> in the other place you remove -j.

Actually, it seems I need -j .data -j "\$DATA\$" to stop dejagnu from
trying to do a variable substitution and to get rid of the slashes
in the shell command.  I'm checking whether this works on
hppa64-hp-hpux11.11.

The hppa64 test that I did previously uses .data, so I doubt removal of
-j would have broken other targets.  The regexps have .*'s that should
mop up any garbage between the initial match and the interesting stuff.

Dave
--
J. David Anglin                                  [hidden email]
National Research Council of Canada              (613) 990-0752 (FAX: 952-6602)