Don't include _dl_resolve_conflicts in libc.a [BZ #21742]
Commit Message
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
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.
@@ -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