summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Law <law@redhat.com>1999-08-30 20:09:00 +0000
committerJeff Law <law@redhat.com>1999-08-30 20:09:00 +0000
commita022ef54db1f5f0386e5dd6150dc6959715ceaf5 (patch)
tree301a910854bcfd9a4399a4fb9311d0c5b5292af0
parent68196d703ab879da7b1b93553d8c2a1581e21f03 (diff)
downloadbinutils-gdb-a022ef54db1f5f0386e5dd6150dc6959715ceaf5.tar.gz
* gas/hppa/parse/*.s: Use .code instead of .SPACE/.SUBSPA for
sectioning. * gas/hppa/parse/parse.exp: Disable tests not appropriate for PA64.
-rw-r--r--gas/testsuite/ChangeLog4
-rw-r--r--gas/testsuite/gas/hppa/parse/align1.s14
-rw-r--r--gas/testsuite/gas/hppa/parse/align2.s11
-rw-r--r--gas/testsuite/gas/hppa/parse/badfmpyadd.s16
-rw-r--r--gas/testsuite/gas/hppa/parse/block1.s9
-rw-r--r--gas/testsuite/gas/hppa/parse/block2.s11
-rw-r--r--gas/testsuite/gas/hppa/parse/calldatabug.s13
-rw-r--r--gas/testsuite/gas/hppa/parse/callinfobug.s3
-rw-r--r--gas/testsuite/gas/hppa/parse/defbug.s11
-rw-r--r--gas/testsuite/gas/hppa/parse/entrybug.s14
-rw-r--r--gas/testsuite/gas/hppa/parse/exportbug.s11
-rw-r--r--gas/testsuite/gas/hppa/parse/exprbug.s3
-rw-r--r--gas/testsuite/gas/hppa/parse/fixup7bug.s31
-rw-r--r--gas/testsuite/gas/hppa/parse/global.s10
-rw-r--r--gas/testsuite/gas/hppa/parse/labelbug.s10
-rw-r--r--gas/testsuite/gas/hppa/parse/linesepbug.s10
-rw-r--r--gas/testsuite/gas/hppa/parse/lselbug.s10
-rw-r--r--gas/testsuite/gas/hppa/parse/parse.exp1
-rw-r--r--gas/testsuite/gas/hppa/parse/procbug.s3
-rw-r--r--gas/testsuite/gas/hppa/parse/regpopbug.s10
-rw-r--r--gas/testsuite/gas/hppa/parse/stdreg.s11
-rw-r--r--gas/testsuite/gas/hppa/parse/stringer.s10
-rw-r--r--gas/testsuite/gas/hppa/parse/undefbug.s10
-rw-r--r--gas/testsuite/gas/hppa/parse/versionbug.s7
-rw-r--r--gas/testsuite/gas/hppa/parse/xmpyubug.s11
25 files changed, 32 insertions, 222 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 712250f19c9..2b8f40b3444 100644
--- 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 df81e96dee5..0494af362e6 100644
--- 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 af734c81391..1fa358ed143 100644
--- 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 fd1c1f813cd..f93f42945c8 100644
--- 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 317699f1c8d..4f12ab58952 100644
--- 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 1a3b5f14ed7..87fd198c65f 100644
--- 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 6c80cf4677b..6806a0df926 100644
--- 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 c08c7736066..7768e8749c6 100644
--- 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 064caf4d3df..44826564afa 100644
--- 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 c4fe7a4368d..f04f734de40 100644
--- 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 4966415040f..bf9041f1752 100644
--- 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 07bad422d26..b644d2c77c4 100644
--- 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 23c8740c626..66842bb5140 100644
--- 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 550c4a57766..6a82f45429c 100644
--- 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 3f36a71f7eb..f4af9d03838 100644
--- 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 a819c153e95..13f84b77b84 100644
--- 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 29cd997e289..c937e86bb91 100644
--- 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 da4c2a7486d..44d674e5332 100644
--- 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 5ae5057f643..955358a8c8b 100644
--- 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 46db2621902..1357d9e14b8 100644
--- 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 e42978e2414..a5f668c7ebe 100644
--- 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 06c5e6dc272..9f00b112e51 100644
--- 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 d5eda92fd4c..f6ca53becca 100644
--- 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 9fef1b73f40..96b221966ed 100644
--- 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 3ee727478fa..47908448705 100644
--- 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