From ab5ad3a4b52fafc4d244d6f407fbfad132ad2fa5 Mon Sep 17 00:00:00 2001
From: John Polstra <jdp@FreeBSD.org>
Date: Thu, 12 Mar 1998 02:55:43 +0000
Subject: [PATCH] Restructure the binutils hierarchy somewhat in order to
 better support building it for variant architectures.  It was already
 becoming clear that the former structure was too rigid and didn't scale well.

The usual sort of makefile magic arranges to .include an architecture
specific makefile "Makefile.${MACHINE_ARCH}" in each directory
where it exists.  Also, sources will be found in each subdirectory
"${MACHINE_ARCH}" that exists.  This is all taken care of automatically
by the top level "Makefile.inc0".

This all seems to work right for the i386 now.  I have also converted
those alpha pieces already present to the new schema as best I
could.

Also: change the BINDIR on the i386 to /usr/libexec/elf for "ar"
and "ranlib".  They are not object format independent enough to
put into /usr/bin.
---
 gnu/usr.bin/binutils/Makefile                 |   5 +-
 gnu/usr.bin/binutils/Makefile.inc0            |  19 ++-
 gnu/usr.bin/binutils/alpha-elf/Makefile       |   9 --
 gnu/usr.bin/binutils/alpha-elf/Makefile.inc   |   5 -
 gnu/usr.bin/binutils/alpha-elf/Makefile.inc0  |   7 -
 gnu/usr.bin/binutils/alpha-elf/as/Makefile    |  24 ----
 gnu/usr.bin/binutils/alpha-elf/ld/Makefile    |  51 -------
 gnu/usr.bin/binutils/ar/Makefile              |   3 +-
 gnu/usr.bin/binutils/ar/Makefile.i386         |   5 +
 .../binutils/{i386-elf => }/as/Makefile       |   2 +-
 gnu/usr.bin/binutils/as/Makefile.i386         |   5 +
 .../{alpha-elf/as => as/alpha}/config.h       |   0
 .../{alpha-elf/as => as/alpha}/obj-format.h   |   0
 .../{alpha-elf/as => as/alpha}/targ-cpu.h     |   0
 .../{alpha-elf/as => as/alpha}/targ-env.h     |   0
 .../{i386-elf/as => as/i386}/config.h         |   0
 .../{i386-elf/as => as/i386}/obj-format.h     |   0
 .../{i386-aout/as => as/i386}/targ-cpu.h      |   0
 .../{i386-aout/as => as/i386}/targ-env.h      |   0
 gnu/usr.bin/binutils/i386-aout/Makefile       |   9 --
 gnu/usr.bin/binutils/i386-aout/Makefile.inc   |   5 -
 gnu/usr.bin/binutils/i386-aout/Makefile.inc0  |   7 -
 gnu/usr.bin/binutils/i386-aout/as/Makefile    |  23 ---
 gnu/usr.bin/binutils/i386-aout/as/config.h    | 133 ------------------
 gnu/usr.bin/binutils/i386-aout/as/itbl-cpu.h  |   1 -
 .../binutils/i386-aout/as/obj-format.h        |   1 -
 gnu/usr.bin/binutils/i386-elf/Makefile        |   9 --
 gnu/usr.bin/binutils/i386-elf/Makefile.inc    |   5 -
 gnu/usr.bin/binutils/i386-elf/Makefile.inc0   |   7 -
 gnu/usr.bin/binutils/i386-elf/as/itbl-cpu.h   |   1 -
 gnu/usr.bin/binutils/i386-elf/as/targ-cpu.h   |   1 -
 gnu/usr.bin/binutils/i386-elf/as/targ-env.h   |   1 -
 gnu/usr.bin/binutils/i386-elf/ld/Makefile     |  53 -------
 gnu/usr.bin/binutils/i386-elf/ld/config.h     |  44 ------
 gnu/usr.bin/binutils/ld/Makefile              |  32 +++++
 gnu/usr.bin/binutils/ld/Makefile.alpha        |  26 ++++
 gnu/usr.bin/binutils/ld/Makefile.i386         |  29 ++++
 .../{alpha-elf/ld => ld/alpha}/ldemul-list.h  |   0
 .../binutils/{alpha-elf => }/ld/config.h      |   0
 .../{i386-elf/ld => ld/i386}/ldemul-list.h    |   0
 gnu/usr.bin/binutils/libbfd/Makefile          |  24 +---
 gnu/usr.bin/binutils/libbfd/Makefile.i386     |  22 +++
 .../binutils/libbfd/{ => i386}/config.h       |   0
 gnu/usr.bin/binutils/libbinutils/Makefile     |   4 +-
 .../binutils/libbinutils/Makefile.i386        |   5 +
 gnu/usr.bin/binutils/libopcodes/Makefile      |   4 +-
 .../binutils/libopcodes/Makefile.amd64        |   6 +
 gnu/usr.bin/binutils/libopcodes/Makefile.i386 |   6 +
 gnu/usr.bin/binutils/nm/Makefile              |   3 +-
 gnu/usr.bin/binutils/objcopy/Makefile         |   3 +-
 gnu/usr.bin/binutils/objdump/Makefile         |   3 +-
 gnu/usr.bin/binutils/ranlib/Makefile          |   3 +-
 gnu/usr.bin/binutils/ranlib/Makefile.i386     |   5 +
 gnu/usr.bin/binutils/size/Makefile            |   3 +-
 gnu/usr.bin/binutils/strings/Makefile         |   3 +-
 gnu/usr.bin/binutils/strip/Makefile           |   3 +-
 gnu/usr.bin/binutils/update.sh                |  25 ++--
 57 files changed, 192 insertions(+), 452 deletions(-)
 delete mode 100644 gnu/usr.bin/binutils/alpha-elf/Makefile
 delete mode 100644 gnu/usr.bin/binutils/alpha-elf/Makefile.inc
 delete mode 100644 gnu/usr.bin/binutils/alpha-elf/Makefile.inc0
 delete mode 100644 gnu/usr.bin/binutils/alpha-elf/as/Makefile
 delete mode 100644 gnu/usr.bin/binutils/alpha-elf/ld/Makefile
 create mode 100644 gnu/usr.bin/binutils/ar/Makefile.i386
 rename gnu/usr.bin/binutils/{i386-elf => }/as/Makefile (91%)
 create mode 100644 gnu/usr.bin/binutils/as/Makefile.i386
 rename gnu/usr.bin/binutils/{alpha-elf/as => as/alpha}/config.h (100%)
 rename gnu/usr.bin/binutils/{alpha-elf/as => as/alpha}/obj-format.h (100%)
 rename gnu/usr.bin/binutils/{alpha-elf/as => as/alpha}/targ-cpu.h (100%)
 rename gnu/usr.bin/binutils/{alpha-elf/as => as/alpha}/targ-env.h (100%)
 rename gnu/usr.bin/binutils/{i386-elf/as => as/i386}/config.h (100%)
 rename gnu/usr.bin/binutils/{i386-elf/as => as/i386}/obj-format.h (100%)
 rename gnu/usr.bin/binutils/{i386-aout/as => as/i386}/targ-cpu.h (100%)
 rename gnu/usr.bin/binutils/{i386-aout/as => as/i386}/targ-env.h (100%)
 delete mode 100644 gnu/usr.bin/binutils/i386-aout/Makefile
 delete mode 100644 gnu/usr.bin/binutils/i386-aout/Makefile.inc
 delete mode 100644 gnu/usr.bin/binutils/i386-aout/Makefile.inc0
 delete mode 100644 gnu/usr.bin/binutils/i386-aout/as/Makefile
 delete mode 100644 gnu/usr.bin/binutils/i386-aout/as/config.h
 delete mode 100644 gnu/usr.bin/binutils/i386-aout/as/itbl-cpu.h
 delete mode 100644 gnu/usr.bin/binutils/i386-aout/as/obj-format.h
 delete mode 100644 gnu/usr.bin/binutils/i386-elf/Makefile
 delete mode 100644 gnu/usr.bin/binutils/i386-elf/Makefile.inc
 delete mode 100644 gnu/usr.bin/binutils/i386-elf/Makefile.inc0
 delete mode 100644 gnu/usr.bin/binutils/i386-elf/as/itbl-cpu.h
 delete mode 100644 gnu/usr.bin/binutils/i386-elf/as/targ-cpu.h
 delete mode 100644 gnu/usr.bin/binutils/i386-elf/as/targ-env.h
 delete mode 100644 gnu/usr.bin/binutils/i386-elf/ld/Makefile
 delete mode 100644 gnu/usr.bin/binutils/i386-elf/ld/config.h
 create mode 100644 gnu/usr.bin/binutils/ld/Makefile
 create mode 100644 gnu/usr.bin/binutils/ld/Makefile.alpha
 create mode 100644 gnu/usr.bin/binutils/ld/Makefile.i386
 rename gnu/usr.bin/binutils/{alpha-elf/ld => ld/alpha}/ldemul-list.h (100%)
 rename gnu/usr.bin/binutils/{alpha-elf => }/ld/config.h (100%)
 rename gnu/usr.bin/binutils/{i386-elf/ld => ld/i386}/ldemul-list.h (100%)
 create mode 100644 gnu/usr.bin/binutils/libbfd/Makefile.i386
 rename gnu/usr.bin/binutils/libbfd/{ => i386}/config.h (100%)
 create mode 100644 gnu/usr.bin/binutils/libbinutils/Makefile.i386
 create mode 100644 gnu/usr.bin/binutils/libopcodes/Makefile.amd64
 create mode 100644 gnu/usr.bin/binutils/libopcodes/Makefile.i386
 create mode 100644 gnu/usr.bin/binutils/ranlib/Makefile.i386

diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
index 2153ba1b20d9..0b8ec83dc2c6 100644
--- a/gnu/usr.bin/binutils/Makefile
+++ b/gnu/usr.bin/binutils/Makefile
@@ -1,11 +1,10 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:40:47 jdp Exp $
 #
 
 # Omitted for now: c++filt.
 SUBDIR=		libiberty libbfd libopcodes libbinutils \
-		i386-elf i386-aout \
-		addr2line ar nm objcopy objdump ranlib \
+		addr2line ar as ld nm objcopy objdump ranlib \
 		size strings strip
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0
index 51ed0c50fde8..75ffd8829035 100644
--- a/gnu/usr.bin/binutils/Makefile.inc0
+++ b/gnu/usr.bin/binutils/Makefile.inc0
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile.inc0,v 1.1.1.1 1998/03/01 23:40:48 jdp Exp $
 #
 
 #
@@ -17,14 +17,23 @@ RELTOP:=	..
 
 RELSRC=		${RELTOP}/../../../contrib/binutils
 SRCDIR=		${.CURDIR}/${RELSRC}
-HOST=		i386-unknown-freebsdelf
-TARGET=		i386-unknown-freebsdelf
 
 CFLAGS+=	-D_GNU_SOURCE
-CFLAGS+=	-DARCH_i386
 
 # We use "-I-" because without it our yacc-generated parser tries to
 # use GNU's bison-generated header files.
-CFLAGS+=	-I- -I. -I${.CURDIR}
+CFLAGS+=	-I- -I.
+.if exists(${.CURDIR}/${MACHINE_ARCH})
+CFLAGS+=	-I${.CURDIR}/${MACHINE_ARCH}
+.endif
+CFLAGS+=	-I${.CURDIR}
 CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbfd
 CFLAGS+=	-I${SRCDIR}/include
+
+.if exists(${.CURDIR}/${MACHINE_ARCH})
+.PATH: ${.CURDIR}/${MACHINE_ARCH}
+.endif
+
+.if exists(${.CURDIR}/Makefile.${MACHINE_ARCH})
+.include "${.CURDIR}/Makefile.${MACHINE_ARCH}"
+.endif
diff --git a/gnu/usr.bin/binutils/alpha-elf/Makefile b/gnu/usr.bin/binutils/alpha-elf/Makefile
deleted file mode 100644
index 6939dab5a88c..000000000000
--- a/gnu/usr.bin/binutils/alpha-elf/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id: Makefile,v 1.1.1.1 1998/03/01 23:40:57 jdp Exp $
-#
-
-.include "../Makefile.inc0"
-
-SUBDIR=		as ld
-
-.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/binutils/alpha-elf/Makefile.inc b/gnu/usr.bin/binutils/alpha-elf/Makefile.inc
deleted file mode 100644
index bb2e877d4cc1..000000000000
--- a/gnu/usr.bin/binutils/alpha-elf/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# $Id: Makefile.inc,v 1.1.1.1 1998/03/01 23:40:57 jdp Exp $
-#
-
-BINDIR?=	/usr/bin
diff --git a/gnu/usr.bin/binutils/alpha-elf/Makefile.inc0 b/gnu/usr.bin/binutils/alpha-elf/Makefile.inc0
deleted file mode 100644
index dccbd5a67c9f..000000000000
--- a/gnu/usr.bin/binutils/alpha-elf/Makefile.inc0
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id: Makefile.inc0,v 1.1.1.1 1998/03/01 23:40:58 jdp Exp $
-#
-
-.include "../Makefile.inc0"
-
-RELTOP:=	../${RELTOP}
diff --git a/gnu/usr.bin/binutils/alpha-elf/as/Makefile b/gnu/usr.bin/binutils/alpha-elf/as/Makefile
deleted file mode 100644
index e74baac72e0b..000000000000
--- a/gnu/usr.bin/binutils/alpha-elf/as/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# $Id: Makefile,v 1.1.1.1 1998/03/01 23:40:59 jdp Exp $
-#
-
-.include "../Makefile.inc0"
-
-.PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
-
-PROG=		as
-MAN1=		doc/as.1
-SRCS=		app.c as.c atof-generic.c atof-ieee.c bignum-copy.c \
-		cond.c ecoff.c expr.c flonum-copy.c flonum-konst.c \
-		flonum-mult.c frags.c hash.c input-file.c \
-		input-scrub.c listing.c literal.c macro.c messages.c \
-		obj-elf.c output-file.c read.c sb.c stabs.c \
-		subsegs.c symbols.c tc-alpha.c write.c
-CFLAGS+=	-I${SRCDIR}/gas
-CFLAGS+=	-I${SRCDIR}/gas/config
-CFLAGS+=	-I${SRCDIR}
-LDADD+=		-L${RELTOP}/libbfd -lbfd
-LDADD+=		-L${RELTOP}/libiberty -liberty
-LDADD+=		-L${RELTOP}/libopcodes -lopcodes
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/alpha-elf/ld/Makefile b/gnu/usr.bin/binutils/alpha-elf/ld/Makefile
deleted file mode 100644
index 29f755f84b47..000000000000
--- a/gnu/usr.bin/binutils/alpha-elf/ld/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# $Id: Makefile,v 1.1.1.1 1998/03/09 00:33:25 jb Exp $
-#
-
-.include "../Makefile.inc0"
-
-.PATH: ${SRCDIR}/ld
-
-EMULATION=	elf64alpha
-LDSCRIPTS=	elf64alpha.x elf64alpha.xbn elf64alpha.xn elf64alpha.xr \
-		elf64alpha.xs elf64alpha.xu alpha.x alpha.xbn \
-		alpha.xn alpha.xr alpha.xu
-
-PROG=		ld
-BINDIR=		/usr/bin
-SCRIPTDIR=	/usr/libdata/ldscripts
-SRCS=		ldgram.c eelf64alpha.c ealpha.c ldcref.c \
-		ldctor.c  ldemul.c ldexp.c ldfile.c ldlang.c \
-		ldlex.l ldmain.c ldmisc.c ldver.c ldwrite.c \
-		lexsup.c mri.c
-CFLAGS+=	-DDEFAULT_EMULATION=\"${EMULATION}\"
-CFLAGS+=	-DSCRIPTDIR=\"${DESTDIR}/usr/libdata\"
-CFLAGS+=	-DTARGET=\"${TARGET}\"
-CFLAGS+=	-I${SRCDIR}/ld
-LDADD+=		-L${RELTOP}/libbfd -lbfd
-LDADD+=		-L${RELTOP}/libiberty -liberty
-CLEANFILES+=	eelf64alpha.c ealpha.c ldgram.c ldgram.h ldlex.c
-CLEANDIRS+=	ldscripts
-
-beforedepend: eelf64alpha.c ealpha.c ldgram.c ldgram.h ldlex.c
-
-eelf64alpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
-		scripttempl/elf.sc genscripts.sh emultempl/stringify.sed
-	sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${DESTDIR}/usr/lib \
-	    ${HOST} ${TARGET} ${TARGET} ${EMULATION} "" \
-	    ${EMULATION} ${TARGET}
-
-ealpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
-		scripttempl/elf.sc genscripts.sh emultempl/stringify.sed
-	sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${DESTDIR}/usr/lib \
-	    ${HOST} ${TARGET} ${TARGET} ${EMULATION} "" \
-	    alpha alpha-unknown-freebsd
-
-ldgram.c ldgram.h: ldgram.y
-	${YACC} ${YFLAGS} -o ${.TARGET:S/.h$/.c/} ${.ALLSRC}
-
-afterinstall:
-	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${LDSCRIPTS:S|^|ldscripts/|} ${DESTDIR}${SCRIPTDIR}
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile
index 86f0ddf37e32..7374a727fa56 100644
--- a/gnu/usr.bin/binutils/ar/Makefile
+++ b/gnu/usr.bin/binutils/ar/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:40:51 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -8,6 +8,7 @@
 
 PROG=		ar
 SRCS=		ar.c not-ranlib.c
+CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+=	-I${SRCDIR}/binutils
 CFLAGS+=	-I${SRCDIR}/bfd
 LDADD+=		-L${RELTOP}/libbinutils -lbinutils
diff --git a/gnu/usr.bin/binutils/ar/Makefile.i386 b/gnu/usr.bin/binutils/ar/Makefile.i386
new file mode 100644
index 000000000000..a23f65695926
--- /dev/null
+++ b/gnu/usr.bin/binutils/ar/Makefile.i386
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+BINDIR=		/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/i386-elf/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
similarity index 91%
rename from gnu/usr.bin/binutils/i386-elf/as/Makefile
rename to gnu/usr.bin/binutils/as/Makefile
index de209229e1e1..3974187ac1db 100644
--- a/gnu/usr.bin/binutils/i386-elf/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:40:59 jdp Exp $
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/as/Makefile.i386 b/gnu/usr.bin/binutils/as/Makefile.i386
new file mode 100644
index 000000000000..a23f65695926
--- /dev/null
+++ b/gnu/usr.bin/binutils/as/Makefile.i386
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+BINDIR=		/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/alpha-elf/as/config.h b/gnu/usr.bin/binutils/as/alpha/config.h
similarity index 100%
rename from gnu/usr.bin/binutils/alpha-elf/as/config.h
rename to gnu/usr.bin/binutils/as/alpha/config.h
diff --git a/gnu/usr.bin/binutils/alpha-elf/as/obj-format.h b/gnu/usr.bin/binutils/as/alpha/obj-format.h
similarity index 100%
rename from gnu/usr.bin/binutils/alpha-elf/as/obj-format.h
rename to gnu/usr.bin/binutils/as/alpha/obj-format.h
diff --git a/gnu/usr.bin/binutils/alpha-elf/as/targ-cpu.h b/gnu/usr.bin/binutils/as/alpha/targ-cpu.h
similarity index 100%
rename from gnu/usr.bin/binutils/alpha-elf/as/targ-cpu.h
rename to gnu/usr.bin/binutils/as/alpha/targ-cpu.h
diff --git a/gnu/usr.bin/binutils/alpha-elf/as/targ-env.h b/gnu/usr.bin/binutils/as/alpha/targ-env.h
similarity index 100%
rename from gnu/usr.bin/binutils/alpha-elf/as/targ-env.h
rename to gnu/usr.bin/binutils/as/alpha/targ-env.h
diff --git a/gnu/usr.bin/binutils/i386-elf/as/config.h b/gnu/usr.bin/binutils/as/i386/config.h
similarity index 100%
rename from gnu/usr.bin/binutils/i386-elf/as/config.h
rename to gnu/usr.bin/binutils/as/i386/config.h
diff --git a/gnu/usr.bin/binutils/i386-elf/as/obj-format.h b/gnu/usr.bin/binutils/as/i386/obj-format.h
similarity index 100%
rename from gnu/usr.bin/binutils/i386-elf/as/obj-format.h
rename to gnu/usr.bin/binutils/as/i386/obj-format.h
diff --git a/gnu/usr.bin/binutils/i386-aout/as/targ-cpu.h b/gnu/usr.bin/binutils/as/i386/targ-cpu.h
similarity index 100%
rename from gnu/usr.bin/binutils/i386-aout/as/targ-cpu.h
rename to gnu/usr.bin/binutils/as/i386/targ-cpu.h
diff --git a/gnu/usr.bin/binutils/i386-aout/as/targ-env.h b/gnu/usr.bin/binutils/as/i386/targ-env.h
similarity index 100%
rename from gnu/usr.bin/binutils/i386-aout/as/targ-env.h
rename to gnu/usr.bin/binutils/as/i386/targ-env.h
diff --git a/gnu/usr.bin/binutils/i386-aout/Makefile b/gnu/usr.bin/binutils/i386-aout/Makefile
deleted file mode 100644
index 0aa4d2a6cd67..000000000000
--- a/gnu/usr.bin/binutils/i386-aout/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-.include "../Makefile.inc0"
-
-SUBDIR=		as
-
-.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/binutils/i386-aout/Makefile.inc b/gnu/usr.bin/binutils/i386-aout/Makefile.inc
deleted file mode 100644
index e5f947c0b79b..000000000000
--- a/gnu/usr.bin/binutils/i386-aout/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-BINDIR?=	/usr/libexec/aout
diff --git a/gnu/usr.bin/binutils/i386-aout/Makefile.inc0 b/gnu/usr.bin/binutils/i386-aout/Makefile.inc0
deleted file mode 100644
index 40b0f931afe8..000000000000
--- a/gnu/usr.bin/binutils/i386-aout/Makefile.inc0
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-.include "../Makefile.inc0"
-
-RELTOP:=	../${RELTOP}
diff --git a/gnu/usr.bin/binutils/i386-aout/as/Makefile b/gnu/usr.bin/binutils/i386-aout/as/Makefile
deleted file mode 100644
index 0083074b70fe..000000000000
--- a/gnu/usr.bin/binutils/i386-aout/as/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id$
-#
-
-.include "../Makefile.inc0"
-
-.PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
-
-PROG=		as
-MAN1=		doc/as.1
-SRCS=		app.c as.c atof-generic.c atof-ieee.c bignum-copy.c \
-		cond.c ecoff.c expr.c flonum-copy.c flonum-konst.c \
-		flonum-mult.c frags.c hash.c input-file.c \
-		input-scrub.c listing.c literal.c macro.c messages.c \
-		obj-aout.c output-file.c read.c sb.c stabs.c \
-		subsegs.c symbols.c tc-i386.c write.c
-CFLAGS+=	-I${SRCDIR}/gas
-CFLAGS+=	-I${SRCDIR}/gas/config
-CFLAGS+=	-I${SRCDIR}
-LDADD+=		-L${RELTOP}/libbfd -lbfd
-LDADD+=		-L${RELTOP}/libiberty -liberty
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/i386-aout/as/config.h b/gnu/usr.bin/binutils/i386-aout/as/config.h
deleted file mode 100644
index 98d014110aa9..000000000000
--- a/gnu/usr.bin/binutils/i386-aout/as/config.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* config.h.  Generated automatically by make.  */
-#ifndef GAS_VERSION
-#define GAS_VERSION "2.8.1"
-
-/* conf.  Generated automatically by configure.  */
-/* conf.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if using alloca.c.  */
-/* #undef C_ALLOCA */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define as __inline if that's what the C compiler calls it.  */
-/* #undef inline */
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
-/* Should gas use high-level BFD interfaces?  */
-#define BFD_ASSEMBLER 1
-
-/* Some assert/preprocessor combinations are incapable of handling
-   certain kinds of constructs in the argument of assert.  For example,
-   quoted strings (if requoting isn't done right) or newlines.  */
-/* #undef BROKEN_ASSERT */
-
-/* If we aren't doing cross-assembling, some operations can be optimized,
-   since byte orders and value sizes don't need to be adjusted.  */
-/* #undef CROSS_COMPILE */
-
-/* Some gas code wants to know these parameters.  */
-#define TARGET_ALIAS "i386-unknown-freebsd"
-#define TARGET_CPU "i386"
-#define TARGET_CANONICAL "i386-unknown-freebsd"
-#define TARGET_OS "freebsd"
-#define TARGET_VENDOR "unknown"
-
-/* Sometimes the system header files don't declare strstr.  */
-/* #undef NEED_DECLARATION_STRSTR */
-
-/* Sometimes the system header files don't declare malloc and realloc.  */
-/* #undef NEED_DECLARATION_MALLOC */
-
-/* Sometimes the system header files don't declare free.  */
-/* #undef NEED_DECLARATION_FREE */
-
-/* Sometimes the system header files don't declare sbrk.  */
-/* #undef NEED_DECLARATION_SBRK */
-
-/* Sometimes errno.h doesn't declare errno itself.  */
-/* #undef NEED_DECLARATION_ERRNO */
-
-/* #undef MANY_SEGMENTS */
-
-/* Needed only for sparc configuration.  */
-/* #undef SPARC_V9 */
-/* #undef SPARC_ARCH64 */
-
-/* Defined if using CGEN.  */
-/* #undef USING_CGEN */
-
-/* Needed only for some configurations that can produce multiple output
-   formats.  */
-#define DEFAULT_EMULATION ""
-#define EMULATIONS 
-/* #undef USE_EMULATIONS */
-/* #undef OBJ_MAYBE_AOUT */
-/* #undef OBJ_MAYBE_BOUT */
-/* #undef OBJ_MAYBE_COFF */
-/* #undef OBJ_MAYBE_ECOFF */
-/* #undef OBJ_MAYBE_ELF */
-/* #undef OBJ_MAYBE_GENERIC */
-/* #undef OBJ_MAYBE_HP300 */
-/* #undef OBJ_MAYBE_IEEE */
-/* #undef OBJ_MAYBE_SOM */
-/* #undef OBJ_MAYBE_VMS */
-
-/* Used for some of the COFF configurations, when the COFF code needs
-   to select something based on the CPU type before it knows it... */
-/* #undef I386COFF */
-/* #undef M68KCOFF */
-/* #undef M88KCOFF */
-
-/* Define if you have the remove function.  */
-/* #undef HAVE_REMOVE */
-
-/* Define if you have the sbrk function.  */
-#define HAVE_SBRK 1
-
-/* Define if you have the unlink function.  */
-#define HAVE_UNLINK 1
-
-/* Define if you have the <errno.h> header file.  */
-#define HAVE_ERRNO_H 1
-
-/* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the <stdarg.h> header file.  */
-#define HAVE_STDARG_H 1
-
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <strings.h> header file.  */
-#define HAVE_STRINGS_H 1
-
-/* Define if you have the <sys/types.h> header file.  */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <varargs.h> header file.  */
-#define HAVE_VARARGS_H 1
-#endif /* GAS_VERSION */
diff --git a/gnu/usr.bin/binutils/i386-aout/as/itbl-cpu.h b/gnu/usr.bin/binutils/i386-aout/as/itbl-cpu.h
deleted file mode 100644
index 54880214c736..000000000000
--- a/gnu/usr.bin/binutils/i386-aout/as/itbl-cpu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "itbl-i386.h"
diff --git a/gnu/usr.bin/binutils/i386-aout/as/obj-format.h b/gnu/usr.bin/binutils/i386-aout/as/obj-format.h
deleted file mode 100644
index e8a4d337e164..000000000000
--- a/gnu/usr.bin/binutils/i386-aout/as/obj-format.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "obj-aout.h"
diff --git a/gnu/usr.bin/binutils/i386-elf/Makefile b/gnu/usr.bin/binutils/i386-elf/Makefile
deleted file mode 100644
index c84984bc0c30..000000000000
--- a/gnu/usr.bin/binutils/i386-elf/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $Id$
-#
-
-.include "../Makefile.inc0"
-
-SUBDIR=		as ld
-
-.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/binutils/i386-elf/Makefile.inc b/gnu/usr.bin/binutils/i386-elf/Makefile.inc
deleted file mode 100644
index deb77a4d6dad..000000000000
--- a/gnu/usr.bin/binutils/i386-elf/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-BINDIR?=	/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/i386-elf/Makefile.inc0 b/gnu/usr.bin/binutils/i386-elf/Makefile.inc0
deleted file mode 100644
index 40b0f931afe8..000000000000
--- a/gnu/usr.bin/binutils/i386-elf/Makefile.inc0
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $Id$
-#
-
-.include "../Makefile.inc0"
-
-RELTOP:=	../${RELTOP}
diff --git a/gnu/usr.bin/binutils/i386-elf/as/itbl-cpu.h b/gnu/usr.bin/binutils/i386-elf/as/itbl-cpu.h
deleted file mode 100644
index 54880214c736..000000000000
--- a/gnu/usr.bin/binutils/i386-elf/as/itbl-cpu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "itbl-i386.h"
diff --git a/gnu/usr.bin/binutils/i386-elf/as/targ-cpu.h b/gnu/usr.bin/binutils/i386-elf/as/targ-cpu.h
deleted file mode 100644
index f4be0e50bd8e..000000000000
--- a/gnu/usr.bin/binutils/i386-elf/as/targ-cpu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "tc-i386.h"
diff --git a/gnu/usr.bin/binutils/i386-elf/as/targ-env.h b/gnu/usr.bin/binutils/i386-elf/as/targ-env.h
deleted file mode 100644
index 032e7acdf218..000000000000
--- a/gnu/usr.bin/binutils/i386-elf/as/targ-env.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "te-freebsd.h"
diff --git a/gnu/usr.bin/binutils/i386-elf/ld/Makefile b/gnu/usr.bin/binutils/i386-elf/ld/Makefile
deleted file mode 100644
index 763d68081952..000000000000
--- a/gnu/usr.bin/binutils/i386-elf/ld/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:02 jdp Exp $
-#
-
-.include "../Makefile.inc0"
-
-.PATH: ${SRCDIR}/ld
-
-EMULATION=	elf_i386
-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
-
-PROG=		ld
-BINDIR=		/usr/libexec/elf
-SCRIPTDIR=	/usr/libdata/ldscripts
-SRCS=		ldgram.c eelf_i386.c ei386freebsd.c ldcref.c \
-		ldctor.c  ldemul.c ldexp.c ldfile.c ldlang.c \
-		ldlex.l ldmain.c ldmisc.c ldver.c ldwrite.c \
-		lexsup.c mri.c
-CFLAGS+=	-DDEFAULT_EMULATION=\"${EMULATION}\"
-CFLAGS+=	-DSCRIPTDIR=\"${DESTDIR}/usr/libdata\"
-CFLAGS+=	-DTARGET=\"${TARGET}\"
-CFLAGS+=	-I${SRCDIR}/ld
-LDADD+=		-L${RELTOP}/libbfd -lbfd
-LDADD+=		-L${RELTOP}/libiberty -liberty
-CLEANFILES+=	eelf_i386.c ei386freebsd.c ldgram.c ldgram.h ldlex.c
-CLEANDIRS+=	ldscripts
-
-beforedepend: eelf_i386.c ei386freebsd.c ldgram.c ldgram.h ldlex.c
-
-eelf_i386.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} "" \
-	    ${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
-
-ldgram.c ldgram.h: ldgram.y
-	${YACC} ${YFLAGS} -o ${.TARGET:S/.h$/.c/} ${.ALLSRC}
-
-afterinstall:
-	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${LDSCRIPTS:S|^|ldscripts/|} ${DESTDIR}${SCRIPTDIR}
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/i386-elf/ld/config.h b/gnu/usr.bin/binutils/i386-elf/ld/config.h
deleted file mode 100644
index 545731e48b09..000000000000
--- a/gnu/usr.bin/binutils/i386-elf/ld/config.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* config.h.  Generated automatically by configure.  */
-/* config.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Whether strstr must be declared even if <string.h> is included.  */
-/* #undef NEED_DECLARATION_STRSTR */
-
-/* Whether free must be declared even if <stdlib.h> is included.  */
-/* #undef NEED_DECLARATION_FREE */
-
-/* Whether sbrk must be declared even if <unistd.h> is included.  */
-/* #undef NEED_DECLARATION_SBRK */
-
-/* Whether getenv must be declared even if <stdlib.h> is included.  */
-/* #undef NEED_DECLARATION_GETENV */
-
-/* Do we need to use the b modifier when opening binary files?  */
-/* #undef USE_BINARY_FOPEN */
-
-/* Define if you have the sbrk function.  */
-#define HAVE_SBRK 1
-
-/* Define if you have the <dirent.h> header file.  */
-#define HAVE_DIRENT_H 1
-
-/* Define if you have the <ndir.h> header file.  */
-/* #undef HAVE_NDIR_H */
-
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <strings.h> header file.  */
-#define HAVE_STRINGS_H 1
-
-/* Define if you have the <sys/dir.h> header file.  */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define if you have the <sys/ndir.h> header file.  */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
new file mode 100644
index 000000000000..284a42343c44
--- /dev/null
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -0,0 +1,32 @@
+#
+# $Id: Makefile,v 1.2 1998/03/08 08:08:39 peter Exp $
+#
+
+.include "../Makefile.inc0"
+
+.PATH: ${SRCDIR}/ld
+
+PROG=		ld
+SCRIPTDIR=	/usr/libdata/ldscripts
+SRCS+=		ldcref.c ldctor.c ldemul.c ldexp.c ldfile.c \
+		ldgram.c ldlang.c ldlex.l ldmain.c ldmisc.c \
+		ldver.c ldwrite.c lexsup.c mri.c
+CFLAGS+=	-DDEFAULT_EMULATION=\"${EMULATION}\"
+CFLAGS+=	-DSCRIPTDIR=\"${DESTDIR}/usr/libdata\"
+CFLAGS+=	-DTARGET=\"${TARGET}\"
+CFLAGS+=	-I${SRCDIR}/ld
+LDADD+=		-L${RELTOP}/libbfd -lbfd
+LDADD+=		-L${RELTOP}/libiberty -liberty
+CLEANFILES+=	ldgram.c ldgram.h ldlex.c
+CLEANDIRS+=	ldscripts
+
+beforedepend: ldgram.c ldgram.h ldlex.c
+
+ldgram.c ldgram.h: ldgram.y
+	${YACC} ${YFLAGS} -o ${.TARGET:S/.h$/.c/} ${.ALLSRC}
+
+afterinstall:
+	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	    ${LDSCRIPTS:S|^|ldscripts/|} ${DESTDIR}${SCRIPTDIR}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
new file mode 100644
index 000000000000..cea84dd9a823
--- /dev/null
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -0,0 +1,26 @@
+#
+# $Id$
+#
+
+EMULATION=	elf64alpha
+HOST=		alpha-unknown-freebsdelf
+TARGET=		alpha-unknown-freebsdelf
+LDSCRIPTS=	elf64alpha.x elf64alpha.xbn elf64alpha.xn elf64alpha.xr \
+		elf64alpha.xs elf64alpha.xu alpha.x alpha.xbn \
+		alpha.xn alpha.xr alpha.xu
+SRCS+=		eelf64alpha.c ealpha.c
+CLEANFILES+=	eelf64alpha.c ealpha.c
+
+beforedepend: eelf64alpha.c ealpha.c
+
+eelf64alpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
+		scripttempl/elf.sc genscripts.sh emultempl/stringify.sed
+	sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${DESTDIR}/usr/lib \
+	    ${HOST} ${TARGET} ${TARGET} ${EMULATION} "" \
+	    ${EMULATION} ${TARGET}
+
+ealpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
+		scripttempl/elf.sc genscripts.sh emultempl/stringify.sed
+	sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR}/ld ${DESTDIR}/usr/lib \
+	    ${HOST} ${TARGET} ${TARGET} ${EMULATION} "" \
+	    alpha alpha-unknown-freebsd
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
new file mode 100644
index 000000000000..729ad8b13c92
--- /dev/null
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -0,0 +1,29 @@
+#
+# $Id$
+#
+
+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
+
+beforedepend: eelf_i386.c ei386freebsd.c
+
+eelf_i386.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} "" \
+	    ${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/alpha-elf/ld/ldemul-list.h b/gnu/usr.bin/binutils/ld/alpha/ldemul-list.h
similarity index 100%
rename from gnu/usr.bin/binutils/alpha-elf/ld/ldemul-list.h
rename to gnu/usr.bin/binutils/ld/alpha/ldemul-list.h
diff --git a/gnu/usr.bin/binutils/alpha-elf/ld/config.h b/gnu/usr.bin/binutils/ld/config.h
similarity index 100%
rename from gnu/usr.bin/binutils/alpha-elf/ld/config.h
rename to gnu/usr.bin/binutils/ld/config.h
diff --git a/gnu/usr.bin/binutils/i386-elf/ld/ldemul-list.h b/gnu/usr.bin/binutils/ld/i386/ldemul-list.h
similarity index 100%
rename from gnu/usr.bin/binutils/i386-elf/ld/ldemul-list.h
rename to gnu/usr.bin/binutils/ld/i386/ldemul-list.h
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 8e8afd9da8bb..1dff4bea5ac9 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:03 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -7,33 +7,19 @@
 .PATH: ${SRCDIR}/bfd
 
 LIB=		bfd
-SRCS=		aout32.c archive.c archures.c bfd.c binary.c \
-		cache.c coff-i386.c coffgen.c cofflink.c corefile.c \
-		cpu-i386.c elf.c elf32-i386.c elf32.c elflink.c \
-		format.c hash.c i386bsd.c i386freebsd.c ihex.c \
+SRCS+=		archive.c archures.c bfd.c binary.c cache.c \
+		coffgen.c corefile.c elf.c format.c hash.c ihex.c \
 		init.c libbfd.c linker.c opncls.c reloc.c section.c \
 		srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c
-CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_i386_vec
-CFLAGS+=	-DSELECT_VECS="&bfd_elf32_i386_vec,&i386freebsd_vec,&i386bsd_vec,&i386coff_vec"
-CFLAGS+=	-DSELECT_ARCHITECTURES="&bfd_i386_arch"
-CFLAGS+=	-DHAVE_bfd_elf32_i386_vec
-CFLAGS+=	-DHAVE_i386freebsd_vec
-CFLAGS+=	-DHAVE_i386bsd_vec
-CFLAGS+=	-DHAVE_i386coff_vec
 CFLAGS+=	-I${SRCDIR}/bfd
 NOPROFILE=	true
 NOPIC=		true
-CLEANFILES+=	elf32-target.h targmatch.h
+CLEANFILES+=	targmatch.h
 
-beforedepend: elf32-target.h targmatch.h
+beforedepend: targmatch.h
 
 targets.o: targmatch.h
 
-elf32-i386.o: elf32-target.h
-
-elf32-target.h: elfxx-target.h
-	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
-
 targmatch.h: targmatch.sed config.bfd
 	sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}
 
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
new file mode 100644
index 000000000000..2db51f329ae4
--- /dev/null
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -0,0 +1,22 @@
+#
+# $Id$
+#
+
+SRCS+=		aout32.c coff-i386.c cofflink.c cpu-i386.c \
+		elf32-i386.c elf32.c elflink.c i386bsd.c \
+		i386freebsd.c
+CFLAGS+=	-DDEFAULT_VECTOR=bfd_elf32_i386_vec
+CFLAGS+=	-DSELECT_VECS="&bfd_elf32_i386_vec,&i386freebsd_vec,&i386bsd_vec,&i386coff_vec"
+CFLAGS+=	-DSELECT_ARCHITECTURES="&bfd_i386_arch"
+CFLAGS+=	-DHAVE_bfd_elf32_i386_vec
+CFLAGS+=	-DHAVE_i386freebsd_vec
+CFLAGS+=	-DHAVE_i386bsd_vec
+CFLAGS+=	-DHAVE_i386coff_vec
+CLEANFILES+=	elf32-target.h
+
+beforedepend: elf32-target.h
+
+elf32-i386.o: elf32-target.h
+
+elf32-target.h: elfxx-target.h
+	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/config.h b/gnu/usr.bin/binutils/libbfd/i386/config.h
similarity index 100%
rename from gnu/usr.bin/binutils/libbfd/config.h
rename to gnu/usr.bin/binutils/libbfd/i386/config.h
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index 2c5f41a1f077..230c62bdba79 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:05 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -7,7 +7,7 @@
 .PATH: ${SRCDIR}/binutils
 
 LIB=		binutils
-SRCS=		arlex.l arparse.y arsup.c bucomm.c debug.c filemode.c \
+SRCS+=		arlex.l arparse.y arsup.c bucomm.c debug.c filemode.c \
 		ieee.c rdcoff.c rddbg.c stabs.c wrstabs.c version.c
 CFLAGS+=	-DTARGET=\"${TARGET}\"
 CFLAGS+=	-DVERSION=\"${VERSION}\"
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile.i386 b/gnu/usr.bin/binutils/libbinutils/Makefile.i386
new file mode 100644
index 000000000000..bfdd78a25c88
--- /dev/null
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile.i386
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+TARGET=		i386-unknown-freebsdelf
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile b/gnu/usr.bin/binutils/libopcodes/Makefile
index 94f1cee04b0d..b403738c2535 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:11 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -7,7 +7,7 @@
 .PATH: ${SRCDIR}/opcodes
 
 LIB=		opcodes
-SRCS=		i386-dis.c dis-buf.c disassemble.c
+SRCS+=		dis-buf.c disassemble.c
 CFLAGS+=	-I${SRCDIR}/opcodes
 NOPROFILE=	true
 NOPIC=		true
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64 b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
new file mode 100644
index 000000000000..42352ec11595
--- /dev/null
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
@@ -0,0 +1,6 @@
+#
+# $Id$
+#
+
+SRCS+=		i386-dis.c
+CFLAGS+=	-DARCH_i386
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.i386 b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
new file mode 100644
index 000000000000..42352ec11595
--- /dev/null
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
@@ -0,0 +1,6 @@
+#
+# $Id$
+#
+
+SRCS+=		i386-dis.c
+CFLAGS+=	-DARCH_i386
diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile
index 440240573e62..f45067b75836 100644
--- a/gnu/usr.bin/binutils/nm/Makefile
+++ b/gnu/usr.bin/binutils/nm/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:12 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -8,6 +8,7 @@
 
 PROG=		nm
 SRCS=		nm.c
+CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+=	-I${SRCDIR}/binutils
 LDADD+=		-L${RELTOP}/libbinutils -lbinutils
 LDADD+=		-L${RELTOP}/libbfd -lbfd
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile
index 186335322e0f..4c8248ccbf22 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile
+++ b/gnu/usr.bin/binutils/objcopy/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:13 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -8,6 +8,7 @@
 
 PROG=		objcopy
 SRCS=		objcopy.c not-strip.c
+CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+=	-I${SRCDIR}/binutils
 LDADD+=		-L${RELTOP}/libbinutils -lbinutils
 LDADD+=		-L${RELTOP}/libbfd -lbfd
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index ec45bbb2485a..19e3a47da13e 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:13 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -8,6 +8,7 @@
 
 PROG=		objdump
 SRCS=		objdump.c prdbg.c
+CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+=	-I${SRCDIR}/binutils
 LDADD+=		-L${RELTOP}/libbinutils -lbinutils
 LDADD+=		-L${RELTOP}/libopcodes -lopcodes
diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile
index d9201b1af54a..86b478455bd5 100644
--- a/gnu/usr.bin/binutils/ranlib/Makefile
+++ b/gnu/usr.bin/binutils/ranlib/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:14 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -8,6 +8,7 @@
 
 PROG=		ranlib
 SRCS=		ar.o is-ranlib.o
+CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+=	-I${SRCDIR}/binutils
 CFLAGS+=	-I${SRCDIR}/bfd
 LDADD+=		-L${RELTOP}/libbinutils -lbinutils
diff --git a/gnu/usr.bin/binutils/ranlib/Makefile.i386 b/gnu/usr.bin/binutils/ranlib/Makefile.i386
new file mode 100644
index 000000000000..a23f65695926
--- /dev/null
+++ b/gnu/usr.bin/binutils/ranlib/Makefile.i386
@@ -0,0 +1,5 @@
+#
+# $Id$
+#
+
+BINDIR=		/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile
index 2e1e337f0a84..d1dff691ae1d 100644
--- a/gnu/usr.bin/binutils/size/Makefile
+++ b/gnu/usr.bin/binutils/size/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:15 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -8,6 +8,7 @@
 
 PROG=		size
 SRCS=		size.c
+CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+=	-I${SRCDIR}/binutils
 LDADD+=		-L${RELTOP}/libbinutils -lbinutils
 LDADD+=		-L${RELTOP}/libbfd -lbfd
diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile
index 1c5a85cc5cb7..68a0bf8777a0 100644
--- a/gnu/usr.bin/binutils/strings/Makefile
+++ b/gnu/usr.bin/binutils/strings/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:16 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -8,6 +8,7 @@
 
 PROG=		strings
 SRCS=		strings.c
+CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+=	-I${SRCDIR}/binutils
 LDADD+=		-L${RELTOP}/libbinutils -lbinutils
 LDADD+=		-L${RELTOP}/libbfd -lbfd
diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile
index 61082ee0133d..f44d3d540bb3 100644
--- a/gnu/usr.bin/binutils/strip/Makefile
+++ b/gnu/usr.bin/binutils/strip/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:17 jdp Exp $
+# $Id: Makefile,v 1.2 1998/03/06 00:28:04 jdp Exp $
 #
 
 .include "../Makefile.inc0"
@@ -8,6 +8,7 @@
 
 PROG=		strip
 SRCS=		objcopy.c is-strip.c
+CFLAGS+=	-I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+=	-I${SRCDIR}/binutils
 LDADD+=		-L${RELTOP}/libbinutils -lbinutils
 LDADD+=		-L${RELTOP}/libbfd -lbfd
diff --git a/gnu/usr.bin/binutils/update.sh b/gnu/usr.bin/binutils/update.sh
index aaa81176312d..b9414a1d9f36 100755
--- a/gnu/usr.bin/binutils/update.sh
+++ b/gnu/usr.bin/binutils/update.sh
@@ -11,33 +11,26 @@ gnudir=$(pwd)
 contribdir="${gnudir}/../../../contrib/binutils"
 
 rm -rf build
-mkdir -p build/i386-aout
-(cd build/i386-aout
-    ${contribdir}/configure i386-unknown-freebsd || exit
-    (cd gas
-	echo "Updating i386-aout/as"
-	make config.h || exit
-	cp config.h ${gnudir}/i386-aout/as/config.h || exit
-	)
-    )
+mkdir build
 
-mkdir -p build/i386-elf
-(cd build/i386-elf
+(cd build
     ${contribdir}/configure i386-unknown-freebsdelf || exit
     (cd gas
-	echo "Updating i386-elf/as"
+	echo "Updating as"
 	make config.h || exit
-	cp config.h ${gnudir}/i386-elf/as/config.h || exit
+	cp config.h ${gnudir}/as/i386/config.h || exit
 	)
     (cd ld
-	echo "Updating i386-elf/ld"
+	echo "Updating ld"
 	make config.h ldemul-list.h || exit
-	cp config.h ldemul-list.h ${gnudir}/i386-elf/ld || exit
+	cp config.h ${gnudir}/ld || exit
+	cp ldemul-list.h ${gnudir}/ld/i386 || exit
 	)
     (cd bfd
 	echo "Updating libbfd"
 	make bfd.h config.h || exit
-	cp bfd.h config.h ${gnudir}/libbfd || exit
+	cp bfd.h ${gnudir}/libbfd || exit
+	cp config.h ${gnudir}/libbfd/i386 || exit
 	)
     (cd binutils
 	echo "Updating libbinutils"