* gas/hppa/parse/*.s: Use .code instead of .SPACE/.SUBSPA for

        sectioning.
        * gas/hppa/parse/parse.exp: Disable tests not appropriate for PA64.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 712250f..2b8f40b 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 Mon Aug 30 12:18:40 1999  Jeffrey A Law  (law@cygnus.com)
 
+       * gas/hppa/parse/*.s: Use .code instead of .SPACE/.SUBSPA for
+       sectioning.
+       * gas/hppa/parse/parse.exp: Disable tests not appropriate for PA64.
+
        * gas/hppa/basic/*.s: Use .code instead of .SPACE/.SUBSPA for
        sectioning.
 

diff --git a/gas/testsuite/gas/hppa/parse/align1.s b/gas/testsuite/gas/hppa/parse/align1.s
index df81e96..0494af3 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/align1.s
+++ b/gas/testsuite/gas/hppa/parse/align1.s
@@ -1,13 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
-
+       .code
        .align 1
        .align 8
        nop
@@ -18,8 +9,7 @@
        nop
 
 
-        .SPACE  $PRIVATE$
-        .SUBSPA $BSS$
+       .data
 
         .ALIGN  8
 $L00BSS:

diff --git a/gas/testsuite/gas/hppa/parse/align2.s b/gas/testsuite/gas/hppa/parse/align2.s
index af734c8..1fa358e 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/align2.s
+++ b/gas/testsuite/gas/hppa/parse/align2.s
@@ -1,13 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
-
+       .code
        .align 3
 
        

diff --git a/gas/testsuite/gas/hppa/parse/badfmpyadd.s b/gas/testsuite/gas/hppa/parse/badfmpyadd.s
index fd1c1f8..f93f429 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/badfmpyadd.s
+++ b/gas/testsuite/gas/hppa/parse/badfmpyadd.s
@@ -1,15 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-       .IMPORT $global$,DATA
-       .IMPORT $$dyncall,MILLICODE
-; gcc_compiled.:
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
-
+       .code
        .align 4
        .EXPORT foobar,ENTRY,PRIV_LEV=3,ARGW0=FR,ARGW1=FU,ARGW2=FR,ARGW3=FU,RTNVAL=FR
 foobar
@@ -26,8 +15,7 @@ foobar
        fstds %fr5,0(%r19)
        .EXIT
        .PROCEND
-       .SPACE $PRIVATE$
-       .SUBSPA $BSS$
+       .bss
 
 x      .comm 8
 y      .comm 8

diff --git a/gas/testsuite/gas/hppa/parse/block1.s b/gas/testsuite/gas/hppa/parse/block1.s
index 317699f..4f12ab5 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/block1.s
+++ b/gas/testsuite/gas/hppa/parse/block1.s
@@ -1,12 +1,5 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
+       .data
 
-       .SPACE $TEXT$
-       .SUBSPA $DATA$
 
 foo:
        .block

diff --git a/gas/testsuite/gas/hppa/parse/block2.s b/gas/testsuite/gas/hppa/parse/block2.s
index 1a3b5f1..87fd198 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/block2.s
+++ b/gas/testsuite/gas/hppa/parse/block2.s
@@ -1,13 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $DATA$
-
+       .data
 foo:
        .block -1
 

diff --git a/gas/testsuite/gas/hppa/parse/calldatabug.s b/gas/testsuite/gas/hppa/parse/calldatabug.s
index 6c80cf4..6806a0d 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/calldatabug.s
+++ b/gas/testsuite/gas/hppa/parse/calldatabug.s
@@ -1,15 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-       .IMPORT $global$,DATA
-       .IMPORT $$dyncall,MILLICODE
-; gcc_compiled.:
-       .IMPORT printf,CODE
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
-
+       .code
        .align 4
 LC$0000:
        .STRING "%d %lf %d\x0a\x00"

diff --git a/gas/testsuite/gas/hppa/parse/callinfobug.s b/gas/testsuite/gas/hppa/parse/callinfobug.s
index c08c773..7768e87 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/callinfobug.s
+++ b/gas/testsuite/gas/hppa/parse/callinfobug.s
@@ -1,5 +1,4 @@
-       .space $TEXT$
-       .subspa $CODE$
+       .code
        .align 4
        .export divu,millicode
        .proc

diff --git a/gas/testsuite/gas/hppa/parse/defbug.s b/gas/testsuite/gas/hppa/parse/defbug.s
index 064caf4..4482656 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/defbug.s
+++ b/gas/testsuite/gas/hppa/parse/defbug.s
@@ -1,13 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
-
+       .code
        .align 4
        .import _seterrno
        .export   vfork  !      .label   vfork  !       .proc!  .callinfo no_calls!     .entry !                .label  __vfork  !      mtsp    %r0,%sr0!       ldil    L%0xc0000004,%r1!       ble     R%0xc0000004(%sr0,%r1)! ldi     66   ,%r22 !    b,n     yyy!    b,n     __vfork !       b       _seterrno!      copy    %r28,%r26!      .label  yyy 

diff --git a/gas/testsuite/gas/hppa/parse/entrybug.s b/gas/testsuite/gas/hppa/parse/entrybug.s
index c4fe7a4..f04f734 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/entrybug.s
+++ b/gas/testsuite/gas/hppa/parse/entrybug.s
@@ -1,14 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-       .IMPORT $global$,DATA
-       .IMPORT $$dyncall,MILLICODE
-; gcc_compiled.:
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
+       .code
 
        .align 4
        .PARAM foo,RTNVAL=GR
@@ -19,6 +9,4 @@ foo:
        bv,n %r0(%r2)
        .EXIT
        .PROCEND
-       .SPACE $TEXT$
-       .SUBSPA $LIT$
 

diff --git a/gas/testsuite/gas/hppa/parse/exportbug.s b/gas/testsuite/gas/hppa/parse/exportbug.s
index 4966415..bf9041f 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/exportbug.s
+++ b/gas/testsuite/gas/hppa/parse/exportbug.s
@@ -1,13 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
-
+       .code
        .align 4
         .EXPORT main,ENTRY,PRIV_LEV=3,RTNVAL=GR
 

diff --git a/gas/testsuite/gas/hppa/parse/exprbug.s b/gas/testsuite/gas/hppa/parse/exprbug.s
index 07bad42..b644d2c 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/exprbug.s
+++ b/gas/testsuite/gas/hppa/parse/exprbug.s
@@ -1,5 +1,4 @@
-        .space $TEXT$
-        .subspa        $CODE$
+       .code
 
        .align  8
        .export icode,data

diff --git a/gas/testsuite/gas/hppa/parse/fixup7bug.s b/gas/testsuite/gas/hppa/parse/fixup7bug.s
index 23c8740..66842bb 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/fixup7bug.s
+++ b/gas/testsuite/gas/hppa/parse/fixup7bug.s
@@ -1,18 +1,6 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
        .IMPORT $global$,DATA
        .IMPORT $$dyncall,MILLICODE
-; gcc_compiled.:
-       .IMPORT xmalloc,CODE
-       .IMPORT _obstack_newchunk,CODE
-       .IMPORT memset,CODE
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
-
+       .code
        .align 4
        .EXPORT alloc_type,CODE
        .EXPORT alloc_type,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR
@@ -2729,8 +2717,7 @@ L$0113:
        .align 4
 LC$0020: 
        .STRING "stub type has NULL name\x00"
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$
+       .data
 
        .align 4
 stub_noname_complaint: 
@@ -2739,8 +2726,7 @@ stub_noname_complaint:
        .word 0
        .IMPORT complain,CODE
        .IMPORT memcpy,CODE
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
+       .code
 
        .align 4
        .EXPORT check_stub_type,CODE
@@ -3309,8 +3295,6 @@ allocate_cplus_struct_type:
        add %r20,%r19,%r19
        ldw 0(%r19),%r20
        ldw 48(%r20),%r19
-       ldil L'cplus_struct_default,%r20
-       ldo R'cplus_struct_default(%r20),%r20
        comclr,= %r19,%r20,%r0
        bl L$0150,%r0
        nop
@@ -3433,9 +3417,7 @@ L$0157:
        add %r21,%r19,%r20
        ldw 0(%r20),%r19
        ldw 48(%r19),%r20
-       ldil L'cplus_struct_default,%r19
        copy %r20,%r21
-       ldo R'cplus_struct_default(%r19),%r22
        ldws,ma 4(%r22),%r19
        ldws,ma 4(%r22),%r20
        stws,ma %r19,4(%r21)
@@ -3585,8 +3567,6 @@ L$0160:
        nop
        bl,n L$0161,%r0
 L$0162: 
-       ldil L'cplus_struct_default,%r19
-       ldo R'cplus_struct_default(%r19),%r19
        stw %r19,48(%r13)
 L$0161: 
        copy %r13,%r28
@@ -6185,8 +6165,3 @@ L$0229:
        ldwm -8(%r30),%r4
        .EXIT
        .PROCEND
-       .SPACE $PRIVATE$
-       .SUBSPA $BSS$
-
-cplus_struct_default: .comm 24
-

diff --git a/gas/testsuite/gas/hppa/parse/global.s b/gas/testsuite/gas/hppa/parse/global.s
index 550c4a5..6a82f45 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/global.s
+++ b/gas/testsuite/gas/hppa/parse/global.s
@@ -1,12 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
+       .code
        .IMPORT foo,data
 
        .align 4

diff --git a/gas/testsuite/gas/hppa/parse/labelbug.s b/gas/testsuite/gas/hppa/parse/labelbug.s
index 3f36a71..f4af9d0 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/labelbug.s
+++ b/gas/testsuite/gas/hppa/parse/labelbug.s
@@ -1,12 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE  $TEXT$, SORT=8
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
+       .code
 
        .align 4
 ; A comment.  This should not be interpreted as a label, but both of the

diff --git a/gas/testsuite/gas/hppa/parse/linesepbug.s b/gas/testsuite/gas/hppa/parse/linesepbug.s
index a819c15..13f84b7 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/linesepbug.s
+++ b/gas/testsuite/gas/hppa/parse/linesepbug.s
@@ -1,12 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
+       .code
 
        .align 4
 ; Basic immediate instruction tests.  

diff --git a/gas/testsuite/gas/hppa/parse/lselbug.s b/gas/testsuite/gas/hppa/parse/lselbug.s
index 29cd997..c937e86 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/lselbug.s
+++ b/gas/testsuite/gas/hppa/parse/lselbug.s
@@ -1,12 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
+       .code
 
        .align 4
 ; In gas-1.36 the ldil instruction using parenthesis generated

diff --git a/gas/testsuite/gas/hppa/parse/parse.exp b/gas/testsuite/gas/hppa/parse/parse.exp
index da4c2a7..44d674e 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/parse.exp
+++ b/gas/testsuite/gas/hppa/parse/parse.exp
@@ -189,6 +189,7 @@ if [istarget hppa*-*-*] then {
     # Bad things happen in the PA ELF backend (others too?) if a non-default
     # section is created...
     setup_xfail hppa*-*-*elf*
+    setup_xfail hppa*w-*-*
     gas_test "ssbug.s" "" "" "Check for acceptance of non-default subspaces"
 
     # To be compatable with certain "features" of the HP compiler

diff --git a/gas/testsuite/gas/hppa/parse/procbug.s b/gas/testsuite/gas/hppa/parse/procbug.s
index 5ae5057..955358a 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/procbug.s
+++ b/gas/testsuite/gas/hppa/parse/procbug.s
@@ -1,5 +1,4 @@
-       .space $TEXT$
-       .subspa $CODE$
+       .code
        .align 4
        .export divu,entry
        .proc

diff --git a/gas/testsuite/gas/hppa/parse/regpopbug.s b/gas/testsuite/gas/hppa/parse/regpopbug.s
index 46db262..1357d9e 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/regpopbug.s
+++ b/gas/testsuite/gas/hppa/parse/regpopbug.s
@@ -1,12 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
+       .code
 
 r0     .reg    %r0
 shift  .reg    %sar

diff --git a/gas/testsuite/gas/hppa/parse/stdreg.s b/gas/testsuite/gas/hppa/parse/stdreg.s
index e42978e..a5f668c 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/stdreg.s
+++ b/gas/testsuite/gas/hppa/parse/stdreg.s
@@ -1,13 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
-
+       .code
        .align 4
        .export foo
 foo:

diff --git a/gas/testsuite/gas/hppa/parse/stringer.s b/gas/testsuite/gas/hppa/parse/stringer.s
index 06c5e6d..9f00b11 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/stringer.s
+++ b/gas/testsuite/gas/hppa/parse/stringer.s
@@ -1,12 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$
+       .data
 
 
 ; GAS used to mis-parse the embedded quotes

diff --git a/gas/testsuite/gas/hppa/parse/undefbug.s b/gas/testsuite/gas/hppa/parse/undefbug.s
index d5eda92..f6ca53b 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/undefbug.s
+++ b/gas/testsuite/gas/hppa/parse/undefbug.s
@@ -1,12 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
+       .code
 
        .align 4
        bl somewhere,%r2

diff --git a/gas/testsuite/gas/hppa/parse/versionbug.s b/gas/testsuite/gas/hppa/parse/versionbug.s
index 9fef1b7..96b2219 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/versionbug.s
+++ b/gas/testsuite/gas/hppa/parse/versionbug.s
@@ -1,9 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
+       .code
 
        .VERSION "abc123"
 

diff --git a/gas/testsuite/gas/hppa/parse/xmpyubug.s b/gas/testsuite/gas/hppa/parse/xmpyubug.s
index 3ee7274..4790844 100644 (file)
--- a/gas/testsuite/gas/hppa/parse/xmpyubug.s
+++ b/gas/testsuite/gas/hppa/parse/xmpyubug.s
@@ -1,13 +1,4 @@
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-       .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-       .SPACE $TEXT$
-       .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-       .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
-
+       .code
        .align 4
 ; No format selector for xmpyu!
        xmpyu,sgl %fr4,%fr5,%fr6