summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.23.2.inc1
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.23.2/backport/binutils-fix-skip-whitespace-pr14887.patch50
2 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.2.inc b/meta/recipes-devtools/binutils/binutils-2.23.2.inc
index 0b012798db..ddbe522c9c 100644
--- a/meta/recipes-devtools/binutils/binutils-2.23.2.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.23.2.inc
@@ -37,6 +37,7 @@ BACKPORT = "\
37 file://backport/binutils-fix-ineffectual-zero-of-cache.patch \ 37 file://backport/binutils-fix-ineffectual-zero-of-cache.patch \
38 file://backport/binutils-replace-strncat-with-strcat.patch \ 38 file://backport/binutils-replace-strncat-with-strcat.patch \
39 file://backport/0001-config-tc-ppc.c-md_assemble-Do-not-generate-APUinfo-.patch \ 39 file://backport/0001-config-tc-ppc.c-md_assemble-Do-not-generate-APUinfo-.patch \
40 file://backport/binutils-fix-skip-whitespace-pr14887.patch \
40" 41"
41SRC_URI[md5sum] = "4f8fa651e35ef262edc01d60fb45702e" 42SRC_URI[md5sum] = "4f8fa651e35ef262edc01d60fb45702e"
42SRC_URI[sha256sum] = "fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097" 43SRC_URI[sha256sum] = "fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097"
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.2/backport/binutils-fix-skip-whitespace-pr14887.patch b/meta/recipes-devtools/binutils/binutils-2.23.2/backport/binutils-fix-skip-whitespace-pr14887.patch
new file mode 100644
index 0000000000..e504b3b92c
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils-2.23.2/backport/binutils-fix-skip-whitespace-pr14887.patch
@@ -0,0 +1,50 @@
1
2
3PR gas/14887
4 * config/tc-arm.c (skip_past_char): Skip whitespace before the anticipated character.
5 * config/tc-arm.c (parse_address_main): Delete skip of whitespace here as it is no longer needed.
6
7Upstream-Status: Backport [PR14887]
8
9Signed-off-by: Saul Wold <sgw@linux.intel.com>
10
11===================================================================
12RCS file: /cvs/src/src/gas/ChangeLog,v
13retrieving revision 1.4898
14retrieving revision 1.4899
15Index: binutils-2.23.2/gas/config/tc-arm.c
16===================================================================
17--- binutils-2.23.2.orig/gas/config/tc-arm.c
18+++ binutils-2.23.2/gas/config/tc-arm.c
19@@ -885,6 +885,9 @@ const char FLT_CHARS[] = "rRsSfFdDxXeEpP
20 static inline int
21 skip_past_char (char ** str, char c)
22 {
23+ /* PR gas/14987: Allow for whitespace before the expected character. */
24+ skip_whitespace (*str);
25+
26 if (**str == c)
27 {
28 (*str)++;
29@@ -5168,6 +5171,9 @@ parse_address_main (char **str, int i, i
30 return PARSE_OPERAND_SUCCESS;
31 }
32
33+ /* PR gas/14987: Allow for whitespace before the expected character. */
34+ skip_whitespace (p);
35+
36 if ((reg = arm_reg_parse (&p, REG_TYPE_RN)) == FAIL)
37 {
38 inst.error = _(reg_expected_msgs[REG_TYPE_RN]);
39Index: binutils-2.23.2/gas/testsuite/gas/arm/neon-ldst-es.s
40===================================================================
41--- binutils-2.23.2.orig/gas/testsuite/gas/arm/neon-ldst-es.s
42+++ binutils-2.23.2/gas/testsuite/gas/arm/neon-ldst-es.s
43@@ -57,3 +57,7 @@
44 vld2.32 {q1},[r7]
45 vld4.32 {q1-q2},[r7]
46 vld4.32 {q14-q15},[r7]
47+
48+ @ PR 14987 and 14887: Allow for whitespace in the instruction.
49+ vld1.32 { d1 [ ] } , [ r2 ] , r3
50+