Give up on a.out support in binutils. It has too many problems to

be worth much effort.  Install all i386 binutils programs in
"/usr/libexec/elf".  Disable a.out support in libbfd.  It's too
dangerous to leave it in.  Some of the utilities think they can
handle a.out, but they generate bad object files.

9 files changed, 44 insertions, 20 deletions

diff --git a/gnu/usr.bin/binutils/addr2line/Makefile.i386 b/gnu/usr.bin/binutils/addr2line/Makefile.i386
new file mode 100644
index 000000000000..a23f65695926
--- /dev/null
+++ b/gnu/usr.bin/binutils/addr2line/Makefile.i386
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+BINDIR=		/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/c++filt/Makefile.i386 b/gnu/usr.bin/binutils/c++filt/Makefile.i386
new file mode 100644
index 000000000000..a23f65695926
--- /dev/null
+++ b/gnu/usr.bin/binutils/c++filt/Makefile.i386
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+BINDIR=		/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index 729ad8b13c92..8aedcb3bc82a 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -1,18 +1,17 @@
 #
-# $Id$
+# $Id: Makefile.i386,v 1.1 1998/03/12 02:55:21 jdp Exp $
 #
 
+BINDIR=		/usr/libexec/elf
 EMULATION=	elf_i386
 HOST=		i386-unknown-freebsdelf
 TARGET=		i386-unknown-freebsdelf
 LDSCRIPTS=	elf_i386.x elf_i386.xbn elf_i386.xn elf_i386.xr \
-		elf_i386.xs elf_i386.xu i386freebsd.x i386freebsd.xbn \
-		i386freebsd.xn i386freebsd.xr i386freebsd.xu
-SRCS+=		eelf_i386.c ei386freebsd.c
-CLEANFILES+=	eelf_i386.c ei386freebsd.c
-BINDIR=		/usr/libexec/elf
+		elf_i386.xs elf_i386.xu
+SRCS+=		eelf_i386.c
+CLEANFILES+=	eelf_i386.c
 
-beforedepend: eelf_i386.c ei386freebsd.c
+beforedepend: eelf_i386.c
 
 eelf_i386.c:	emulparams/elf_i386.sh emultempl/elf32.em \
 		scripttempl/elf.sc genscripts.sh emultempl/stringify.sed
@@ -20,10 +19,3 @@ eelf_i386.c:	emulparams/elf_i386.sh emultempl/elf32.em \
 	    sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${DESTDIR}/usr/lib \
 	    ${HOST} ${TARGET} ${TARGET} ${EMULATION} "" \
 	    ${EMULATION} ${TARGET}
-
-ei386freebsd.c:	emulparams/elf_i386.sh emultempl/elf32.em \
-		scripttempl/elf.sc genscripts.sh emultempl/stringify.sed
-	env LIB_PATH="/usr/lib" \
-	    sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${DESTDIR}/usr/lib \
-	    ${HOST} ${TARGET} ${TARGET} ${EMULATION} "" \
-	    i386freebsd i386-unknown-freebsd
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
index bab781f63e99..c948727d827c 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -1,15 +1,12 @@
 #
-# $Id: Makefile.i386,v 1.1 1998/03/12 02:55:26 jdp Exp $
+# $Id: Makefile.i386,v 1.2 1998/03/14 01:40:31 jdp Exp $
 #
 
-SRCS+=		aout32.c coff-i386.c cofflink.c cpu-i386.c \
-		elf32-i386.c elf32.c elflink.c i386freebsd.c
+SRCS+=		cpu-i386.c elf32-i386.c elf32.c elflink.c
 CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_i386_vec
-CFLAGS+=	-DSELECT_VECS="&bfd_elf32_i386_vec,&i386freebsd_vec,&i386coff_vec"
+CFLAGS+=	-DSELECT_VECS="&bfd_elf32_i386_vec"
 CFLAGS+=	-DSELECT_ARCHITECTURES="&bfd_i386_arch"
 CFLAGS+=	-DHAVE_bfd_elf32_i386_vec
-CFLAGS+=	-DHAVE_i386freebsd_vec
-CFLAGS+=	-DHAVE_i386coff_vec
 CLEANFILES+=	elf32-target.h
 
 beforedepend: elf32-target.h
diff --git a/gnu/usr.bin/binutils/nm/Makefile.i386 b/gnu/usr.bin/binutils/nm/Makefile.i386
new file mode 100644
index 000000000000..a23f65695926
--- /dev/null
+++ b/gnu/usr.bin/binutils/nm/Makefile.i386
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+BINDIR=		/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile.i386 b/gnu/usr.bin/binutils/objcopy/Makefile.i386
new file mode 100644
index 000000000000..a23f65695926
--- /dev/null
+++ b/gnu/usr.bin/binutils/objcopy/Makefile.i386
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+BINDIR=		/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/objdump/Makefile.i386 b/gnu/usr.bin/binutils/objdump/Makefile.i386
new file mode 100644
index 000000000000..a23f65695926
--- /dev/null
+++ b/gnu/usr.bin/binutils/objdump/Makefile.i386
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+BINDIR=		/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/size/Makefile.i386 b/gnu/usr.bin/binutils/size/Makefile.i386
new file mode 100644
index 000000000000..a23f65695926
--- /dev/null
+++ b/gnu/usr.bin/binutils/size/Makefile.i386
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+BINDIR=		/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/strings/Makefile.i386 b/gnu/usr.bin/binutils/strings/Makefile.i386
new file mode 100644
index 000000000000..a23f65695926
--- /dev/null
+++ b/gnu/usr.bin/binutils/strings/Makefile.i386
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+BINDIR=		/usr/libexec/elf