From 053ae1d77a5efa6f1918de5dcb2bd06083b7be5f Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 24 Feb 1996 20:03:55 +0000 Subject: [PATCH] * elf.c (bfd_elf_set_dt_needed_name): Don't do anything if the format is not bfd_object. (bfd_elf_get_dt_soname): Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/elf.c | 22 +++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cc6060cb46b..1e7f3055000 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +Sat Feb 24 11:38:58 1996 Ian Lance Taylor + + * elf.c (bfd_elf_set_dt_needed_name): Don't do anything if the + format is not bfd_object. + (bfd_elf_get_dt_soname): Likewise. + Wed Feb 21 13:58:04 1996 Ian Lance Taylor * coff-sh.c (sh_relax_delete_bytes): Correct range of R_SH_USES diff --git a/bfd/elf.c b/bfd/elf.c index da082e07edc..eab15b009b3 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -618,11 +618,13 @@ bfd_elf_set_dt_needed_name (abfd, name) bfd *abfd; const char *name; { - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) - elf_dt_needed_name (abfd) = name; + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour + && bfd_get_format (abfd) == bfd_object) + elf_dt_name (abfd) = name; } -/* Get the list of DT_NEEDED entries for a link. */ +/* Get the list of DT_NEEDED entries for a link. This is a hook for + the ELF emulation code. */ struct bfd_link_needed_list * bfd_elf_get_needed_list (abfd, info) @@ -633,6 +635,20 @@ bfd_elf_get_needed_list (abfd, info) return NULL; return elf_hash_table (info)->needed; } + +/* Get the name actually used for a dynamic object for a link. This + is the SONAME entry if there is one. Otherwise, it is the string + passed to bfd_elf_set_dt_needed_name, or it is the filename. */ + +const char * +bfd_elf_get_dt_soname (abfd) + bfd *abfd; +{ + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour + && bfd_get_format (abfd) == bfd_object) + return elf_dt_name (abfd); + return NULL; +} /* Allocate an ELF string table--force the first byte to be zero. */ -- 2.30.2