about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 75dd6dfa63..ab216c77ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2017-07-10  H.J. Lu  <hongjiu.lu@intel.com>
 
+	[BZ #21742]
+	* elf/Makefile (dl-routines): Move dl-conflict to ...
+	(rtld-routines): Here.
+
+2017-07-10  H.J. Lu  <hongjiu.lu@intel.com>
+
 	[BZ #21741]
 	* sysdeps/x86_64/multiarch/ifunc-impl-list.c
 	(__libc_ifunc_impl_list): Test memmove_chk and memset_chk only