From: Roland McGrath <roland@gnu.org>
Date: Mon, 24 Jun 2013 23:36:17 +0000 (+0000)
Subject: gas/
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20c56bb5feaee69067e2bd3e42dcdd2e63edcafb;p=thirdparty%2Fbinutils-gdb.git

gas/
	PR gas/14887
	* config/tc-arm.c (skip_past_char): Skip whitespace before the
	anticipated character.
	* config/tc-arm.c (parse_address_main): Delete skip of whitespace
	here as it is no longer needed.

gas/testsuite/
	PR gas/14887
	* gas/arm/neon-ldst-es.s: Add more whitespace.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4e8cf7380ef..0538db8948a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-07  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/14887
+	* config/tc-arm.c (skip_past_char): Skip whitespace before the
+	anticipated character.
+	* config/tc-arm.c (parse_address_main): Delete skip of whitespace
+	here as it is no longer needed.
+
 2013-01-02  Nick Clifton  <nickc@redhat.com>
 
 	PR gas/14987
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 7ec4f4c981a..ef38e445dd1 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -886,6 +886,9 @@ const char FLT_CHARS[] = "rRsSfFdDxXeEpP";
 static inline int
 skip_past_char (char ** str, char c)
 {
+  /* PR gas/14987: Allow for whitespace before the expected character.  */
+  skip_whitespace (*str);
+  
   if (**str == c)
     {
       (*str)++;
@@ -5173,6 +5176,9 @@ parse_address_main (char **str, int i, int group_relocations,
       return PARSE_OPERAND_SUCCESS;
     }
 
+  /* PR gas/14887: Allow for whitespace after the opening bracket.  */
+  skip_whitespace (p);
+
   if ((reg = arm_reg_parse (&p, REG_TYPE_RN)) == FAIL)
     {
       inst.error = _(reg_expected_msgs[REG_TYPE_RN]);
@@ -5296,9 +5302,6 @@ parse_address_main (char **str, int i, int group_relocations,
 	return result;
     }
 
-  /* PR gas/14987: Allow for whitespace before the closing bracket.  */
-  skip_whitespace (p);
-
   if (skip_past_char (&p, ']') == FAIL)
     {
       inst.error = _("']' expected");
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 1fbf0d9d190..0bd0ac9bf38 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-07  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/14887
+	* gas/arm/neon-ldst-es.s: Add more whitespace.
+
 2013-01-02  Nick Clifton  <nickc@redhat.com>
 
 	PR gas/14987
diff --git a/gas/testsuite/gas/arm/neon-ldst-es.s b/gas/testsuite/gas/arm/neon-ldst-es.s
index ea7de078ee8..79f4b0cdd3d 100644
--- a/gas/testsuite/gas/arm/neon-ldst-es.s
+++ b/gas/testsuite/gas/arm/neon-ldst-es.s
@@ -58,5 +58,5 @@
 	vld4.32 {q1-q2},[r7]
 	vld4.32 {q14-q15},[r7]
 
-	@ PR 14987: Allow for whitespace before the closing bracket.
-	vld1.32 {d1[]}, [r2 ], r3
+	@ PR 14987 and 14887: Allow for whitespace in the instruction.
+	vld1.32 { d1 [ ] } , [ r2 ] , r3