This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] Don't include _dl_resolve_conflicts in libc.a [BZ #21742]


On Mon, Jul 10, 2017 at 12:23 AM, Andreas Schwab <schwab@suse.de> wrote:
> On Jul 09 2017, "H.J. Lu" <hjl.tools@gmail.com> wrote:
>
>> Since _dl_resolve_conflicts is only used in elf/rtld.c, don't include
>> it in libc.a.
>>
>> OK for master?
>
> Add it to shared-only-routines instead.
>

I think adding it to rtld-routines it more appropriate.   Here is the updated
patch.   OK for master?

Thanks.

-- 
H.J.
From f0dbaf3228dba8a775f4dfa8eb405c20a655ec7f 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: [PATCH] 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.
---
 elf/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
-- 
2.9.4


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]