From eb73083e5e825460050f8149f8b2869c4ef662cd Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sun, 9 Jul 2017 11:52:33 -0700
Subject: Don't include _dl_resolve_conflicts in libc.a [BZ #21742]

Since _dl_resolve_conflicts is only used in elf/rtld.c, don't include
it in libc.a.

	[BZ #21742]
	* elf/Makefile (dl-routines): Move dl-conflict to ...
	(rtld-routines): Here.
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 75dd6dfa63..ab216c77ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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]
-- 
cgit v1.2.1