diff options
| author | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-08-17 13:55:49 +0000 |
|---|---|---|
| committer | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-08-17 13:55:49 +0000 |
| commit | ddca98cc5dfc2317c41415dee854ca54461a50c8 (patch) | |
| tree | 797805842c6f01c352bcd61fc3fc111d58204c5f /ldso/ldso/sh | |
| parent | 6d6f3a5c26adcf6b105edfb4b53e97ceee81944c (diff) | |
David McCulloug writes:
"There's a bug in the SH asm, it calls into 'C' code without preserving
all the important scratch registers. I have been meaning to double
check the changes as I think more registers need to be saved, then I
was going to send it back to uClibc. From the sound of it this isn't
your problem, but you never know.
Attached is the patch as it stands for the loader on SH."
Glibc appears to do the same.
Diffstat (limited to 'ldso/ldso/sh')
| -rw-r--r-- | ldso/ldso/sh/resolve.S | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ldso/ldso/sh/resolve.S b/ldso/ldso/sh/resolve.S index 1d3bc5cdc..e66d316ef 100644 --- a/ldso/ldso/sh/resolve.S +++ b/ldso/ldso/sh/resolve.S @@ -8,6 +8,7 @@ .type _dl_linux_resolve, @function .balign 16 _dl_linux_resolve: + mov.l r2, @-r15 ! see Note2 below mov.l r3, @-r15 mov.l r4, @-r15 mov.l r5, @-r15 @@ -42,6 +43,11 @@ _dl_linux_resolve: greater than or equal to 12. Found in binutils/bfd/elf32-sh.c by Stefan Allius <allius@atecom.com> + + Note2 - we also have to preserve r2 on the stack as the call into + C code (_dl_linux_resolver) will use r2 as a scratch register and we + need it for the address for returning structures, + David McCullough <davidm@snapgear.com>. */ mov #8 ,r5 cmp/gt r5, r0 @@ -78,8 +84,9 @@ _dl_linux_resolve: mov.l @r15+, r6 mov.l @r15+, r5 mov.l @r15+, r4 + mov.l @r15+, r3 jmp @r0 ! Jump to function address - mov.l @r15+, r3 + mov.l @r15+, r2 ! see Note2 above .balign 4 |