binutils: backport whitespace fix

This is a backport of a whitespace skipping issue: PR14987 and PR14887

(From OE-Core rev: f4312eaeb6eb2b7196be2b968e2e468e705fb2cf)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2013-05-03 15:10:47 -07:00 committed by Richard Purdie
parent edcae40bf6
commit 483c900a4f
2 changed files with 51 additions and 0 deletions

View File

@ -37,6 +37,7 @@ BACKPORT = "\
file://backport/binutils-fix-ineffectual-zero-of-cache.patch \
file://backport/binutils-replace-strncat-with-strcat.patch \
file://backport/0001-config-tc-ppc.c-md_assemble-Do-not-generate-APUinfo-.patch \
file://backport/binutils-fix-skip-whitespace-pr14887.patch \
"
SRC_URI[md5sum] = "4f8fa651e35ef262edc01d60fb45702e"
SRC_URI[sha256sum] = "fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097"

View File

@ -0,0 +1,50 @@
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.
Upstream-Status: Backport [PR14887]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
===================================================================
RCS file: /cvs/src/src/gas/ChangeLog,v
retrieving revision 1.4898
retrieving revision 1.4899
Index: binutils-2.23.2/gas/config/tc-arm.c
===================================================================
--- binutils-2.23.2.orig/gas/config/tc-arm.c
+++ binutils-2.23.2/gas/config/tc-arm.c
@@ -885,6 +885,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)++;
@@ -5168,6 +5171,9 @@ parse_address_main (char **str, int i, i
return PARSE_OPERAND_SUCCESS;
}
+ /* PR gas/14987: Allow for whitespace before the expected character. */
+ skip_whitespace (p);
+
if ((reg = arm_reg_parse (&p, REG_TYPE_RN)) == FAIL)
{
inst.error = _(reg_expected_msgs[REG_TYPE_RN]);
Index: binutils-2.23.2/gas/testsuite/gas/arm/neon-ldst-es.s
===================================================================
--- binutils-2.23.2.orig/gas/testsuite/gas/arm/neon-ldst-es.s
+++ binutils-2.23.2/gas/testsuite/gas/arm/neon-ldst-es.s
@@ -57,3 +57,7 @@
vld2.32 {q1},[r7]
vld4.32 {q1-q2},[r7]
vld4.32 {q14-q15},[r7]
+
+ @ PR 14987 and 14887: Allow for whitespace in the instruction.
+ vld1.32 { d1 [ ] } , [ r2 ] , r3
+