summaryrefslogtreecommitdiffstats
path: root/trunk/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'trunk/ChangeLog')
-rw-r--r--trunk/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 8265782..258c8e5 100644
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-09 Jakub Jelinek <jakub@redhat.com>
+
+ * src/conflict.c (prelink_build_conflicts): Don't call
+ prelink_conflict_rel{,a} on .gnu.conflict section in executables.
+
2009-06-15 Jakub Jelinek <jakub@redhat.com>
* src/prelink.h (R_386_IRELATIVE, R_X86_64_IRELATIVE): Define