diff mbox

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

Message ID 20170709210507.GA14761@gmail.com
State New, archived
Headers show

Commit Message

H.J. Lu July 9, 2017, 9:05 p.m. UTC
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(+)

Comments

Andreas Schwab July 10, 2017, 7:23 a.m. UTC | #1
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.

Andreas.
diff mbox

Patch

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