* config/tc-hppa.c (hppa_symbol_chars): Remove `,' and `!'.

	* testsuite/gas/hppa/parse/parse.exp: Add "space.s".
	* testsuite/gas/hppa/parse/space.s: New file to test spaces.

5 files changed, 40 insertions, 2 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c0e2ee05d5..fe9d11fd97 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-21  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* tc-hppa.c (hppa_symbol_chars): Remove `,' and `!'.
+
 2003-05-21  Nick Clifton  <nickc@redhat.com>
 
         * config/obj-elf.c: Include dwarf2dbg.h.
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 3212ead822..39da02ed17 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -622,8 +622,10 @@ static struct call_desc last_call_desc;
 /* handle of the OPCODE hash table */
 static struct hash_control *op_hash = NULL;
 
-/* Those characters can be suffixes of opcode names.  */
-const char hppa_symbol_chars[] = ",*!?=<>";
+/* These characters can be suffixes of opcode names and they may be
+   followed by meaningful whitespace.  We don't include `,' and `!'
+   as they never appear followed by meaningful whitespace.  */
+const char hppa_symbol_chars[] = "*?=<>";
 
 /* Table of pseudo ops for the PA.  FIXME -- how many of these
    are now redundant with the overall GAS and the object file
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 6a4114f52f..794686f0b2 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-21  H.J. Lu <hongjiu.lu@intel.com>
+
+	* gas/hppa/parse/parse.exp: Add "space.s".
+	* gas/hppa/parse/space.s: New file to test spaces.
+
 2003-05-20  Jason Eckhardt  <jle@rice.edu>
 
 	* gas/i860/branch.{s,d}: New files.
diff --git a/gas/testsuite/gas/hppa/parse/parse.exp b/gas/testsuite/gas/hppa/parse/parse.exp
index 6a7c425130..463c48f159 100644
--- a/gas/testsuite/gas/hppa/parse/parse.exp
+++ b/gas/testsuite/gas/hppa/parse/parse.exp
@@ -222,5 +222,8 @@ if [istarget hppa*-*-*] then {
     # Check for bogus registers in single precision fmpyadd/fmpysub
     # instructions
     gas_test_error "badfmpyadd.s" "" "Check for error on bad fmpyadd insn"
+
+    # Make sure we grok spaces in directives.
+    gas_test "space.s" "" "" "Test acceptance of spaces in directives"
 }
 
diff --git a/gas/testsuite/gas/hppa/parse/space.s b/gas/testsuite/gas/hppa/parse/space.s
new file mode 100644
index 0000000000..2e37e7e0aa
--- /dev/null
+++ b/gas/testsuite/gas/hppa/parse/space.s
@@ -0,0 +1,24 @@
+	.code
+	.align 4
+	.export $$mulI, millicode
+	.proc
+	.callinfo millicode
+$$mulI:
+	.procend
+
+	.code
+
+	.align 4
+	.PARAM foo, RTNVAL=GR
+foo:
+	.PROC
+	.CALLINFO FRAME=128, NO_CALLS, ENTRY_GR=3,  ENTRY_FR=12
+	.ENTRY
+	bv,n %r0(%r2)
+	.EXIT
+	.PROCEND
+
+	.align 4
+	.import yabba, code
+
+  	ble	R%yabba(%sr4, 	%r0)