diff options
| -rw-r--r-- | trunk/ChangeLog.cross | 5 | ||||
| -rw-r--r-- | trunk/src/arch-arm.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/trunk/ChangeLog.cross b/trunk/ChangeLog.cross index 8ce06ce..5edb54e 100644 --- a/trunk/ChangeLog.cross +++ b/trunk/ChangeLog.cross @@ -2,6 +2,11 @@ * Integrate prelinker/cross-prelinking patches + 2008-09-23 Joseph Myers <joseph@codesourcery.com> + + * src/arch-arm.c (arm_prelink_conflict_rela): Correct + R_ARM_TLS_TPOFF32 handling. + 2008-09-18 Joseph Myers <joseph@codesourcery.com> * src/ld-libs.c (reloc_type_class, determine_tlsoffsets): Handle diff --git a/trunk/src/arch-arm.c b/trunk/src/arch-arm.c index be1982a..0dddaac 100644 --- a/trunk/src/arch-arm.c +++ b/trunk/src/arch-arm.c @@ -545,7 +545,7 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info, ret->r_addend = value; break; case R_ARM_TLS_TPOFF32: - ret->r_addend = value + rela->r_offset + tls->offset; + ret->r_addend = value + rela->r_addend + tls->offset; break; } break; |