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

gas/
	PR gas/14987
	* config/tc-arm.c (parse_address_main): Skip whitespace before a
	closing bracket.

gas/testsuite/
	PR gas/14987
	* gas/arm/neon-ldst-es.s: Add whitespace test.
	* gas/arm/neon-ldst-es.d: Update expected disassembly.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 63fcd9feba8..4e8cf7380ef 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-02  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/14987
+	* config/tc-arm.c (parse_address_main): Skip whitespace before a
+	closing bracket.
+
 2013-06-24  Roland McGrath  <mcgrathr@google.com>
 
 	* config/tc-arm.c (arm_symbol_chars): Include '{' and '}'.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 4225e1edf4d..7ec4f4c981a 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -5296,6 +5296,9 @@ 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 424db409f78..1fbf0d9d190 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-02  Nick Clifton  <nickc@redhat.com>
+
+	PR gas/14987
+	* gas/arm/neon-ldst-es.s: Add whitespace test.
+	* gas/arm/neon-ldst-es.d: Update expected disassembly.
+
 2013-06-24  Roland McGrath  <mcgrathr@google.com>
 
 	* gas/arm/macro-pld.s: Add a 'push {r0}' case.
diff --git a/gas/testsuite/gas/arm/neon-ldst-es.d b/gas/testsuite/gas/arm/neon-ldst-es.d
index 82bbab3e536..6c22c6907ee 100644
--- a/gas/testsuite/gas/arm/neon-ldst-es.d
+++ b/gas/testsuite/gas/arm/neon-ldst-es.d
@@ -55,3 +55,4 @@ Disassembly of section \.text:
 0[0-9a-f]+ <[^>]+> f427288f 	vld2\.32	{d2-d3}, \[r7\]
 0[0-9a-f]+ <[^>]+> f427208f 	vld4\.32	{d2-d5}, \[r7\]
 0[0-9a-f]+ <[^>]+> f467c08f 	vld4\.32	{d28-d31}, \[r7\]
+0[0-9a-f]+ <[^>]+> f4a21c83 	vld1\.32	{d1\[\]}, \[r2\], r3
diff --git a/gas/testsuite/gas/arm/neon-ldst-es.s b/gas/testsuite/gas/arm/neon-ldst-es.s
index c97794c34cb..ea7de078ee8 100644
--- a/gas/testsuite/gas/arm/neon-ldst-es.s
+++ b/gas/testsuite/gas/arm/neon-ldst-es.s
@@ -57,3 +57,6 @@
 	vld2.32 {q1},[r7]
 	vld4.32 {q1-q2},[r7]
 	vld4.32 {q14-q15},[r7]
+
+	@ PR 14987: Allow for whitespace before the closing bracket.
+	vld1.32 {d1[]}, [r2 ], r3