[PATCH] GCC 7.2.0: Fix 0051-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch

[PATCH] GCC 7.2.0: Fix 0051-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch

[Vincent Prince]

Patch fails to apply on peep-ldrd-1.c and peep-strd-1.c.
First chunk replace ldrd by ldrd\\t then second chunk copy peep-X-1.c to peep-ldrd-2.c and try to replace already patched ldrd\\t

Signed-off-by: Vincent Prince <vincent.prince.fr@gmail.com>
---
 .../0051-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-7.2/0051-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch b/meta/recipes-devtools/gcc/gcc-7.2/0051-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch
index 0212507..1995f64 100644
--- a/meta/recipes-devtools/gcc/gcc-7.2/0051-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch
+++ b/meta/recipes-devtools/gcc/gcc-7.2/0051-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch
@@ -158,7 +158,7 @@ index eb2b86ee7b6..6822c2b1454 100644
    *p = a;
    return a;
  }
--/* { dg-final { scan-assembler "ldrd" } } */
+-/* { dg-final { scan-assembler "ldrd\\t" } } */
 +/* { dg-final { scan-assembler-not "ldrd\\t" } } */
 diff --git a/gcc/testsuite/gcc.target/arm/peep-strd-1.c b/gcc/testsuite/gcc.target/arm/peep-strd-1.c
 index bd330769599..fe1beac7229 100644
@@ -187,7 +187,7 @@ index bd330769599..bfc5ebe9eec 100644
    p[2] = a;
    p[3] = b;
  }
--/* { dg-final { scan-assembler "strd" } } */
+-/* { dg-final { scan-assembler "strd\\t" } } */
 +/* { dg-final { scan-assembler-not "strd\\t" } } */
 -- 
 2.15.0
-- 
2.7.4

Re: [PATCH] GCC 7.2.0: Fix 0051-ARM-PR-82445-suppress-32-bit-aligned-ldrd-strd-peeph.patch

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]

On 5 December 2017 at 15:44, Vincent Prince <vincent.prince.fr@gmail.com>
wrote:

> Patch fails to apply on peep-ldrd-1.c and peep-strd-1.c.
> First chunk replace ldrd by ldrd\\t then second chunk copy peep-X-1.c to
> peep-ldrd-2.c and try to replace already patched ldrd\\t
>

We did some digging on IRC and discovered that this is caused by having an
old patch release (earlier than 2.7).  I've just sent a patch to check for
that instead.

Ross

[-- Attachment #2: Type: text/html, Size: 797 bytes --]