aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2010-06-14 18:41:49 -0500
committerMark Hatle <mark.hatle@windriver.com>2010-07-22 18:21:38 -0500
commit8871f1564992fdb404a64a4ea16741aeaa724285 (patch)
tree50658a5f76cefe65ac3142e060bcd70ae76a1306
parent6a13bb4c4df937853f93bab0d427a01a256591b8 (diff)
downloadprelink-cross-8871f1564992fdb404a64a4ea16741aeaa724285.tar.gz
prelink-cross-8871f1564992fdb404a64a4ea16741aeaa724285.tar.bz2
prelink-cross-8871f1564992fdb404a64a4ea16741aeaa724285.zip
Fix arm TLS_TPOFF32 handling
2008-09-23 Joseph Myers <joseph@codesourcery.com> * src/arch-arm.c (arm_prelink_conflict_rela): Correct R_ARM_TLS_TPOFF32 handling. Conflicts: trunk/ChangeLog.csl
-rw-r--r--trunk/ChangeLog.cross5
-rw-r--r--trunk/src/arch-arm.c2
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;