OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2001-05-03 H.J. Lu <hjl@gnu.org> 

* emultempl/elf32.em: Include "libiberty.h".
	(gld${EMULATION_NAME}_vercheck): Call basename () to get the
	basename of the bfd filename.
	(gld${EMULATION_NAME}_stat_needed): Likewise.
	(gld${EMULATION_NAME}_try_needed): Likewise.
	(gld${EMULATION_NAME}_open_dynamic_archive): Likewise.
This commit is contained in:
H.J. Lu 2001-05-03 06:26:26 +00:00
parent 8b0fa28299
commit 1c9acd948f
2 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ld/ChangeLog
View File

@ -1,3 +1,12 @@
2001-05-03 H.J. Lu <hjl@gnu.org>
* emultempl/elf32.em: Include "libiberty.h".
(gld${EMULATION_NAME}_vercheck): Call basename () to get the
basename of the bfd filename.
(gld${EMULATION_NAME}_stat_needed): Likewise.
(gld${EMULATION_NAME}_try_needed): Likewise.
(gld${EMULATION_NAME}_open_dynamic_archive): Likewise.
2001-05-02 H.J. Lu <hjl@gnu.org> 2001-05-02 H.J. Lu <hjl@gnu.org>
* emultempl/pe.em: Include <ctype.h>. * emultempl/pe.em: Include <ctype.h>.

48
ld/emultempl/elf32.em
View File

@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "bfd.h" #include "bfd.h"
#include "sysdep.h" #include "sysdep.h"
#include "libiberty.h"
#include <ctype.h> #include <ctype.h>
@ -130,7 +131,7 @@ static void
gld${EMULATION_NAME}_vercheck (s) gld${EMULATION_NAME}_vercheck (s)
lang_input_statement_type *s; lang_input_statement_type *s;
{ {
const char *soname, *f; const char *soname;
struct bfd_link_needed_list *l; struct bfd_link_needed_list *l;
if (global_vercheck_failed) if (global_vercheck_failed)
@ -141,19 +142,13 @@ 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 = bfd_get_filename (s->the_bfd); soname = basename (bfd_get_filename (s->the_bfd));
f = strrchr (soname, '/');
if (f != NULL)
++f;
else
f = soname;
for (l = global_vercheck_needed; l != NULL; l = l->next) for (l = global_vercheck_needed; l != NULL; l = l->next)
{ {
const char *suffix; const char *suffix;
if (strcmp (f, l->name) == 0) if (strcmp (soname, l->name) == 0)
{ {
/* Probably can't happen, but it's an easy check. */ /* Probably can't happen, but it's an easy check. */
continue; continue;
@ -168,7 +163,7 @@ gld${EMULATION_NAME}_vercheck (s)
suffix += sizeof ".so." - 1; suffix += sizeof ".so." - 1;
if (strncmp (f, l->name, suffix - l->name) == 0) if (strncmp (soname, l->name, suffix - l->name) == 0)
{ {
/* Here we know that S is a dynamic object FOO.SO.VER1, and /* Here we know that S is a dynamic object FOO.SO.VER1, and
the object we are considering needs a dynamic object the object we are considering needs a dynamic object
@ -192,7 +187,6 @@ gld${EMULATION_NAME}_stat_needed (s)
struct stat st; struct stat st;
const char *suffix; const char *suffix;
const char *soname; const char *soname;
const char *f;
if (global_found) if (global_found)
return; return;
@ -230,17 +224,12 @@ 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 = s->filename; soname = basename (s->filename);
f = strrchr (soname, '/'); if (strncmp (soname, global_needed->name,
if (f != NULL) suffix - global_needed->name) == 0)
++f;
else
f = soname;
if (strncmp (f, 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",
global_needed->name, global_needed->by, f); global_needed->name, global_needed->by, soname);
} }
@ -340,11 +329,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 = strrchr (abfd->filename, '/'); soname = basename (abfd->filename);
if (soname)
soname++;
else
soname = 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);
@ -949,20 +934,13 @@ gld${EMULATION_NAME}_open_dynamic_archive (arch, search, entry)
if (bfd_check_format (entry->the_bfd, bfd_object) if (bfd_check_format (entry->the_bfd, bfd_object)
&& (entry->the_bfd->flags & DYNAMIC) != 0) && (entry->the_bfd->flags & DYNAMIC) != 0)
{ {
char *needed_name;
ASSERT (entry->is_archive && entry->search_dirs_flag); ASSERT (entry->is_archive && entry->search_dirs_flag);
/* 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. */
First strip off everything before the last '/'. */ filename = xstrdup (basename (entry->filename));
filename = strrchr (entry->filename, '/'); bfd_elf_set_dt_needed_name (entry->the_bfd, filename);
filename++;
needed_name = (char *) xmalloc (strlen (filename) + 1);
strcpy (needed_name, filename);
bfd_elf_set_dt_needed_name (entry->the_bfd, needed_name);
} }
return true; return true;