diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-07-09 11:52:33 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-07-10 05:16:40 -0700 |
| commit | eb73083e5e825460050f8149f8b2869c4ef662cd (patch) | |
| tree | 1a867f2301bd8b4a8e8735fac8d2c4ff2c4959b6 | |
| parent | 7a499756abdd4ec56658e319c0cee4220a320652 (diff) | |
| download | glibc-eb73083e5e825460050f8149f8b2869c4ef662cd.tar.gz glibc-eb73083e5e825460050f8149f8b2869c4ef662cd.tar.xz glibc-eb73083e5e825460050f8149f8b2869c4ef662cd.zip | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/Makefile | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 75dd6dfa63..ab216c77ed 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 201b328f88..e758a4c960 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 |