revert premature delta

1 files changed, 8 insertions, 17 deletions

diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index 9275774..7679722 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -95,13 +95,8 @@ if { [is_elf_format] } then {
     run_dump_test "group0c"
     run_dump_test "group1a"
     run_dump_test "group1b"
+    run_dump_test "groupautoa"
     case $target_triplet in {
-	{ hppa64*-*-hpux* } { }
-	default {
-	    run_dump_test "groupautoa"
-	}
-    case $target_triplet in {
-	{ hppa64*-*-hpux* } { }
 	{ xtensa*-*-* } { }
 	default {
 	    run_dump_test "groupautob"
@@ -152,20 +147,16 @@ if { [is_elf_format] } then {
     }
     run_dump_test "symver"
 
-    if { [istarget "hppa*-*-hpux*"] } then {
-	# No indirect functions on non-GNU targets.
-    } else {
-	# The MSP port sets the ELF header's OSABI field to ELFOSABI_STANDALONE.
-	# The non-eabi ARM ports sets it to ELFOSABI_ARM.
-	# So for these targets we cannot include an IFUNC symbol type
-	# in the symbol type test.
-	if { [istarget "msp*-*-*"]
-	     || [istarget "arm*-*-*"]} then {
+    # The MSP port sets the ELF header's OSABI field to ELFOSABI_STANDALONE.
+    # The non-eabi ARM ports sets it to ELFOSABI_ARM.
+    # So for these targets we cannot include an IFUNC symbol type
+    # in the symbol type test.
+    if {   [istarget "msp*-*-*"]
+	|| [istarget "arm*-*-*"]} then {
 	    run_elf_list_test "type-noifunc" "" "" "-s" "| grep \"1 *\\\[FONTC\\\]\""
-	} else {
+    } else {
     	    run_dump_test ifunc-1
 	    run_elf_list_test "type" "" "" "-s" "| grep \"1 *\\\[FIONTCU\\\]\""
-	}
     }
 
     run_dump_test "section6"