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.