From: Roland McGrath <roland@gnu.org>
Date: Mon, 24 Jun 2013 23:13:00 +0000 (+0000)
Subject: gas/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d996d9708adb868b6af3f9aa8511749061d178a4;p=binutils-gdb.git

gas/
	* config/tc-arm.c (parse_reg_list): Use skip_past_char for '}',
	so it skips whitespace before it.
	(s_arm_unwind_save_mmxwr, s_arm_unwind_save_mmxwcg): Likewise.

gas/testsuite/
	* gas/arm/macro-vld1.s: Add a case with whitespace before '}'.
	* gas/arm/macro-vld1.d: Update.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 458421d7ccf..905d953d606 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
 2013-06-24  Roland McGrath  <mcgrathr@google.com>
 
+	* config/tc-arm.c (parse_reg_list): Use skip_past_char for '}',
+	so it skips whitespace before it.
+	(s_arm_unwind_save_mmxwr, s_arm_unwind_save_mmxwcg): Likewise.
+
 	* config/tc-arm.c (arm_symbol_chars): Include '{' and '}'.
 	(arm_reg_parse_multi): Skip whitespace first.
 	(parse_reg_list): Likewise.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index d2085a3f75f..b3d8d625d16 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -1641,7 +1641,7 @@ parse_reg_list (char ** strp)
 		 || (in_range = 1, *str++ == '-'));
 	  str--;
 
-	  if (*str++ != '}')
+	  if (skip_past_char (&str, '}') == FAIL)
 	    {
 	      first_error (_("missing `}'"));
 	      return FAIL;
@@ -3935,8 +3935,7 @@ s_arm_unwind_save_mmxwr (void)
     }
   while (skip_past_comma (&input_line_pointer) != FAIL);
 
-  if (*input_line_pointer == '}')
-    input_line_pointer++;
+  skip_past_char (&input_line_pointer, '}');
 
   demand_empty_rest_of_line ();
 
@@ -4070,8 +4069,7 @@ s_arm_unwind_save_mmxwcg (void)
     }
   while (skip_past_comma (&input_line_pointer) != FAIL);
 
-  if (*input_line_pointer == '}')
-    input_line_pointer++;
+  skip_past_char (&input_line_pointer, '}');
 
   demand_empty_rest_of_line ();
 
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5fb0d661f26..45a790c9e1e 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2013-06-24  Roland McGrath  <mcgrathr@google.com>
 
+	* gas/arm/macro-vld1.s: Add a case with whitespace before '}'.
+	* gas/arm/macro-vld1.d: Update.
+
 	* gas/arm/macro-pld.s: Add a 'push {r0}' case.
 	* gas/arm/macro-pld.d: Update expected output.
 	* gas/arm/macro-vld1.s: New file.
diff --git a/gas/testsuite/gas/arm/macro-vld1.d b/gas/testsuite/gas/arm/macro-vld1.d
index 4a5e2f545ed..b4f6721560b 100644
--- a/gas/testsuite/gas/arm/macro-vld1.d
+++ b/gas/testsuite/gas/arm/macro-vld1.d
@@ -6,3 +6,4 @@ Disassembly of section \.text:
 
 0+ <.*>:
 \s*0:\s+f420070f\s+vld1.8\s+{d0},\s*\[r0\]
+\s*4:\s+f420070f\s+vld1.8\s+{d0},\s*\[r0\]
diff --git a/gas/testsuite/gas/arm/macro-vld1.s b/gas/testsuite/gas/arm/macro-vld1.s
index 530c5c35b93..614724b867c 100644
--- a/gas/testsuite/gas/arm/macro-vld1.s
+++ b/gas/testsuite/gas/arm/macro-vld1.s
@@ -7,3 +7,4 @@
                 .purgem _sfi_breg_doit
         .endm
 	sfi_breg r0, vld1.8 {d0}, [\B]
+	sfi_breg r0, vld1.8 { d0 }, [\B]