svn commit: r218780 - head/sys/arm/arm
Marcel Moolenaar
marcel at FreeBSD.org
Thu Feb 17 19:31:21 UTC 2011
Author: marcel
Date: Thu Feb 17 19:31:21 2011
New Revision: 218780
URL: http://svn.freebsd.org/changeset/base/218780
Log:
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 at juniper.net>
Modified:
head/sys/arm/arm/elf_machdep.c
Modified: head/sys/arm/arm/elf_machdep.c
==============================================================================
--- head/sys/arm/arm/elf_machdep.c Thu Feb 17 17:35:09 2011 (r218779)
+++ head/sys/arm/arm/elf_machdep.c Thu Feb 17 19:31:21 2011 (r218780)
@@ -169,9 +169,7 @@ elf_reloc_internal(linker_file_t lf, Elf
addr = lookup(lf, symidx, 1);
if (addr == 0)
return -1;
- if (*where != addr)
- *where = addr;
-
+ *where += addr;
break;
case R_ARM_COPY: /* none */
More information about the svn-src-all
mailing list