d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge rev 1.2 (teach `ld' how to access FreeBSD's ld ELF hints)

Browse Source 
into Binutils 2.12.0.
This commit is contained in:
David E. O'Brien 2002-03-20 22:04:42 +00:00
parent 0b17d82867
commit 694ba608d4
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/binutils/ld/emultempl/elf32.em
View File

@ -168,7 +168,7 @@ gld${EMULATION_NAME}_vercheck (s)
soname = bfd_elf_get_dt_soname (s->the_bfd); soname = bfd_elf_get_dt_soname (s->the_bfd);
if (soname == NULL) if (soname == NULL)
soname = basename (bfd_get_filename (s->the_bfd)); soname = lbasename (bfd_get_filename (s->the_bfd));
for (l = global_vercheck_needed; l != NULL; l = l->next) for (l = global_vercheck_needed; l != NULL; l = l->next)
{ {
@ -250,7 +250,7 @@ gld${EMULATION_NAME}_stat_needed (s)
soname = bfd_elf_get_dt_soname (s->the_bfd); soname = bfd_elf_get_dt_soname (s->the_bfd);
if (soname == NULL) if (soname == NULL)
soname = basename (s->filename); soname = lbasename (s->filename);
if (strncmp (soname, global_needed->name, suffix - global_needed->name) == 0) if (strncmp (soname, global_needed->name, suffix - global_needed->name) == 0)
einfo ("%P: warning: %s, needed by %B, may conflict with %s\n", einfo ("%P: warning: %s, needed by %B, may conflict with %s\n",
@ -354,7 +354,7 @@ cat >>e${EMULATION_NAME}.c <<EOF
einfo ("%F%P:%B: bfd_stat failed: %E\n", abfd); einfo ("%F%P:%B: bfd_stat failed: %E\n", abfd);
/* First strip off everything before the last '/'. */ /* First strip off everything before the last '/'. */
soname = basename (abfd->filename); soname = lbasename (abfd->filename);
if (trace_file_tries) if (trace_file_tries)
info_msg (_("found %s at %s\n"), soname, name); info_msg (_("found %s at %s\n"), soname, name);
@ -372,9 +372,6 @@ cat >>e${EMULATION_NAME}.c <<EOF
DT_NEEDED entry for this file. */ DT_NEEDED entry for this file. */
bfd_elf_set_dt_needed_name (abfd, ""); bfd_elf_set_dt_needed_name (abfd, "");
/* Previos basename call was clobbered in lang_for_each_input_file. */
soname = basename (abfd->filename);
/* Tell the ELF backend that the output file needs a DT_NEEDED /* Tell the ELF backend that the output file needs a DT_NEEDED
entry for this file if it is used to resolve the reference in entry for this file if it is used to resolve the reference in
a regular object. */ a regular object. */
@ -1047,7 +1044,7 @@ gld${EMULATION_NAME}_open_dynamic_archive (arch, search, entry)
/* Rather than duplicating the logic above. Just use the /* Rather than duplicating the logic above. Just use the
filename we recorded earlier. */ filename we recorded earlier. */
filename = xstrdup (basename (entry->filename)); filename = lbasename (entry->filename);
bfd_elf_set_dt_needed_name (entry->the_bfd, filename); bfd_elf_set_dt_needed_name (entry->the_bfd, filename);
} }