diff options
| author | Kyrill Tkachov <kyrylo.tkachov@foss.arm.com> | 2017-01-26 10:26:10 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2017-01-26 16:29:36 +0100 |
| commit | 52a6da816f72e50aa79f0b941a003b94510fb1ad (patch) | |
| tree | a5f8b459b8fe7d814af6190a46ca4f3993a21183 | |
| parent | 3ebc26958e6456befd95809faa6d88481f29bc89 (diff) | |
arm: Fix addressing in optpld macro
In patch b219285f873cc79361355938bd2a994957b4a6ef you have a syntax
error in the PLD instruction. The syntax for the pld argument should be
in square brackets as it's a memory address like so: pld [r1]. With
your patch the newlib build fails for armv7-a targets. This patch fixes
the build failures.
Tested by making sure the newlib build completes successfully.
2016-01-26 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* libc/machine/arm/strcpy.c (strcpy): Fix PLD assembly syntax.
* libc/machine/arm/strlen-stub.c (strlen): Likewise.
| -rw-r--r-- | newlib/libc/machine/arm/strcpy.c | 4 | ||||
| -rw-r--r-- | newlib/libc/machine/arm/strlen-stub.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/newlib/libc/machine/arm/strcpy.c b/newlib/libc/machine/arm/strcpy.c index 6f358e489..f1205b9c1 100644 --- a/newlib/libc/machine/arm/strcpy.c +++ b/newlib/libc/machine/arm/strcpy.c @@ -45,7 +45,7 @@ strcpy (char* dst, const char* src) #if !(defined(__OPTIMIZE_SIZE__) || defined (PREFER_SIZE_OVER_SPEED) || \ (defined (__thumb__) && !defined (__thumb2__))) #ifdef _ISA_ARM_7 - "pld r1\n\t" + "pld [r1]\n\t" #endif "eor r2, r0, r1\n\t" "mov ip, r0\n\t" @@ -78,7 +78,7 @@ strcpy (char* dst, const char* src) ".p2align 2\n" "2:\n\t" #ifdef _ISA_ARM_7 - "pld r1, #8\n\t" + "pld [r1, #8]\n\t" #endif "ldr r4, [r1], #4\n\t" "sub r2, r3, "magic1(r5)"\n\t" diff --git a/newlib/libc/machine/arm/strlen-stub.c b/newlib/libc/machine/arm/strlen-stub.c index 8f87cba09..fc2daf16f 100644 --- a/newlib/libc/machine/arm/strlen-stub.c +++ b/newlib/libc/machine/arm/strlen-stub.c @@ -59,7 +59,7 @@ strlen (const char* str) "addr .req r1\n\t" #ifdef _ISA_ARM_7 - "pld r0\n\t" + "pld [r0]\n\t" #endif /* Word-align address */ "bic addr, r0, #3\n\t" @@ -116,7 +116,7 @@ strlen (const char* str) /* and 4 more bytes */ "addeq len, len, #4\n\t" /* Unroll the loop a bit. */ - "pld addr, #8\n\t" + "pld [addr, #8]\n\t" /* test (data - 0x01010101) */ "ittt eq\n\t" "subeq r2, data, ip\n\t" |