[U-Boot] [PATCH] mainline arm926ejs: Fix two occurrences of illegal syntax assembler instructions

HEAD is at commit c62491d2602b353a815a909e27eec0df9f2c06a2 Untested due to link error bug
Signed-off-by: Gray Remlin g_remlin@rocketmail.com --- arch/arm/cpu/arm926ejs/start.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S index 863de3b..4d55573 100644 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@ -226,7 +226,7 @@ copy_loop: add r3, r3, r0 /* r3 <- rel dyn end in FLASH */ fixloop: ldr r0, [r2] /* r0 <- location to fix up, IN FLASH! */ - add r0, r9 /* r0 <- location to fix up in RAM */ + add r0, r0, r9 /* r0 <- location to fix up in RAM */ ldr r1, [r2, #4] and r8, r1, #0xff cmp r8, #23 /* relative fixup? */ @@ -240,7 +240,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ --

Dear Gray Remlin,
In message 4CC06B1A.2070401@rocketmail.com you wrote:
HEAD is at commit c62491d2602b353a815a909e27eec0df9f2c06a2 Untested due to link error bug
What makes you think this is "illegal syntax" ?
gas seems to digest this just fine.
Which sort of tool chain are you using?
arch/arm/cpu/arm926ejs/start.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
Hm, if you really want to fix this, then please fix all occurrences:
-> find arch/arm | xargs grep 'add r[0-9], r[0-9][^,]*$' arch/arm/cpu/arm1136/start.S: add r0, r9 /* r0 <- location to fix up in RAM */ arch/arm/cpu/arm1136/start.S: add r1, r9 /* r1 <- relocated sym addr */ arch/arm/cpu/arm926ejs/start.S: add r0, r9 /* r0 <- location to fix up in RAM */ arch/arm/cpu/arm926ejs/start.S: add r1, r9 /* r1 <- relocated sym addr */ arch/arm/cpu/armv7/start.S: add r0, r9 /* r0 <- location to fix up in RAM */ arch/arm/cpu/armv7/start.S: add r1, r9 /* r1 <- relocated sym addr */
Best regards,
Wolfgang Denk
participants (2)
-
Gray Remlin
-
Wolfgang Denk