From 9f9d3a4ca3428f053393d38fec146b7511a02272 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: 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/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 3cbd07435e..875bf66212 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
-- 
cgit v1.2.1