summaryrefslogtreecommitdiffstats
path: root/contrib/binutils
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-07-20 03:48:47 +0000
committerobrien <obrien@FreeBSD.org>2001-07-20 03:48:47 +0000
commit21be0634f643204d813df08940797be394adfcf6 (patch)
treea7107c576a72a1f1eec87b0ac59f2341e96d30ce /contrib/binutils
parent3f556974ada631d5234f6cb957cc0d961b9a5917 (diff)
downloadFreeBSD-src-21be0634f643204d813df08940797be394adfcf6.zip
FreeBSD-src-21be0634f643204d813df08940797be394adfcf6.tar.gz
This merges in the changes from the 2.11.2 release to the FSF anoncvs
19-July-2001 snapshot.
Diffstat (limited to 'contrib/binutils')
-rwxr-xr-xcontrib/binutils/gas/configure1
-rw-r--r--contrib/binutils/gas/configure.in1
-rw-r--r--contrib/binutils/ld/Makefile.in6
-rw-r--r--contrib/binutils/ld/configure.tgt8
-rw-r--r--contrib/binutils/ld/emultempl/elf32.em6
5 files changed, 17 insertions, 5 deletions
diff --git a/contrib/binutils/gas/configure b/contrib/binutils/gas/configure
index 109914c..dd6ad7f 100755
--- a/contrib/binutils/gas/configure
+++ b/contrib/binutils/gas/configure
@@ -2360,6 +2360,7 @@ for this_target in $target $canon_targets ; do
i386-*-beoself* | i386-*-beos*) fmt=elf bfd_gas=yes ;;
i386-*-bsd*) fmt=aout em=386bsd ;;
i386-*-netbsd0.8) fmt=aout em=386bsd ;;
+ i386-*-netbsdelf*) fmt=elf em=nbsd bfd_gas=yes;;
i386-*-netbsd*) fmt=aout em=nbsd bfd_gas=yes;;
i386-*-openbsd*) fmt=aout em=nbsd bfd_gas=yes;;
i386-*-linux*aout* | i386-*-linux*oldld) fmt=aout em=linux ;;
diff --git a/contrib/binutils/gas/configure.in b/contrib/binutils/gas/configure.in
index e038333..e63b146 100644
--- a/contrib/binutils/gas/configure.in
+++ b/contrib/binutils/gas/configure.in
@@ -241,6 +241,7 @@ changequote([,])dnl
i386-*-beoself* | i386-*-beos*) fmt=elf bfd_gas=yes ;;
i386-*-bsd*) fmt=aout em=386bsd ;;
i386-*-netbsd0.8) fmt=aout em=386bsd ;;
+ i386-*-netbsdelf*) fmt=elf em=nbsd bfd_gas=yes;;
i386-*-netbsd*) fmt=aout em=nbsd bfd_gas=yes;;
i386-*-openbsd*) fmt=aout em=nbsd bfd_gas=yes;;
i386-*-linux*aout* | i386-*-linux*oldld) fmt=aout em=linux ;;
diff --git a/contrib/binutils/ld/Makefile.in b/contrib/binutils/ld/Makefile.in
index 803219f..51982cd 100644
--- a/contrib/binutils/ld/Makefile.in
+++ b/contrib/binutils/ld/Makefile.in
@@ -361,7 +361,8 @@ ALL_64_EMULATIONS = \
eelf64bmip.o \
eelf64btsmip.o \
eelf64ltsmip.o \
- eelf64hppa.o
+ eelf64hppa.o \
+ ehppa64linux.o
ALL_EMUL_EXTRA_OFILES = \
@@ -1278,6 +1279,9 @@ ehppalinux.c: $(srcdir)/emulparams/hppalinux.sh \
$(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/hppaelf.em \
$(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
${GENSCRIPTS} hppalinux "$(tdir_hppalinux)"
+ehppa64linux.c: $(srcdir)/emulparams/hppa64linux.sh \
+ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ ${GENSCRIPTS} hppa64linux "$(tdir_hppa64linux)"
ei386aout.c: $(srcdir)/emulparams/i386aout.sh \
$(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
${GENSCRIPTS} i386aout "$(tdir_i386aout)"
diff --git a/contrib/binutils/ld/configure.tgt b/contrib/binutils/ld/configure.tgt
index aad927a..0461100 100644
--- a/contrib/binutils/ld/configure.tgt
+++ b/contrib/binutils/ld/configure.tgt
@@ -147,7 +147,12 @@ i[3456]86-*-sysv[45]*) targ_emul=elf_i386 ;;
i[3456]86-*-solaris2*) targ_emul=elf_i386 ;;
i[3456]86-*-unixware) targ_emul=elf_i386 ;;
i[3456]86-*-solaris*) targ_emul=elf_i386 ;;
-i[3456]86-*-netbsd*) targ_emul=i386nbsd ;;
+i[3456]86-*-netbsdelf*) targ_emul=elf_i386
+ targ_extra_emuls=i386nbsd
+ ;;
+i[3456]86-*-netbsd*) targ_emul=i386nbsd
+ targ_extra_emuls=elf_i386
+ ;;
i[3456]86-*-netware) targ_emul=i386nw ;;
i[3456]86-*-elf*) targ_emul=elf_i386 ;;
i[3456]86-*-freebsdaout* | i[3456]86-*-freebsd[12].* | i[3456]86-*-freebsd[12])
@@ -245,6 +250,7 @@ m68*-hp*-netbsd*) targ_emul=m68k4knbsd ;;
m68*-*-netbsd*) targ_emul=m68knbsd ;;
m68*-*-psos*) targ_emul=m68kpsos ;;
m68*-*-rtems*) targ_emul=m68kcoff ;;
+hppa*64*-*-linux-gnu*) targ_emul=hppa64linux ;;
hppa*64*-*) targ_emul=elf64hppa ;;
hppa*-*-linux-gnu*) targ_emul=hppalinux ;;
hppa*-*-*elf*) targ_emul=hppaelf ;;
diff --git a/contrib/binutils/ld/emultempl/elf32.em b/contrib/binutils/ld/emultempl/elf32.em
index da7c435..0044a95 100644
--- a/contrib/binutils/ld/emultempl/elf32.em
+++ b/contrib/binutils/ld/emultempl/elf32.em
@@ -145,7 +145,7 @@ gld${EMULATION_NAME}_vercheck (s)
soname = bfd_elf_get_dt_soname (s->the_bfd);
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)
{
@@ -227,7 +227,7 @@ gld${EMULATION_NAME}_stat_needed (s)
soname = bfd_elf_get_dt_soname (s->the_bfd);
if (soname == NULL)
- soname = basename (s->filename);
+ soname = lbasename (s->filename);
if (strncmp (soname, global_needed->name,
suffix - global_needed->name) == 0)
@@ -332,7 +332,7 @@ cat >>e${EMULATION_NAME}.c <<EOF
einfo ("%F%P:%B: bfd_stat failed: %E\n", abfd);
/* First strip off everything before the last '/'. */
- soname = basename (abfd->filename);
+ soname = lbasename (abfd->filename);
if (trace_file_tries)
info_msg (_("found %s at %s\n"), soname, name);
OpenPOWER on IntegriCloud