diff options
| -rw-r--r-- | ld/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/Makefile.am | 5 | ||||
| -rw-r--r-- | ld/Makefile.in | 5 | ||||
| -rwxr-xr-x | ld/emulparams/elf32bmipn32.sh | 2 | ||||
| -rw-r--r-- | ld/emulparams/elf32bsmip.sh | 1 | ||||
| -rwxr-xr-x | ld/emulparams/elf64bmip.sh | 2 | ||||
| -rw-r--r-- | ld/emultempl/irix.em | 41 |
7 files changed, 62 insertions, 4 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 0afd3f6..564f707 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,13 @@ +2004-04-08 Richard Sandiford <rsandifo@redhat.com> + + * 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. + * Makefile.am (eelf32bsmip.c, eelf32bmipn32.c, eelf64bmip.c): Update + dependencies. + * Makefile.in: Regenerate. + 2004-04-01 Paul Brook <paul@codesourcery.com> * emultempl/armelf.em (byteswap_code): Add. diff --git a/ld/Makefile.am b/ld/Makefile.am index 21ec032..887419f 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -639,7 +639,7 @@ eelf32bmip.c: $(srcdir)/emulparams/elf32bmip.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32bmip "$(tdir_elf32bmip)" eelf32bsmip.c: $(srcdir)/emulparams/elf32bsmip.sh \ - $(srcdir)/emulparams/elf32bmip.sh $(srcdir)/emultempl/mipself.em \ + $(srcdir)/emulparams/elf32bmip.sh $(srcdir)/emultempl/irix.em \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32bsmip "$(tdir_elf32bsmip)" eelf32btsmip.c: $(srcdir)/emulparams/elf32btsmip.sh \ @@ -670,6 +670,7 @@ eelf32elmip.c: $(srcdir)/emulparams/elf32elmip.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32elmip "$(tdir_elf32elmip)" eelf32bmipn32.c: $(srcdir)/emulparams/elf32bmipn32.sh \ + $(srcdir)/emultempl/irix.em \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32bmipn32 "$(tdir_elf32bmipn32)" eelf32l4300.c: $(srcdir)/emulparams/elf32l4300.sh \ @@ -786,7 +787,7 @@ eelf64_sparc_fbsd.c: $(srcdir)/emulparams/elf64_sparc_fbsd.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf64_sparc_fbsd "$(tdir_elf64_sparc_fbsd)" eelf64bmip.c: $(srcdir)/emulparams/elf64bmip.sh \ - $(srcdir)/emulparams/elf32bmipn32.sh \ + $(srcdir)/emulparams/elf32bmipn32.sh $(srcdir)/emultempl/irix.em \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf64bmip "$(tdir_elf64bmip)" eelf64mmix.c: $(srcdir)/emulparams/elf64mmix.sh \ diff --git a/ld/Makefile.in b/ld/Makefile.in index a40f911..75e334a 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -1365,7 +1365,7 @@ eelf32bmip.c: $(srcdir)/emulparams/elf32bmip.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32bmip "$(tdir_elf32bmip)" eelf32bsmip.c: $(srcdir)/emulparams/elf32bsmip.sh \ - $(srcdir)/emulparams/elf32bmip.sh $(srcdir)/emultempl/mipself.em \ + $(srcdir)/emulparams/elf32bmip.sh $(srcdir)/emultempl/irix.em \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32bsmip "$(tdir_elf32bsmip)" eelf32btsmip.c: $(srcdir)/emulparams/elf32btsmip.sh \ @@ -1396,6 +1396,7 @@ eelf32elmip.c: $(srcdir)/emulparams/elf32elmip.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32elmip "$(tdir_elf32elmip)" eelf32bmipn32.c: $(srcdir)/emulparams/elf32bmipn32.sh \ + $(srcdir)/emultempl/irix.em \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32bmipn32 "$(tdir_elf32bmipn32)" eelf32l4300.c: $(srcdir)/emulparams/elf32l4300.sh \ @@ -1512,7 +1513,7 @@ eelf64_sparc_fbsd.c: $(srcdir)/emulparams/elf64_sparc_fbsd.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf64_sparc_fbsd "$(tdir_elf64_sparc_fbsd)" eelf64bmip.c: $(srcdir)/emulparams/elf64bmip.sh \ - $(srcdir)/emulparams/elf32bmipn32.sh \ + $(srcdir)/emulparams/elf32bmipn32.sh $(srcdir)/emultempl/irix.em \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf64bmip "$(tdir_elf64bmip)" eelf64mmix.c: $(srcdir)/emulparams/elf64mmix.sh \ diff --git a/ld/emulparams/elf32bmipn32.sh b/ld/emulparams/elf32bmipn32.sh index 3de791c..a320eb2 100755 --- a/ld/emulparams/elf32bmipn32.sh +++ b/ld/emulparams/elf32bmipn32.sh @@ -18,3 +18,5 @@ EXECUTABLE_SYMBOLS=" # Following the IRIX linker, we simply put .rodata in the data # segment. WRITABLE_RODATA= + +EXTRA_EM_FILE=irix diff --git a/ld/emulparams/elf32bsmip.sh b/ld/emulparams/elf32bsmip.sh index 5b2939a..dfe0fe0 100644 --- a/ld/emulparams/elf32bsmip.sh +++ b/ld/emulparams/elf32bsmip.sh @@ -1,2 +1,3 @@ . ${srcdir}/emulparams/elf32bmip.sh ENTRY=__start +EXTRA_EM_FILE=irix diff --git a/ld/emulparams/elf64bmip.sh b/ld/emulparams/elf64bmip.sh index 4673c52..a4ce6d4 100755 --- a/ld/emulparams/elf64bmip.sh +++ b/ld/emulparams/elf64bmip.sh @@ -19,3 +19,5 @@ EXECUTABLE_SYMBOLS=" # Following the IRIX linker, we simply put .rodata in the data # segment. WRITABLE_RODATA= + +EXTRA_EM_FILE=irix diff --git a/ld/emultempl/irix.em b/ld/emultempl/irix.em new file mode 100644 index 0000000..19511dd --- /dev/null +++ b/ld/emultempl/irix.em @@ -0,0 +1,41 @@ +# This shell script emits a C file. -*- C -*- +# Copyright 2004 Free Software Foundation, Inc. +# +# This file is part of GLD, the Gnu Linker. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# + +cat >>e${EMULATION_NAME}.c <<EOF + +#include "ld.h" +#include "ldmain.h" +#include "libiberty.h" + +/* The native IRIX linker will always create a DT_SONAME for shared objects. + While this shouldn't really be necessary for ABI conformance, some versions + of the native linker will segfault if the tag is missing. */ + +static void +irix_after_open (void) +{ + if (link_info.shared && command_line.soname == 0) + command_line.soname = basename (bfd_get_filename (output_bfd)); + + gld${EMULATION_NAME}_after_open (); +} +EOF + +LDEMUL_AFTER_OPEN=irix_after_open |