AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-12 16:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
H.J. Lu 2017-07-09 11:52:33 -07:00
parent 7a499756ab
commit eb73083e5e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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]

4
elf/Makefile
View File

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