Re: Forcing all SGI-compatible DSOs to use DT_SONAME

[Richard Sandiford <rsandifo at redhat dot com>]

Alan Modra <amodra@bigpond.net.au> writes:
> On Thu, Apr 08, 2004 at 08:25:43AM +0100, Richard Sandiford wrote:
>> 	* emulparams/elf32bsmip.sh (EXTRA_EM_FILE): Define to irix.
>> 	* emulparams/elf64bmip.sh (EXTRA_EM_FILE): Likewise.
>> 	* emulparams/elf32bmipn32.sh (EXTRA_EM_FILE): Likewise.
>> 	* emultempl/irix.em: New file.
>
> OK.

Thanks.  Installed after updating the Makefile dependencies, as per
your off-list reminder.

Also, I forgot to mention that elflink.c doesn't compile on IRIX
due to a missing basename() prototype:

cc-1515 cc: ERROR File = /es/scratch/rsandifo/gcc/HEAD/unified/bfd/elflink.c, Line = 5035
  A value of type "int" cannot be assigned to an entity of type "const char *".

              name = basename (output_bfd->filename);
                   ^

Fixed with the attached patch.  Installed as obvious to head and 2.15.

Richard


         * elflink.c: Include libiberty.h.
         * Makefile.am (elflink.lo): Depend on libiberty.h.
         * Makefile.in: Regenerate.

Index: bfd/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.am,v
retrieving revision 1.130
diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.130 Makefile.am
--- bfd/Makefile.am	30 Mar 2004 14:04:25 -0000	1.130
+++ bfd/Makefile.am	8 Apr 2004 15:14:34 -0000
@@ -1322,7 +1322,7 @@ elf32.lo: elf32.c elfcode.h $(INCDIR)/fi
   $(INCDIR)/safe-ctype.h
 elflink.lo: elflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/external.h
+  $(INCDIR)/elf/external.h $(INCDIR)/libiberty.h
 elf-strtab.lo: elf-strtab.c $(INCDIR)/filenames.h elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h
Index: bfd/Makefile.in
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.in,v
retrieving revision 1.143
diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.143 Makefile.in
--- bfd/Makefile.in	30 Mar 2004 14:04:25 -0000	1.143
+++ bfd/Makefile.in	8 Apr 2004 15:14:35 -0000
@@ -1859,7 +1859,7 @@ elf32.lo: elf32.c elfcode.h $(INCDIR)/fi
   $(INCDIR)/safe-ctype.h
 elflink.lo: elflink.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/external.h
+  $(INCDIR)/elf/external.h $(INCDIR)/libiberty.h
 elf-strtab.lo: elf-strtab.c $(INCDIR)/filenames.h elf-bfd.h \
   $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
   $(INCDIR)/bfdlink.h $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h
Index: bfd/elflink.c
===================================================================
RCS file: /cvs/src/src/bfd/elflink.c,v
retrieving revision 1.63
diff -u -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.63 elflink.c
--- bfd/elflink.c	27 Mar 2004 10:58:08 -0000	1.63
+++ bfd/elflink.c	8 Apr 2004 15:14:38 -0000
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suit
 #define ARCH_SIZE 0
 #include "elf-bfd.h"
 #include "safe-ctype.h"
+#include "libiberty.h"
 
 bfd_boolean
 _bfd_elf_create_got_section (bfd *abfd, struct bfd_link_info *info)