GNU C Library master sources branch master updated. glibc-2.25-706-geb73083

[hjl at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  eb73083e5e825460050f8149f8b2869c4ef662cd (commit)
      from  7a499756abdd4ec56658e319c0cee4220a320652 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=eb73083e5e825460050f8149f8b2869c4ef662cd

commit eb73083e5e825460050f8149f8b2869c4ef662cd
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sun Jul 9 11:52:33 2017 -0700

    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 75dd6df..ab216c7 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
diff --git a/elf/Makefile b/elf/Makefile
index 201b328..e758a4c 100644
--- 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

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog    |    6 ++++++
 elf/Makefile |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources