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

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

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 772ed8f..1c5d7fd 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 Mon Aug 30 12:18:40 1999  Jeffrey A Law  (law@cygnus.com)
 
+       * gas/hppa/unsorted/*.s: Use .code instead of .SPACE/.SUBSPA for
+       sectioning.
+       * gas/hppa/unsorted/unsorted.exp: Disable tests not appropriate for
+       PA64.
+
        * gas/hppa/reloc/*.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/gas/hppa/unsorted/brlenbug.s b/gas/testsuite/gas/hppa/unsorted/brlenbug.s
index 58e5c7e..8a20cc3 100644 (file)
--- a/gas/testsuite/gas/hppa/unsorted/brlenbug.s
+++ b/gas/testsuite/gas/hppa/unsorted/brlenbug.s
@@ -1,14 +1,7 @@
-       .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 $PRIVATE$
-       .SUBSPA $DATA$
+       .data
 
        .align 4
 done___2
@@ -18,8 +11,6 @@ done___2
        .align 4
 re_syntax_options
        .word 0
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$
 
        .align 4
 re_error_msg
@@ -40,8 +31,7 @@ re_error_msg
        .word L$C0013
        .word L$C0014
        .word L$C0015
-       .SPACE $TEXT$
-       .SUBSPA $LIT$
+       .code
 
        .align 4
 L$C0015
@@ -92,8 +82,7 @@ L$C0001
 L$C0000
        .STRING "No match\x00"
        .EXPORT re_max_failures,DATA
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$
+       .data
 
        .align 4
 re_max_failures
@@ -102,8 +91,7 @@ re_max_failures
        .IMPORT realloc,CODE
        .IMPORT free,CODE
        .IMPORT strcmp,CODE
-       .SPACE $TEXT$
-       .SUBSPA $LIT$
+       .code
 
        .align 4
 L$C0016
@@ -152,8 +140,7 @@ L$C0027
        .IMPORT insert_op2,CODE
        .IMPORT compile_range,CODE
        .IMPORT group_in_compile_stack,CODE
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
+       .code
 
        .align 4
 regex_compile
@@ -3494,8 +3481,7 @@ L$0867
        ldo -320(%r30),%r30 ;# 9060 addsi3/2
        .EXIT
        .PROCEND
-       .SPACE $PRIVATE$
-       .SUBSPA $BSS$
+       .data
 
        .align 1
 re_syntax_table

diff --git a/gas/testsuite/gas/hppa/unsorted/common.s b/gas/testsuite/gas/hppa/unsorted/common.s
index d92b0cb..b07fd05 100644 (file)
--- a/gas/testsuite/gas/hppa/unsorted/common.s
+++ b/gas/testsuite/gas/hppa/unsorted/common.s
@@ -1,4 +1,4 @@
-       .text
+       .code
 text_symbol:   
        .long   1
        .long   external_symbol

diff --git a/gas/testsuite/gas/hppa/unsorted/fragbug.s b/gas/testsuite/gas/hppa/unsorted/fragbug.s
index 5734193..3bf9a86 100644 (file)
--- a/gas/testsuite/gas/hppa/unsorted/fragbug.s
+++ b/gas/testsuite/gas/hppa/unsorted/fragbug.s
@@ -1,3 +1,2 @@
-       .SPACE $TEXT$   
-       .SUBSPA $CODE$  
+       .code
        nop                     

diff --git a/gas/testsuite/gas/hppa/unsorted/importbug.s b/gas/testsuite/gas/hppa/unsorted/importbug.s
index 104afb6..5e7e04d 100644 (file)
--- a/gas/testsuite/gas/hppa/unsorted/importbug.s
+++ b/gas/testsuite/gas/hppa/unsorted/importbug.s
@@ -1,23 +1,15 @@
-       .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.:
        .EXPORT foo,DATA
-       .SPACE $PRIVATE$
-       .SUBSPA $DATA$
+       .data
 
        .align 4
 foo:
        .word 0
        .IMPORT __main,CODE
-       .SPACE $TEXT$
-       .SUBSPA $CODE$
 
+       .code
        .align 4
        .EXPORT main,CODE
        .EXPORT main,ENTRY,PRIV_LEV=3,RTNVAL=GR

diff --git a/gas/testsuite/gas/hppa/unsorted/labeldiffs.s b/gas/testsuite/gas/hppa/unsorted/labeldiffs.s
index 6ee66f9..8547ec3 100644 (file)
--- a/gas/testsuite/gas/hppa/unsorted/labeldiffs.s
+++ b/gas/testsuite/gas/hppa/unsorted/labeldiffs.s
@@ -1,7 +1,6 @@
 ; Should check to make sure something useful gets put on those .word
 ; statements.
-        .space $TEXT$
-        .subspa        $CODE$
+       .code
 
        .align  8
        .export icode,data

diff --git a/gas/testsuite/gas/hppa/unsorted/locallabel.s b/gas/testsuite/gas/hppa/unsorted/locallabel.s
index 7d5721e..60357b9 100644 (file)
--- a/gas/testsuite/gas/hppa/unsorted/locallabel.s
+++ b/gas/testsuite/gas/hppa/unsorted/locallabel.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
 

diff --git a/gas/testsuite/gas/hppa/unsorted/unsorted.exp b/gas/testsuite/gas/hppa/unsorted/unsorted.exp
index 31300c7..5487fd9 100644 (file)
--- a/gas/testsuite/gas/hppa/unsorted/unsorted.exp
+++ b/gas/testsuite/gas/hppa/unsorted/unsorted.exp
@@ -24,28 +24,21 @@ proc do_subspace_align_test {} {
     set testname "ss_align.s: Test subspace alignment (part 2)"
     set x 0
 
+    if { [istarget hppa*-*-*elf*] || [istarget hppa*w-*-*] } then {
+      return 
+    }
+
     if [gas_test_old "ss_align.s" "" "subspace alignment (part 1)"] then {
        objdump_start_no_subdir "a.out" "-h"
 
     # Check the headers for the correct alignment value for the
-    # .data section (elf) or the $DATA$ subspace (som).
-       if [istarget hppa*-*-*elf*] then {
-           while 1 {
-               expect {
-                   -re "data\[^\n\]* 2..6\[^\n\]*\n"   { set x 1 }
-                   -re "\[^\n\]*\n"                            { }
-                   timeout                     { perror "timeout\n"; break }
-                   eof                         { break }
-               }
-           }
-       } else {
-           while 1 {
-               expect  {
-                   -re "DATA\[^\n\]* 2..6\[^\n\]*\n"   { set x 1 }
-                   -re "\[^\n\]*\n"                            { }
-                   timeout                     { perror "timeout\n"; break }
-                   eof                         { break }
-               }
+    # the $DATA$ subspace (som).
+       while 1 {
+           expect  {
+               -re "DATA\[^\n\]* 2..6\[^\n\]*\n"       { set x 1 }
+               -re "\[^\n\]*\n"                                { }
+               timeout                 { perror "timeout\n"; break }
+               eof                             { break }
            }
        }
 
@@ -114,6 +107,10 @@ proc do_align3_test {} {
     set testname "align3.s: Test for alignment bug when switching subspaces (part2)"
     set x 0
 
+    if { [istarget hppa*-*-*elf*] || [istarget hppa*w-*-*] } then {
+      return 
+    }
+
     if [gas_test_old "align3.s" "" "Test for alignment bug when switching subspaces (part1)"] {
        objdump_start_no_subdir "a.out" "--prefix-addresses -d"
 
@@ -141,7 +138,7 @@ proc do_align4_test {} {
     set testname "align4.s: More subspace alignment tests (part2)"
     set x 0
 
-    if [istarget hppa*-*-*elf*] then {
+    if { [istarget hppa*-*-*elf*] || [istarget hppa*w-*-*] } then {
        return
     }