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.

	PR gas/14887
	* gas/arm/neon-ldst-es.s: Add more whitespace.
This commit is contained in:
Nick Clifton 2013-01-07 12:49:12 +00:00
parent 7ca01ed925
commit 8ab8155f36
4 changed files with 22 additions and 6 deletions

View File

@ -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-06 Andreas Schwab <schwab@linux-m68k.org> 2013-01-06 Andreas Schwab <schwab@linux-m68k.org>
* doc/c-mips.texi (MIPS Opts): Fix use of @itemx. * doc/c-mips.texi (MIPS Opts): Fix use of @itemx.

View File

@ -1,6 +1,6 @@
/* tc-arm.c -- Assemble for the ARM /* tc-arm.c -- Assemble for the ARM
Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
Free Software Foundation, Inc. Free Software Foundation, Inc.
Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org) Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
Modified by David Taylor (dtaylor@armltd.co.uk) Modified by David Taylor (dtaylor@armltd.co.uk)
@ -885,6 +885,9 @@ const char FLT_CHARS[] = "rRsSfFdDxXeEpP";
static inline int static inline int
skip_past_char (char ** str, char c) skip_past_char (char ** str, char c)
{ {
/* PR gas/14987: Allow for whitespace before the expected character. */
skip_whitespace (*str);
if (**str == c) if (**str == c)
{ {
(*str)++; (*str)++;
@ -5168,6 +5171,9 @@ parse_address_main (char **str, int i, int group_relocations,
return PARSE_OPERAND_SUCCESS; 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) if ((reg = arm_reg_parse (&p, REG_TYPE_RN)) == FAIL)
{ {
inst.error = _(reg_expected_msgs[REG_TYPE_RN]); inst.error = _(reg_expected_msgs[REG_TYPE_RN]);
@ -5291,9 +5297,6 @@ parse_address_main (char **str, int i, int group_relocations,
return result; return result;
} }
/* PR gas/14987: Allow for whitespace before the closing bracket. */
skip_whitespace (p);
if (skip_past_char (&p, ']') == FAIL) if (skip_past_char (&p, ']') == FAIL)
{ {
inst.error = _("']' expected"); inst.error = _("']' expected");

View File

@ -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-04 Juergen Urban <JuergenUrban@gmx.de> 2013-01-04 Juergen Urban <JuergenUrban@gmx.de>
* gas/mips/r5900-full.s: New test. * gas/mips/r5900-full.s: New test.

View File

@ -58,5 +58,5 @@
vld4.32 {q1-q2},[r7] vld4.32 {q1-q2},[r7]
vld4.32 {q14-q15},[r7] vld4.32 {q14-q15},[r7]
@ PR 14987: Allow for whitespace before the closing bracket. @ PR 14987 and 14887: Allow for whitespace in the instruction.
vld1.32 {d1[]}, [r2 ], r3 vld1.32 { d1 [ ] } , [ r2 ] , r3