Yet more hppa testuite tweaks for hppa-linux.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 260435c55820ab14bb79ba1032e808bdd1e4ee0a..d1c5e700c10a03391509aeceebf6b0e944aa11b9 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,20 @@
+2000-07-10  Alan Modra  <alan@linuxcare.com.au>
+
+       * gas/vtable/vtable.exp: Disable test for hppa.
+
+       * gas/hppa/reloc/reloc.exp (do_relocation_reduction_tests): Don't
+       run test for any elf target.
+       (applybug): Don't run test for linux.
+       * gas/hppa/unsorted/unsorted.exp (do_common_text): Likewise.
+       * gas/hppa/parse/parse.exp (linesepbug): Remove xfail
+       (labelbug): xfail for hppa-linux.
+
+       * gas/hppa/basic/{coprmem.s, fmemLRbug.s}: Add colons to labels.
+       * gas/hppa/parse/{callinfobug.s, regpopbug.s}: Likewise.
+       * gas/hppa/reloc/{applybug.s, funcrelocbug.s, longcall.s,
+       r_no_reloc.s, reduce3.s}: Likewise.
+       * gas/hppa/unsorted/common.s: Likewise.
+
 2000-07-05  Nick Clifton  <nickc@cygnus.com>
 
        * gas/d30v/inst.d: Fix expected results to match current assembler
@@ -5,7 +22,7 @@
        * gas/d30v/bittest.l: Fix expected warning messages to match
        current assembler output.
 
-2000-06-29  Kazu Hirata  <kazu@hxi.com>=0A=
+2000-06-29  Kazu Hirata  <kazu@hxi.com>
 
        * gas/h8300/h8300.exp (do_h8300s_mac): Change the registers used
        in ldmac and stmac.
@@ -2821,4 +2838,3 @@ Tue Mar 30 11:45:27 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
 Mon Mar 29 00:00:00 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
 
        * Test suite created.
-

diff --git a/gas/testsuite/gas/hppa/basic/coprmem.s b/gas/testsuite/gas/hppa/basic/coprmem.s
index c5d56cf553b873fd2c0701a52a7747c2e10b475d..7752505bcf0e88f81dd53df08413e79ca3c0679a 100644 (file)
--- a/gas/testsuite/gas/hppa/basic/coprmem.s
+++ b/gas/testsuite/gas/hppa/basic/coprmem.s
@@ -7,7 +7,7 @@
 ; immediate fields.  We should also check the assorted field
 ; selectors to make sure they're handled correctly.
 ; 
-copr_indexing_load 
+copr_indexing_load:
 
        cldwx,4 %r5(%sr0,%r4),%r26
        cldwx,4,s %r5(%sr0,%r4),%r26
@@ -18,7 +18,7 @@ copr_indexing_load
        clddx,4,m %r5(%sr0,%r4),%r26
        clddx,4,sm %r5(%sr0,%r4),%r26
 
-copr_indexing_store 
+copr_indexing_store:
        cstwx,4 %r26,%r5(%sr0,%r4)
        cstwx,4,s %r26,%r5(%sr0,%r4)
        cstwx,4,m %r26,%r5(%sr0,%r4)
@@ -28,7 +28,7 @@ copr_indexing_store
        cstdx,4,m %r26,%r5(%sr0,%r4)
        cstdx,4,sm %r26,%r5(%sr0,%r4)
 
-copr_short_memory 
+copr_short_memory:
        cldws,4 0(%sr0,%r4),%r26
        cldws,4,mb 0(%sr0,%r4),%r26
        cldws,4,ma 0(%sr0,%r4),%r26

diff --git a/gas/testsuite/gas/hppa/basic/fmemLRbug.s b/gas/testsuite/gas/hppa/basic/fmemLRbug.s
index f1330bb628e97606c7a5659eca45204b41133802..20b028df08329ea73396b6c037678651860fcc2e 100644 (file)
--- a/gas/testsuite/gas/hppa/basic/fmemLRbug.s
+++ b/gas/testsuite/gas/hppa/basic/fmemLRbug.s
@@ -1,6 +1,6 @@
        .code
        .export         f
-f
+f:
        .proc
        .callinfo       frame=0,no_calls
        .entry

diff --git a/gas/testsuite/gas/hppa/parse/callinfobug.s b/gas/testsuite/gas/hppa/parse/callinfobug.s
index 7768e8749c6253ac76d973816063d4b917ebe78e..bb6469993c02b776ced7f6689f0940f9c62d60cd 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/callinfobug.s
+++ b/gas/testsuite/gas/hppa/parse/callinfobug.s
@@ -3,5 +3,5 @@
        .export divu,millicode
        .proc
        .callinfo millicode
-divu
+divu:
        .procend

diff --git a/gas/testsuite/gas/hppa/parse/parse.exp b/gas/testsuite/gas/hppa/parse/parse.exp
index e089d2aa21a3ef65f84190c9c05e626082b893c4..641a679ff5579135efc8d9dbec23da9fddcd1272 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/parse.exp
+++ b/gas/testsuite/gas/hppa/parse/parse.exp
@@ -120,7 +120,6 @@ proc do_valid_align_tests {} {
 
 if [istarget hppa*-*-*] then {
     # GAS-2.0 does not always parse ! as a line separator when it should.
-    setup_xfail hppa*-*-*
     gas_test "linesepbug.s" "" "" "line separator bug"
 
     # Make sure GAS accepts syntax for accessing static data.
@@ -200,6 +199,7 @@ if [istarget hppa*-*-*] then {
     gas_test "stdreg.s" "" "" "Test standard predefined registers"
 
     # Make sure GAS will accept a label without a colon.
+    setup_xfail "hppa*-*-linux*"
     gas_test "labelbug.s" "" "" "Test label without colon"
 
     # Make sure we grok # line directives.

diff --git a/gas/testsuite/gas/hppa/parse/regpopbug.s b/gas/testsuite/gas/hppa/parse/regpopbug.s
index 1357d9e14b8d03f0a5b91fe8cd406b2f656e9cd4..2e3f53f6d242bba1c5f4eb828d6638273524371b 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/regpopbug.s
+++ b/gas/testsuite/gas/hppa/parse/regpopbug.s
@@ -1,9 +1,9 @@
        .code
 
-r0     .reg    %r0
-shift  .reg    %sar
-fpreg10        .reg    %fr10
-shift2 .reg    shift
+r0:    .reg    %r0
+shift: .reg    %sar
+fpreg10: .reg  %fr10
+shift2:        .reg    shift
 
 ; Make sure we didn't botch .equ...
-yabba  .equ    r0 + shift
+yabba: .equ    r0 + shift

diff --git a/gas/testsuite/gas/hppa/reloc/applybug.s b/gas/testsuite/gas/hppa/reloc/applybug.s
index d4cb7ca51c7a0d7423aef2e6be035004432b1b29..ec365365c4bcaa4c1734757450dfcba1656ec6ee 100644 (file)
--- a/gas/testsuite/gas/hppa/reloc/applybug.s
+++ b/gas/testsuite/gas/hppa/reloc/applybug.s
@@ -4,7 +4,7 @@
        .data
 
        .align 4
-tab___2
+tab___2:
        .word L$0002
        .word L$0003
        .word L$0004
@@ -13,7 +13,7 @@ tab___2
        .align 4
        .EXPORT execute,CODE
        .EXPORT execute,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR
-execute
+execute:
        .PROC
        .CALLINFO FRAME=0,NO_CALLS
        .ENTRY
@@ -27,7 +27,7 @@ execute
        ldo R'tab___2-$global$(%r1),%r23
        addil L'optab-$global$,%r27
        ldo R'optab-$global$(%r1),%r20
-L$0009
+L$0009:
        sh2add %r21,%r23,%r19
        ldh 2(%r19),%r19
        ldo 1(%r21),%r21
@@ -35,19 +35,19 @@ L$0009
        comib,>= 2,%r21,L$0009
        sths,ma %r19,2(%r20)
        bv,n %r0(%r2)
-L$0002
+L$0002:
        ldi 120,%r19
        stbs,ma %r19,1(%r20)
        ldhs,ma 2(%r26),%r19
        add %r22,%r19,%r19
        bv,n %r0(%r19)
-L$0003
+L$0003:
        ldi 121,%r19
        stbs,ma %r19,1(%r20)
        ldhs,ma 2(%r26),%r19
        add %r22,%r19,%r19
        bv,n %r0(%r19)
-L$0004
+L$0004:
        ldi 122,%r19
        stb %r19,0(%r20)
        bv %r0(%r2)
@@ -58,7 +58,7 @@ L$0004
        .IMPORT strcmp,CODE
 
        .align 4
-L$C0000
+L$C0000:
        .STRING "xyxyz\x00"
        .IMPORT abort,CODE
        .IMPORT exit,CODE
@@ -67,7 +67,7 @@ L$C0000
        .align 4
        .EXPORT main,CODE
        .EXPORT main,ENTRY,PRIV_LEV=3,RTNVAL=GR
-main
+main:
        .PROC
        .CALLINFO FRAME=128,CALLS,SAVE_RP
        .ENTRY
@@ -104,7 +104,7 @@ main
        .CALL 
        bl abort,%r2
        nop
-L$0011
+L$0011:
        .CALL ARGW0=GR
        bl exit,%r2
        copy %r0,%r26
@@ -113,6 +113,6 @@ L$0011
        .PROCEND
        .data
 
-optab  .comm 10
-buf    .comm 10
-p      .comm 10
+optab: .comm 10
+buf:   .comm 10
+p:     .comm 10

diff --git a/gas/testsuite/gas/hppa/reloc/funcrelocbug.s b/gas/testsuite/gas/hppa/reloc/funcrelocbug.s
index fcfe93b6871b5b01a2627f0e8dd9c501178d8397..2acb013d21542108398bfb923f1be7229b4e18f1 100644 (file)
--- a/gas/testsuite/gas/hppa/reloc/funcrelocbug.s
+++ b/gas/testsuite/gas/hppa/reloc/funcrelocbug.s
@@ -2,7 +2,7 @@
        .align 4
        .EXPORT g,CODE
        .EXPORT g,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,RTNVAL=GR
-g
+g:
        .PROC
        .CALLINFO FRAME=128,CALLS,SAVE_RP,SAVE_SP,ENTRY_GR=3
        .ENTRY
@@ -26,11 +26,11 @@ g
        ldw -36(%r3),%r28
        bl,n L$0001,%r0
        bl,n L$0003,%r0
-L$0002
+L$0002:
        ldw -40(%r3),%r28
        bl,n L$0001,%r0
-L$0003
-L$0001
+L$0003:
+L$0001:
        ldw -20(%r3),%r2
        ldo 64(%r3),%r30
        ldwm -64(%r30),%r3
@@ -38,7 +38,7 @@ L$0001
        .EXIT
        .PROCEND
        .align 4
-f2___4
+f2___4:
        .PROC
        .CALLINFO FRAME=64,NO_CALLS,SAVE_SP,ENTRY_GR=3
        .ENTRY
@@ -54,7 +54,7 @@ f2___4
        ldi 1,%r19
        copy %r19,%r28
        bl,n L$0005,%r0
-L$0005
+L$0005:
        ldo 64(%r3),%r30
        ldwm -64(%r30),%r3
        bv,n %r0(%r2)
@@ -64,7 +64,7 @@ L$0005
        .data
 
        .align 4
-L$TRAMP0000
+L$TRAMP0000:
        ldw     36(%r22),%r21
        bb,>=,n %r21,30,.+16
        depi    0,31,2,%r21
@@ -81,7 +81,7 @@ L$TRAMP0000
        .align 4
        .EXPORT f,CODE
        .EXPORT f,ENTRY,PRIV_LEV=3,RTNVAL=GR
-f
+f:
        .PROC
        .CALLINFO FRAME=192,CALLS,SAVE_RP,SAVE_SP,ENTRY_GR=3
        .ENTRY
@@ -133,8 +133,8 @@ f
        .CALL ARGW0=NO,ARGW1=NO,ARGW2=NO,ARGW3=NO
        bl abort,%r2
        nop
-L$0006
-L$0004
+L$0006:
+L$0004:
        ldw -20(%r3),%r2
        ldo 64(%r3),%r30
        ldwm -64(%r30),%r3
@@ -146,7 +146,7 @@ L$0004
        .align 4
        .EXPORT main,CODE
        .EXPORT main,ENTRY,PRIV_LEV=3,RTNVAL=GR
-main
+main:
        .PROC
        .CALLINFO FRAME=128,CALLS,SAVE_RP,SAVE_SP,ENTRY_GR=3
        .ENTRY
@@ -164,7 +164,7 @@ main
        .CALL ARGW0=NO,ARGW1=NO,ARGW2=NO,ARGW3=NO
        bl exit,%r2
        nop
-L$0007
+L$0007:
        ldw -20(%r3),%r2
        ldo 64(%r3),%r30
        ldwm -64(%r30),%r3

diff --git a/gas/testsuite/gas/hppa/reloc/longcall.s b/gas/testsuite/gas/hppa/reloc/longcall.s
index 699138b88e0e7853c098a773c0f64a800ea312f2..47f508c537c915f1f965eaa81a9749d114e1edac 100644 (file)
--- a/gas/testsuite/gas/hppa/reloc/longcall.s
+++ b/gas/testsuite/gas/hppa/reloc/longcall.s
@@ -2,7 +2,7 @@
        .align 4
        .EXPORT foo,CODE
        .EXPORT foo,ENTRY,PRIV_LEV=3,RTNVAL=GR
-foo
+foo:
        .PROC
        .CALLINFO FRAME=64,CALLS,SAVE_RP
        .ENTRY
@@ -19,7 +19,7 @@ foo
        .align 4
        .EXPORT bar,CODE
        .EXPORT bar,ENTRY,PRIV_LEV=3,RTNVAL=GR
-bar
+bar:
        .PROC
        .CALLINFO FRAME=0,NO_CALLS
        .ENTRY

diff --git a/gas/testsuite/gas/hppa/reloc/r_no_reloc.s b/gas/testsuite/gas/hppa/reloc/r_no_reloc.s
index 9e5debdad8048fcf0bf4a6a7788756afa34b94fd..9830e738bfb217dbc5d9f1cedf74de7c8aa57f17 100644 (file)
--- a/gas/testsuite/gas/hppa/reloc/r_no_reloc.s
+++ b/gas/testsuite/gas/hppa/reloc/r_no_reloc.s
@@ -3,17 +3,17 @@
 
        .data
        .ALIGN  8
-$L00DATA
+$L00DATA:
        .ALIGN  8
        .EXPORT s
-s
+s:
        .WORD   0x0
        .BLOCKZ 786425
        .BLOCKZ 7
 
        .code
-L$001.3
-g      .PROC
+L$001.3:
+g:     .PROC
        .CALLINFO FRAME=0,NO_CALLS
        .ENTRY
        ;ldo    120(%r0),%r28 --> to delay slot
@@ -26,10 +26,9 @@ g    .PROC
        .data
        .ALIGN  4
        .EXPORT l
-l
+l:
        .WORD   P'g
        .IMPORT common,DATA     ; common section, size=0
        .IMPORT $global$,DATA
        .EXPORT g,ENTRY,PRIV_LEV=3,RTNVAL=GR
        .END
-

diff --git a/gas/testsuite/gas/hppa/reloc/reduce3.s b/gas/testsuite/gas/hppa/reloc/reduce3.s
index 666a79614f78bc2c77958bbae99274c9a364d548..016d12d1586f82ac53636fa2924c663603e547ae 100644 (file)
--- a/gas/testsuite/gas/hppa/reloc/reduce3.s
+++ b/gas/testsuite/gas/hppa/reloc/reduce3.s
@@ -1,25 +1,25 @@
        .data
        .align 8
-blah
+blah:
        ; .double 0e+00
        .word 0 ; = 0x0
        .word 0 ; = 0x0
        .EXPORT foo,DATA
        .align 8
-foo
+foo:
        ; .double 0e+00
        .word 0 ; = 0x0
        .word 0 ; = 0x0
        .EXPORT yabba,DATA
        .align 4
-yabba
+yabba:
        .word 1
        .code
 
        .align 4
        .EXPORT bar,CODE
        .EXPORT bar,ENTRY,PRIV_LEV=3,RTNVAL=GR
-bar
+bar:
        .PROC
        .CALLINFO FRAME=64,NO_CALLS,SAVE_SP,ENTRY_GR=3
        .ENTRY
@@ -30,7 +30,7 @@ bar
        ldo R'yabba-$global$(%r1),%r19
        ldi 2,%r20
        stw %r20,0(%r19)
-L$0001
+L$0001:
        ldo 64(%r3),%r30
        ldwm -64(%r30),%r3
        bv,n %r0(%r2)

diff --git a/gas/testsuite/gas/hppa/reloc/reloc.exp b/gas/testsuite/gas/hppa/reloc/reloc.exp
index 159cc6ca70a890571fb977500d139142a6eed6f5..f64bda543918d89de96567cb1eedc5d7d075f32b 100644 (file)
--- a/gas/testsuite/gas/hppa/reloc/reloc.exp
+++ b/gas/testsuite/gas/hppa/reloc/reloc.exp
@@ -65,7 +65,8 @@ proc do_relocation_reduction_tests {} {
     set testname "reduce.s: Test relocation reductions (part 2)"
     set x 0
 
-    if [istarget hppa*w-*-*] then {
+    if {[istarget hppa*w-*-*]
+        || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
       return;
     }
 
@@ -98,8 +99,6 @@ proc do_relocation_reduction_tests {} {
     set testname "reduce2.s: More relocation reduction tests (part 2)"
     set x 0
 
-    if {![istarget hppa*-*-*elf*] && ![istarget hppa*-*-linux*]} then {
-
     if [gas_test_old "reduce2.s" "" "More relocation  reductions (part1)"] then {
        objdump_start_no_subdir "a.out" "-r"
 
@@ -128,7 +127,6 @@ proc do_relocation_reduction_tests {} {
 
     # Did we find what we were looking for?  If not, flunk it.
     if [expr $x==2] then { pass $testname } else { fail $testname }
-    }
 
     set testname "reduce3.s: Test even more relocation reductions (part 2)"
     set x 0
@@ -615,7 +613,7 @@ proc do_apply_test {} {
     set x 0
 
     # ELF (osf) doesn't really handle extra sections too well...
-    if [istarget hppa*-*-*elf*] then {
+    if {[istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
        return;
     }
 

diff --git a/gas/testsuite/gas/hppa/unsorted/common.s b/gas/testsuite/gas/hppa/unsorted/common.s
index b07fd059b603e0928307efb6676696fe0466043d..54cc7ea77f5411524cc040814cbd88ca2c888197 100644 (file)
--- a/gas/testsuite/gas/hppa/unsorted/common.s
+++ b/gas/testsuite/gas/hppa/unsorted/common.s
@@ -5,4 +5,4 @@ text_symbol:
        .data
 data_symbol:
        .long   2
-common_symbol  .comm   4
+common_symbol: .comm   4

diff --git a/gas/testsuite/gas/hppa/unsorted/unsorted.exp b/gas/testsuite/gas/hppa/unsorted/unsorted.exp
index 02ce4e6fa455ed5d1fe196b653798743543465cc..320f63781f385013f4dc6f30c2a14e770ec98ea0 100644 (file)
--- a/gas/testsuite/gas/hppa/unsorted/unsorted.exp
+++ b/gas/testsuite/gas/hppa/unsorted/unsorted.exp
@@ -192,6 +192,11 @@ proc do_import_test {} {
 }
 
 proc do_common_test {} {
+    # linux has a different .comm syntax
+    if [istarget hppa*-*-linux*] then {
+       return;
+    }
+
     set testname "common.s: Test for bug in .comm handling (part2)"
     set x 0
 

diff --git a/gas/testsuite/gas/vtable/vtable.exp b/gas/testsuite/gas/vtable/vtable.exp
index 992f800956909208a844b4fdc482fa29c1c332db..28fe4dfaad0f9b1c200da756eab3fc3eef632256 100644 (file)
--- a/gas/testsuite/gas/vtable/vtable.exp
+++ b/gas/testsuite/gas/vtable/vtable.exp
@@ -24,6 +24,10 @@ if { ([istarget "*-*-elf*"]
       return
     }
   
+    if {[istarget "hppa*-*-*"]} then {
+      return
+    }
+  
     # not supported by D30V
     if {[istarget "d30v-*-*"]} {
       return