From 594f11a5ea1145c99692e04c5016e706683a8769 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Wed, 15 Nov 2000 21:25:10 +0000 Subject: [PATCH] Merge conflicts. Adds revs 1.2 and 1.3 (FreeBSD configuration support), and preliminary sparc, strongarm, PPC FreeBSD support to Binutils 2.10.1. --- contrib/binutils/ld/configure.tgt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/binutils/ld/configure.tgt b/contrib/binutils/ld/configure.tgt index ad04f1d19259..8643cc5efde6 100644 --- a/contrib/binutils/ld/configure.tgt +++ b/contrib/binutils/ld/configure.tgt @@ -58,6 +58,8 @@ sparc*-*-linux-gnu*) targ_emul=elf32_sparc tdir_sun4=sparc-sun-sunos4 ;; sparc*-*-lynxos*) targ_emul=sparclynx ;; +sparc64-*-netbsd*) targ_emul=elf64_sparc ;; +sparc*-*-netbsd*elf*) targ_emul=elf32_sparc ;; sparc*-*-netbsd*) targ_emul=sparcnbsd ;; sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*) targ_emul=elf32_sparc ;; @@ -119,7 +121,7 @@ i[3456]86-*-linux-gnu*) targ_emul=elf_i386 targ_extra_emuls=i386linux tdir_i386linux=${targ_alias}aout ;; -i[3456]86-*-sysv4*) targ_emul=elf_i386 ;; +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 ;;