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.

diff --git a/ChangeLog b/ChangeLog
index 75dd6dfa63127d085fb772e7267f2026f0e5142d..ab216c77eda4bf2ce23090acd999f59ee24b2d87 100644 (file)
--- 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]

diff --git a/elf/Makefile b/elf/Makefile
index 201b328f88499d296b1eaf047cef13eb4be81b77..e758a4c96002ee44ec28a0358b567bcc241c1060 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -30,7 +30,7 @@ routines      = $(all-dl-routines) dl-support dl-iteratephdr \
 # profiled libraries.
 dl-routines    = $(addprefix dl-,load lookup object reloc deps hwcaps \
                                  runtime init fini debug misc \
-                                 version profile conflict tls origin scope \
+                                 version profile tls origin scope \
                                  execstack caller open close trampoline)
 ifeq (yes,$(use-ldconfig))
 dl-routines += dl-cache
@@ -57,7 +57,7 @@ shared-only-routines += dl-caller
 # ld.so uses those routines, plus some special stuff for being the program
 # interpreter and operating independent of libc.
 rtld-routines  = rtld $(all-dl-routines) dl-sysdep dl-environ dl-minimal \
-  dl-error-minimal
+  dl-error-minimal dl-conflict
 all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines)
 
 CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables