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 10de6f3..c24ba7b 100644
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-05 Jakub Jelinek <jakub@redhat.com>
+
+ * src/arch-s390.c (s390_prelink_conflict_rela): For R_390_IRELATIVE,
+ always use that relocation type in the conflict section.
+
2013-10-01 Jakub Jelinek <jakub@redhat.com>
* testsuite/ifunc.h (IFUNC_ASM): Add s390x and s390 version.