aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2006-08-18 18:40:29 -0500
committerMark Hatle <mark.hatle@windriver.com>2010-07-22 16:15:12 -0500
commitef17341a76ec060226cbaed75d154143592a46cf (patch)
treea93c12b9561a63658b86f7ba4033857b290e6b42
parentb71ac62a56bd0a9256c9fd0a37dd332efb1f5424 (diff)
downloadprelink-cross-ef17341a76ec060226cbaed75d154143592a46cf.tar.gz
prelink-cross-ef17341a76ec060226cbaed75d154143592a46cf.tar.bz2
prelink-cross-ef17341a76ec060226cbaed75d154143592a46cf.zip
Import from: prelink-arch-arm-tls.patch
Source: Wind River Systems The line in "prelink_conflict_rela" appears to be a copy/ paste mistake. With the line there, segfaults occur in the tls5 and tls6 tests.
-rw-r--r--ChangeLog.cross4
-rw-r--r--src/arch-arm.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog.cross b/ChangeLog.cross
index 9ffca02..d2354ce 100644
--- a/ChangeLog.cross
+++ b/ChangeLog.cross
@@ -1,3 +1,7 @@
+2006-08-18 Mark Hatle <mark.hatle@windriver.com>
+
+ * arch-arm.c: remove prelink_conflict_rela
+
2006-08-17 Mark Hatle <mark.hatle@windriver.com>
* data.c, dso.c, prelink.h: when using elfutils/libelf, we need
diff --git a/src/arch-arm.c b/src/arch-arm.c
index 24766ab..dabea03 100644
--- a/src/arch-arm.c
+++ b/src/arch-arm.c
@@ -496,7 +496,6 @@ arm_prelink_conflict_rela (DSO *dso, struct prelink_info *info,
value = conflict_lookup_value (conflict);
}
- value = conflict_lookup_value (conflict);
ret = prelink_conflict_add_rela (info);
if (ret == NULL)
return 1;