* ld-discard/discard.exp, ld-scripts/phdrs.exp, ld-scripts/phdrs2.exp,

	ld-selective/sel-dump.exp: Test hppa*64*-*-hpux* target.
	* ld-elfvers/vers.exp, ld-elfvsb/elfvsb.exp, ld-elfweak/elfweak.exp,
	ld-linkonce/linkonce.exp, ld-shared/shared.exp,
	ld-undefined/weak-undef.exp:  Test hppa*64*-*-hpux* and hppa*-*-linux*
	targets.
	* ld-discard/exit.s, ld-discard/extern.s, ld-discard/start.s,
	ld-discard/static.s: Add whitespace before assembler directives.

15 files changed, 45 insertions, 16 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index ca4509aa15..b492850d3f 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2002-07-30  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+	* ld-discard/discard.exp, ld-scripts/phdrs.exp, ld-scripts/phdrs2.exp,
+	ld-selective/sel-dump.exp: Test hppa*64*-*-hpux* target.
+	* ld-elfvers/vers.exp, ld-elfvsb/elfvsb.exp, ld-elfweak/elfweak.exp,
+	ld-linkonce/linkonce.exp, ld-shared/shared.exp,
+	ld-undefined/weak-undef.exp:  Test hppa*64*-*-hpux* and hppa*-*-linux*
+	targets.
+	* ld-discard/exit.s, ld-discard/extern.s, ld-discard/start.s,
+	ld-discard/static.s: Add whitespace before assembler directives.
+
 2002-07-29  Chris Demetriou  <cgd@broadcom.com>
 
 	* ld-mips-elf/mips16-1.d: Check that ASE flag is actually set.
diff --git a/ld/testsuite/ld-discard/discard.exp b/ld/testsuite/ld-discard/discard.exp
index da60e90666..6aa9560120 100644
--- a/ld/testsuite/ld-discard/discard.exp
+++ b/ld/testsuite/ld-discard/discard.exp
@@ -22,7 +22,10 @@
 # Test for ELF here, so we don't have to qualify on ELF specifically
 # in every .d-file.
 
-if { ![istarget *-*-linux*] && ![istarget *-*-gnu] && ![istarget *-*-elf] } {
+if { ![istarget *-*-linux*] \
+     && ![istarget *-*-gnu] \
+     && ![istarget hppa*64*-*-hpux*] \
+     && ![istarget *-*-elf] } {
     return
 }
 
diff --git a/ld/testsuite/ld-discard/exit.s b/ld/testsuite/ld-discard/exit.s
index 80acef5c64..cc6786cb42 100644
--- a/ld/testsuite/ld-discard/exit.s
+++ b/ld/testsuite/ld-discard/exit.s
@@ -1,6 +1,6 @@
-.globl data
+	.globl data
 	.section	.data.exit,"aw"
 data:
-.globl text
+	.globl text
 	.section	.text.exit,"aw"
 text:
diff --git a/ld/testsuite/ld-discard/extern.s b/ld/testsuite/ld-discard/extern.s
index da8e27603e..f54a8a0ce7 100644
--- a/ld/testsuite/ld-discard/extern.s
+++ b/ld/testsuite/ld-discard/extern.s
@@ -1,11 +1,11 @@
-.globl data
+	.globl data
 	.section	.data.exit,"aw"
 data:
-.globl text
+	.globl text
 	.section	.text.exit,"aw"
 text:
-.text
-.globl _start
+	.text
+	.globl _start
 _start:
 	.long	data
 	.section	.debug_info
diff --git a/ld/testsuite/ld-discard/start.s b/ld/testsuite/ld-discard/start.s
index 82290c6bfa..9a6749e13a 100644
--- a/ld/testsuite/ld-discard/start.s
+++ b/ld/testsuite/ld-discard/start.s
@@ -1,5 +1,5 @@
-.text
-.globl _start
+	.text
+	.globl _start
 _start:
 	.long	data
 	.section	.debug_info
diff --git a/ld/testsuite/ld-discard/static.s b/ld/testsuite/ld-discard/static.s
index b251c8b5eb..d6a6c68121 100644
--- a/ld/testsuite/ld-discard/static.s
+++ b/ld/testsuite/ld-discard/static.s
@@ -2,8 +2,8 @@
 data:
 	.section	.text.exit,"aw"
 text:
-.text
-.globl _start
+	.text
+	.globl _start
 _start:
 	.long	data
 	.section	.debug_info
diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp
index 6381ea5084..1acc0e6559 100644
--- a/ld/testsuite/ld-elfvers/vers.exp
+++ b/ld/testsuite/ld-elfvers/vers.exp
@@ -25,7 +25,9 @@ if ![isnative] then {return}
 # This test can only be run on a couple of ELF platforms.
 # Square bracket expressions seem to confuse istarget.
 # This is similar to the test that is used in ld-shared, BTW.
-if { ![istarget i?86-*-sysv4*] \
+if { ![istarget hppa*64*-*-hpux*] \
+     && ![istarget hppa*-*-linux*] \
+     && ![istarget i?86-*-sysv4*] \
      && ![istarget i?86-*-unixware] \
      && ![istarget i?86-*-elf*] \
      && ![istarget i?86-*-linux*] \
diff --git a/ld/testsuite/ld-elfvsb/elfvsb.exp b/ld/testsuite/ld-elfvsb/elfvsb.exp
index eb72b0c2ca..d73f679dee 100644
--- a/ld/testsuite/ld-elfvsb/elfvsb.exp
+++ b/ld/testsuite/ld-elfvsb/elfvsb.exp
@@ -26,7 +26,9 @@ if ![isnative] then {return}
 
 # This test can only be run on a couple of ELF platforms.
 # Square bracket expressions seem to confuse istarget.
-if { ![istarget i?86-*-linux*] \
+if { ![istarget hppa*64*-*-hpux*] \
+     && ![istarget hppa*-*-linux*] \
+     && ![istarget i?86-*-linux*] \
      && ![istarget ia64-*-linux*] \
      && ![istarget m68k-*-linux*] \
      && ![istarget mips*-*-linux*] \
diff --git a/ld/testsuite/ld-elfweak/elfweak.exp b/ld/testsuite/ld-elfweak/elfweak.exp
index bfefa115f1..11dd323780 100644
--- a/ld/testsuite/ld-elfweak/elfweak.exp
+++ b/ld/testsuite/ld-elfweak/elfweak.exp
@@ -25,7 +25,9 @@ if ![isnative] then {return}
 # This test can only be run on a couple of ELF platforms.
 # Square bracket expressions seem to confuse istarget.
 # This is similar to the test that is used in ld-shared, BTW.
-if { ![istarget i?86-*-sysv4*] \
+if { ![istarget hppa*64*-*-hpux*] \
+     && ![istarget hppa*-*-linux*] \
+     && ![istarget i?86-*-sysv4*] \
      && ![istarget i?86-*-unixware] \
      && ![istarget i?86-*-elf*] \
      && ![istarget i?86-*-linux*] \
diff --git a/ld/testsuite/ld-linkonce/linkonce.exp b/ld/testsuite/ld-linkonce/linkonce.exp
index d3be491a8c..2e24d28946 100644
--- a/ld/testsuite/ld-linkonce/linkonce.exp
+++ b/ld/testsuite/ld-linkonce/linkonce.exp
@@ -21,7 +21,10 @@
 # Test for ELF here (or really, .gnu.linkonce functionality), so we don't
 # have to qualify on ELF specifically in every .d-file.
 
-if { ![istarget *-*-linux*] && ![istarget *-*-gnu] && ![istarget *-*-elf] } {
+if { ![istarget *-*-linux*] \
+     && ![istarget *-*-gnu] \
+     && ![istarget hppa*64*-*-hpux*] \
+     && ![istarget *-*-elf] } {
     return
 }
 
diff --git a/ld/testsuite/ld-scripts/phdrs.exp b/ld/testsuite/ld-scripts/phdrs.exp
index 4c142c636c..7901d79d39 100644
--- a/ld/testsuite/ld-scripts/phdrs.exp
+++ b/ld/testsuite/ld-scripts/phdrs.exp
@@ -22,6 +22,7 @@ if { ![istarget *-*-sysv4*] \
      && ![istarget *-*-unixware*] \
      && ![istarget *-*-elf*] \
      && ![istarget *-*-eabi*] \
+     && ![istarget hppa*64*-*-hpux*] \
      && ![istarget *-*-linux*] \
      && ![istarget *-*-irix5*] \
      && ![istarget *-*-irix6*] \
diff --git a/ld/testsuite/ld-scripts/phdrs2.exp b/ld/testsuite/ld-scripts/phdrs2.exp
index bbe36d08e9..48f24c550d 100644
--- a/ld/testsuite/ld-scripts/phdrs2.exp
+++ b/ld/testsuite/ld-scripts/phdrs2.exp
@@ -19,6 +19,7 @@ if {    ![istarget *-*-sysv4*] \
      && ![istarget *-*-unixware*] \
      && ![istarget *-*-elf*] \
      && ![istarget *-*-eabi*] \
+     && ![istarget hppa*64*-*-hpux*] \
      && ![istarget *-*-linux*] \
      && ![istarget *-*-irix5*] \
      && ![istarget *-*-irix6*] \
diff --git a/ld/testsuite/ld-selective/sel-dump.exp b/ld/testsuite/ld-selective/sel-dump.exp
index ee4de621aa..e99d5aef52 100644
--- a/ld/testsuite/ld-selective/sel-dump.exp
+++ b/ld/testsuite/ld-selective/sel-dump.exp
@@ -20,6 +20,7 @@
 
 if { ![istarget *-*-linux*]
      && ![istarget *-*-gnu]
+     && ![istarget hppa*64*-*-hpux*]
      && ![istarget *-*-elf] } {
     return
 }
diff --git a/ld/testsuite/ld-shared/shared.exp b/ld/testsuite/ld-shared/shared.exp
index 645721ea1d..dfe71ddb1f 100644
--- a/ld/testsuite/ld-shared/shared.exp
+++ b/ld/testsuite/ld-shared/shared.exp
@@ -28,7 +28,9 @@ if ![isnative] then {return}
 
 # This test can only be run on a couple of ELF platforms.
 # Square bracket expressions seem to confuse istarget.
-if { ![istarget i?86-*-sysv4*] \
+if { ![istarget hppa*64*-*-hpux*] \
+     && ![istarget hppa*-*-linux*] \
+     && ![istarget i?86-*-sysv4*] \
      && ![istarget i?86-*-unixware] \
      && ![istarget i?86-*-elf*] \
      && ![istarget i?86-*-linux*] \
diff --git a/ld/testsuite/ld-undefined/weak-undef.exp b/ld/testsuite/ld-undefined/weak-undef.exp
index 8de2949750..fe21a8fc03 100644
--- a/ld/testsuite/ld-undefined/weak-undef.exp
+++ b/ld/testsuite/ld-undefined/weak-undef.exp
@@ -25,6 +25,7 @@ if { ![istarget *-*-sysv4*] \
      && ![istarget *-*-unixware*] \
      && ![istarget *-*-elf*] \
      && ![istarget *-*-eabi*] \
+     && ![istarget hppa*64*-*-hpux*] \
      && ![istarget *-*-linux*] \
      && ![istarget *-*-irix5*] \
      && ![istarget *-*-irix6*] \