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 458421d7ccf10be3cae9ec72287af6068f3e718e..905d953d606439a3d51b658dfa2988a690785291 100644 (file)
--- 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 d2085a3f75f1f6d3a0c0747dfd8388b7852e8e5e..b3d8d625d16c4410a344c50ef6b24da2abb25c72 100644 (file)
--- 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 5fb0d661f260b97bb0515ee02e93bf66a270ea48..45a790c9e1e390efeaa91570468acd3dd0b2a71f 100644 (file)
--- 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 4a5e2f545ed915a9fb2057d09ac3de7642151af7..b4f6721560b6a01aaea477fb2c167aa54da5ec7a 100644 (file)
--- 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 530c5c35b93e626746af2ff51842ef5260025e02..614724b867c787da21106347a27c17897dceee3d 100644 (file)
--- 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]