Attachment #144908 for bug #192062




#endif

static bfd_boolean
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;

  if (ld_elf_hints == NULL)
    return FALSE;

  needed.by = l->by;
  needed.name = l->name;
  return gld${EMULATION_NAME}_search_needed (ld_elf_hints, &needed, force);
					     force);
}
EOF
    # FreeBSD

}

static bfd_boolean
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;

    return FALSE;


  needed.by = l->by;
  needed.name = l->name;
  return gld${EMULATION_NAME}_search_needed (ld_so_conf, &needed, force);
}


  case ${target} in
    *-*-freebsd* | *-*-dragonfly*)
      cat >>e${EMULATION_NAME}.c <<EOF
	  if (gld${EMULATION_NAME}_check_ld_elf_hints (l, force))
	    break;
EOF
    # FreeBSD

    *-*-linux-* | *-*-k*bsd*-*)
    # Linux
      cat >>e${EMULATION_NAME}.c <<EOF
	  if (gld${EMULATION_NAME}_check_ld_so_conf (l, force))
	    break;

EOF

Return to bug 192062

Lines 541-547 EOF Link Here

(-)contrib/binutils/ld/emultempl/elf32.em (-10 / +11 lines)
541	#endif	541	#endif
542		542
543	static bfd_boolean	543	static bfd_boolean
544	gld${EMULATION_NAME}_check_ld_elf_hints (const char *name, int force)	544	gld${EMULATION_NAME}_check_ld_elf_hints (const struct bfd_link_needed_list *l,
		545	int force)
545	{	546	{
546	static bfd_boolean initialized;	547	static bfd_boolean initialized;
547	static char *ld_elf_hints;	548	static char *ld_elf_hints;
Lines 584-593 gld${EMULATION_NAME}_check_ld_elf_hints Link Here
584	if (ld_elf_hints == NULL)	585	if (ld_elf_hints == NULL)
585	return FALSE;	586	return FALSE;
586		587
587	needed.by = NULL;	588	needed.by = l->by;
588	needed.name = name;	589	needed.name = l->name;
589	return gld${EMULATION_NAME}_search_needed (ld_elf_hints, & needed,	590	return gld${EMULATION_NAME}_search_needed (ld_elf_hints, &needed, force);
590	force);
591	}	591	}
592	EOF	592	EOF
593	# FreeBSD	593	# FreeBSD
Lines 759-765 gld${EMULATION_NAME}_parse_ld_so_conf Link Here
759	}	759	}
760		760
761	static bfd_boolean	761	static bfd_boolean
762	gld${EMULATION_NAME}_check_ld_so_conf (const char *name, int force)	762	gld${EMULATION_NAME}_check_ld_so_conf (const struct bfd_link_needed_list *l,
		763	int force)
763	{	764	{
764	static bfd_boolean initialized;	765	static bfd_boolean initialized;
765	static char *ld_so_conf;	766	static char *ld_so_conf;
Lines 794-801 gld${EMULATION_NAME}_check_ld_so_conf (c Link Here
794	return FALSE;	795	return FALSE;
795		796
796		797
797	needed.by = NULL;	798	needed.by = l->by;
798	needed.name = name;	799	needed.name = l->name;
799	return gld${EMULATION_NAME}_search_needed (ld_so_conf, &needed, force);	800	return gld${EMULATION_NAME}_search_needed (ld_so_conf, &needed, force);
800	}	801	}
801		802
Lines 1037-1043 if [ "x${USE_LIBPATH}" = xyes ] ; then Link Here
1037	case ${target} in	1038	case ${target} in
1038	--freebsd* \| --dragonfly*)	1039	--freebsd* \| --dragonfly*)
1039	cat >>e${EMULATION_NAME}.c <<EOF	1040	cat >>e${EMULATION_NAME}.c <<EOF
1040	if (gld${EMULATION_NAME}_check_ld_elf_hints (l->name, force))	1041	if (gld${EMULATION_NAME}_check_ld_elf_hints (l, force))
1041	break;	1042	break;
1042	EOF	1043	EOF
1043	# FreeBSD	1044	# FreeBSD
Lines 1046-1052 EOF Link Here
1046	--linux-* \| --kbsd-*)	1047	--linux-* \| --kbsd-*)
1047	# Linux	1048	# Linux
1048	cat >>e${EMULATION_NAME}.c <<EOF	1049	cat >>e${EMULATION_NAME}.c <<EOF
1049	if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))	1050	if (gld${EMULATION_NAME}_check_ld_so_conf (l, force))
1050	break;	1051	break;
1051		1052
1052	EOF	1053	EOF