Patchwork binutils: backport whitespace fix

login
register
mail settings
Submitter Saul Wold
Date May 3, 2013, 10:12 p.m.
Message ID <1367619160-17703-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/49315/
State Accepted
Commit 483c900a4fe07f93bd63651b1084582e08ec2bf5
Headers show

Comments

Saul Wold - May 3, 2013, 10:12 p.m.
This is a backport of a whitespace skipping issue: PR14987 and PR14887

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/binutils/binutils-2.23.2.inc |    1 +
 .../binutils-fix-skip-whitespace-pr14887.patch     |   50 ++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 meta/recipes-devtools/binutils/binutils-2.23.2/backport/binutils-fix-skip-whitespace-pr14887.patch
Khem Raj - May 4, 2013, 4:32 p.m.
Looked good.

Acked-By: Khem Raj <raj.khem@gmail.com>

On May 3, 2013, at 3:12 PM, Saul Wold <sgw@linux.intel.com> wrote:

> This is a backport of a whitespace skipping issue: PR14987 and PR14887
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-devtools/binutils/binutils-2.23.2.inc |    1 +
> .../binutils-fix-skip-whitespace-pr14887.patch     |   50 ++++++++++++++++++++
> 2 files changed, 51 insertions(+)
> create mode 100644 meta/recipes-devtools/binutils/binutils-2.23.2/backport/binutils-fix-skip-whitespace-pr14887.patch
> 
> diff --git a/meta/recipes-devtools/binutils/binutils-2.23.2.inc b/meta/recipes-devtools/binutils/binutils-2.23.2.inc
> index 0b01279..ddbe522 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 = "\
>      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"
> 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 0000000..e504b3b
> --- /dev/null
> +++ b/meta/recipes-devtools/binutils/binutils-2.23.2/backport/binutils-fix-skip-whitespace-pr14887.patch
> @@ -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
> ++
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/binutils/binutils-2.23.2.inc b/meta/recipes-devtools/binutils/binutils-2.23.2.inc
index 0b01279..ddbe522 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 = "\
      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"
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 0000000..e504b3b
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils-2.23.2/backport/binutils-fix-skip-whitespace-pr14887.patch
@@ -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
++