diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2011-02-17 19:31:21 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2011-02-17 19:31:21 +0000 |
| commit | b2983d30068b278a31ac7c076c7a96384b777c29 (patch) | |
| tree | fcf92218a0a56294fa52011082777d82c994aeed /sys/arm | |
| parent | 7842451a3a0f071713b4c1f38f674ba8a09cf13c (diff) | |
| download | src-b2983d30068b278a31ac7c076c7a96384b777c29.tar.gz src-b2983d30068b278a31ac7c076c7a96384b777c29.zip | |
Fix the R_ARM_ABS32 relocation implementation. The memory address
contains the addend that we need to include.
Obtained from: Juniper Networks.
Fixed by: Santhanakrishnan Balraj <sbalraj@juniper.net>
Notes
Notes:
svn path=/head/; revision=218780
Diffstat (limited to 'sys/arm')
| -rw-r--r-- | sys/arm/arm/elf_machdep.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c index e77a54273f35..fcc332c9c06f 100644 --- a/sys/arm/arm/elf_machdep.c +++ b/sys/arm/arm/elf_machdep.c @@ -169,9 +169,7 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, addr = lookup(lf, symidx, 1); if (addr == 0) return -1; - if (*where != addr) - *where = addr; - + *where += addr; break; case R_ARM_COPY: /* none */ |