This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Don't include _dl_resolve_conflicts in libc.a [BZ #21742]
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Sun, 9 Jul 2017 14:05:07 -0700
- Subject: [PATCH] Don't include _dl_resolve_conflicts in libc.a [BZ #21742]
- Authentication-results: sourceware.org; auth=none
Since _dl_resolve_conflicts is only used in elf/rtld.c, don't include
it in libc.a.
OK for master?
H.J.
---
[BZ #21742]
* elf/dl-conflict.c (_dl_resolve_conflicts): Define only if
SHARED is defined.
---
elf/dl-conflict.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c
index 3cbd074..875bf66 100644
--- a/elf/dl-conflict.c
+++ b/elf/dl-conflict.c
@@ -17,6 +17,7 @@
License along with the GNU C Library; see the file COPYING.LIB. If
not, see <http://www.gnu.org/licenses/>. */
+#ifdef SHARED
#include <errno.h>
#include <libintl.h>
#include <stdlib.h>
@@ -72,3 +73,4 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict,
}
#endif
}
+#endif
--
2.9.4