From 170cdc4f01682c7873834d0b6fe88a2170bf14b2 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 28 Sep 2000 10:16:34 +0000 Subject: [PATCH] Update for hppa*w -> hppa*64* configure name change. --- gas/testsuite/ChangeLog | 4 ++ gas/testsuite/gas/hppa/parse/parse.exp | 2 +- gas/testsuite/gas/hppa/reloc/reloc.exp | 57 ++++++++++---------- gas/testsuite/gas/hppa/unsorted/unsorted.exp | 13 ++--- 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index db46e0aeb1f..25beca9c3dd 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2000-09-28 Alan Modra + * gas/hppa/parse/parse.exp: Replace "hppa*w-*-*" with "hppa*64*-*-*" + * gas/hppa/reloc/reloc.exp: Likewise. + * gas/hppa/unsorted/unsorted.exp: Likewise. + * gas/hppa/reloc/reduce.s: Modify .PARAM so we need an arg reloc. 2000-09-22 Jim Wilson diff --git a/gas/testsuite/gas/hppa/parse/parse.exp b/gas/testsuite/gas/hppa/parse/parse.exp index 641a679ff55..e9bfede9e13 100644 --- a/gas/testsuite/gas/hppa/parse/parse.exp +++ b/gas/testsuite/gas/hppa/parse/parse.exp @@ -187,7 +187,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*" "hppa*-*-linux*" "hppa*w-*-*" + setup_xfail "hppa*-*-*elf*" "hppa*-*-linux*" "hppa*64*-*-*" 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/reloc/reloc.exp b/gas/testsuite/gas/hppa/reloc/reloc.exp index f64bda54391..889e318c7d4 100644 --- a/gas/testsuite/gas/hppa/reloc/reloc.exp +++ b/gas/testsuite/gas/hppa/reloc/reloc.exp @@ -27,12 +27,14 @@ proc do_ble_relocation_test {} { if [gas_test_old "blebug.s" "" "Proper relocation for BLE (part 1)"] then { objdump_start_no_subdir "a.out" "-r" - if ![istarget hppa*-*-*elf*] then { + if {[istarget hppa*64*-*-*] + || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { # At one time both versions of the assembler would incorrectly use # a PC-relative relocation for a BLE instruction. while 1 { expect { - -re "^0+4\[^\n\]*ABS_CALL\[^\n\]*\n" { set x 1 } + -re "^0+\[^\n\]*DIR21L\[^\n\]*\n" { set x 1 } + -re "^0+4\[^\n\]*DIR17R\[^\n\]*\n" { set x 1 } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } eof { break } @@ -43,8 +45,7 @@ proc do_ble_relocation_test {} { # a PC-relative relocation for a BLE instruction. while 1 { expect { - -re "^0+\[^\n\]*DIR21L\[^\n\]*\n" { set x 1 } - -re "^0+4\[^\n\]*DIR17R\[^\n\]*\n" { set x 1 } + -re "^0+4\[^\n\]*ABS_CALL\[^\n\]*\n" { set x 1 } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } eof { break } @@ -65,7 +66,7 @@ proc do_relocation_reduction_tests {} { set testname "reduce.s: Test relocation reductions (part 2)" set x 0 - if {[istarget hppa*w-*-*] + if {[istarget hppa*64*-*-*] || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { return; } @@ -243,7 +244,7 @@ proc do_selector_scope_test {} { set testname "selectorbug.s: Test scope of field selector" set x 0 - if [istarget hppa*w-*-*] then { + if [istarget hppa*64*-*-*] then { return; } @@ -325,7 +326,8 @@ proc do_exit_relocation_test {} { # Elf (osf) does not use ENTRY/EXIT relocations. # I guess we could look at the unwind subspaces it builds... # Until then, make sure it still assembles. - if {[istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { + if {[istarget hppa*64*-*-*] + || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { gas_test_old "exitbug.s" "" "Test for bogus R_EXIT relocation (part 1)" return; } @@ -357,12 +359,9 @@ proc do_cross_space_fixup_test_1 {} { set testname "fixupbug.s: Test cross space jump/call fixup bug (part 2)" set x 0 - if [istarget hppa*w-*-*] then { - return; - } - - # ELF (osf) doesn't really handle extra sections too well... - if {[istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { + # ELF doesn't really handle extra sections too well... + if {[istarget hppa*64*-*-*] + || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { return; } @@ -394,12 +393,9 @@ proc do_cross_space_fixup_test_2 {} { set testname "fixupbug.s: Test cross space jump/call fixup bug (part 3)" set x 0 - if [istarget hppa*w-*-*] then { - return; - } - - # ELF (osf) doesn't really handle extra sections too well... - if {[istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { + # ELF doesn't really handle extra sections too well... + if {[istarget hppa*64*-*-*] + || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { return; } @@ -432,7 +428,8 @@ proc do_round_mode_test {} { # Make sure GAS generated correct relocations to switch rounding modes. # Also make sure (for SOM) that redundant rounding mode relocations # were eliminated. - if { [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*] || [istarget hppa*w-*-*] } then { + if {[istarget hppa*64*-*-*] + || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { while 1 { expect { -re "^0+\[^\n\]*DIR21L\[^\n\]*\n" @@ -485,7 +482,8 @@ proc do_round_mode_test {} { objdump_finish # Did we find what we were looking for? If not, flunk it. - if {[istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*] || [istarget hppa*w-*-*] } then { + if {[istarget hppa*64*-*-*] + || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { if [expr $x==8] then { pass $testname } else { fail $testname } } else { if [expr $x==3] then { pass $testname } else { fail $testname } @@ -580,12 +578,9 @@ proc do_pic_relocation_test {} { set testname "picreloc.s: Test for proper PIC relocation (part 2)" set x 0 - if [istarget hppa*w-*-*] then { - return; - } - - # ELF (osf) doesn't really handle extra sections too well... - if {[istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { + # ELF doesn't really handle extra sections too well... + if {[istarget hppa*64*-*-*] + || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { return; } @@ -609,11 +604,12 @@ proc do_pic_relocation_test {} { } proc do_apply_test {} { - set testname "applybug.s: Test for proper fixup appliation (part 2)" + set testname "applybug.s: Test for proper fixup application (part 2)" set x 0 - # ELF (osf) doesn't really handle extra sections too well... - if {[istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { + # ELF doesn't really handle extra sections too well... + if {[istarget hppa*64*-*-*] + || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { return; } @@ -637,6 +633,7 @@ proc do_apply_test {} { # Did we find what we were looking for? If not, flunk it. if [expr $x==3] then { pass $testname } else { fail $testname } } + if [istarget hppa*-*-*] then { # Make sure we put the right relocation entry on a BLE instruction. do_ble_relocation_test diff --git a/gas/testsuite/gas/hppa/unsorted/unsorted.exp b/gas/testsuite/gas/hppa/unsorted/unsorted.exp index 320f63781f3..7db8045de4f 100644 --- a/gas/testsuite/gas/hppa/unsorted/unsorted.exp +++ b/gas/testsuite/gas/hppa/unsorted/unsorted.exp @@ -24,7 +24,8 @@ proc do_subspace_align_test {} { set testname "ss_align.s: Test subspace alignment (part 2)" set x 0 - if { [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*] || [istarget hppa*w-*-*] } then { + if {[istarget hppa*64*-*-*] + || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { return } @@ -107,7 +108,8 @@ 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*-*-linux*] || [istarget hppa*w-*-*] } then { + if {[istarget hppa*64*-*-*] + || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { return } @@ -138,8 +140,9 @@ proc do_align4_test {} { set testname "align4.s: More subspace alignment tests (part2)" set x 0 - if { [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*] || [istarget hppa*w-*-*] } then { - return + if {[istarget hppa*64*-*-*] + || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then { + return } if [gas_test_old "align4.s" "" "More subspace alignment tests (part1)"] { @@ -255,6 +258,4 @@ if [istarget hppa*-*-*] then { # Test for an off-by-2 bug in range check for conditional branches gas_test_error "brlenbug.s" "" "Check for error(s) in branch length" - } -