* emultempl/elf32.em (gld${EMULATION_NAME}_check_ld_so_conf): Replace

"name" param with a bfd_link_needed_list pointer.  Update caller.
	(gld${EMULATION_NAME}_check_ld_elf_hints): Likewise.
This commit is contained in:
Alan Modra 2013-01-08 06:10:39 +00:00
parent cc382d466c
commit d5c8b1f856
2 changed files with 17 additions and 10 deletions

View File

@ -1,3 +1,9 @@
2013-01-08 Alan Modra <amodra@gmail.com>
* emultempl/elf32.em (gld${EMULATION_NAME}_check_ld_so_conf): Replace
"name" param with a bfd_link_needed_link pointer. Update caller.
(gld${EMULATION_NAME}_check_ld_elf_hints): Likewise.
2013-01-08 Alan Modra <amodra@gmail.com>
* Makefile.am (ALL_EMULATION_SOURCES): Correct eavrxmega entries.

View File

@ -569,7 +569,8 @@ EOF
#endif
static bfd_boolean
gld${EMULATION_NAME}_check_ld_elf_hints (const char *name, int force)
gld${EMULATION_NAME}_check_ld_elf_hints (const struct bfd_link_needed_list *l,
int force)
{
static bfd_boolean initialized;
static char *ld_elf_hints;
@ -612,10 +613,9 @@ gld${EMULATION_NAME}_check_ld_elf_hints (const char *name, int force)
if (ld_elf_hints == NULL)
return FALSE;
needed.by = NULL;
needed.name = name;
return gld${EMULATION_NAME}_search_needed (ld_elf_hints, & needed,
force);
needed.by = l->by;
needed.name = l->name;
return gld${EMULATION_NAME}_search_needed (ld_elf_hints, &needed, force);
}
EOF
# FreeBSD
@ -787,7 +787,8 @@ gld${EMULATION_NAME}_parse_ld_so_conf
}
static bfd_boolean
gld${EMULATION_NAME}_check_ld_so_conf (const char *name, int force)
gld${EMULATION_NAME}_check_ld_so_conf (const struct bfd_link_needed_list *l,
int force)
{
static bfd_boolean initialized;
static char *ld_so_conf;
@ -824,8 +825,8 @@ gld${EMULATION_NAME}_check_ld_so_conf (const char *name, int force)
return FALSE;
needed.by = NULL;
needed.name = name;
needed.by = l->by;
needed.name = l->name;
return gld${EMULATION_NAME}_search_needed (ld_so_conf, &needed, force);
}
@ -1308,7 +1309,7 @@ if [ "x${USE_LIBPATH}" = xyes ] ; then
case ${target} in
*-*-freebsd* | *-*-dragonfly*)
fragment <<EOF
if (gld${EMULATION_NAME}_check_ld_elf_hints (l->name, force))
if (gld${EMULATION_NAME}_check_ld_elf_hints (l, force))
break;
EOF
# FreeBSD
@ -1317,7 +1318,7 @@ EOF
*-*-linux-* | *-*-k*bsd*-* | *-*-gnu*)
# Linux
fragment <<EOF
if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
if (gld${EMULATION_NAME}_check_ld_so_conf (l, force))
break;
EOF