Index: gnu/usr.bin/binutils/ld/Makefile.amd64
===========================================================================
--- gnu/usr.bin/binutils/ld/Makefile.amd64	2003/06/26 17:55:59	#1
+++ gnu/usr.bin/binutils/ld/Makefile.amd64	2003/06/26 17:55:59
@@ -18,3 +18,17 @@
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_x86_64_path} \
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    "${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}"
+
+X86_EMULATION=	elf_i386_fbsd
+_i386_path=	\"${TOOLS_PREFIX}/usr/lib/i386\"
+EMS+=		${X86_EMULATION}
+LDSCRIPTS+=	${X86_EMULATION}.x ${X86_EMULATION}.xbn ${X86_EMULATION}.xn ${X86_EMULATION}.xr \
+		${X86_EMULATION}.xs ${X86_EMULATION}.xu ${X86_EMULATION}.xc ${X86_EMULATION}.xsc
+SRCS+=		e${X86_EMULATION}.c
+CLEANFILES+=	e${X86_EMULATION}.c
+
+e${X86_EMULATION}.c: emulparams/${X86_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \
+    genscripts.sh stringify.sed
+	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_i386_path} \
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    "${X86_EMULATION}" "" ${X86_EMULATION} "${TARGET_TUPLE}"
Index: gnu/usr.bin/binutils/libbfd/Makefile.amd64
===========================================================================
--- gnu/usr.bin/binutils/libbfd/Makefile.amd64	2003/06/26 17:55:59	#1
+++ gnu/usr.bin/binutils/libbfd/Makefile.amd64	2003/06/26 17:55:59
@@ -1,21 +1,22 @@
 # $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.amd64,v 1.1 2003/04/26 03:28:21 obrien Exp $
 
-.include "${.CURDIR}/Makefile.i386"
-
-#	Get the i386 DEFAULT_VECTOR and VECS.
-I386_VECS:=	${DEFAULT_VECTOR} ${VECS}
-
 DEFAULT_VECTOR=	bfd_elf64_x86_64_vec
 
-VECS=	bfd_elf64_x86_64_vec ${I386_VECS}
+VECS=	bfd_elf64_x86_64_vec bfd_elf32_i386_freebsd_vec
 
 SRCS+=	elf64-amd64-fbsd.c elf64-target.h elf64-gen.c elf64.c
+SRCS+=	cpu-i386.c elf32-i386-fbsd.c elf32-target.h elf32.c elflink.c
 
 CLEANFILES+=	elf64-target.h
 
 elf64-target.h:	elfxx-target.h
 	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
 
+CLEANFILES+=	elf32-target.h
+
+elf32-target.h:	elfxx-target.h
+	sed -e s/NN/32/g ${.ALLSRC} > ${.TARGET}
+
 CLEANFILES+=	elf64-amd64-fbsd.c
 
 elf64-amd64-fbsd.c: ${.CURDIR}/elf-fbsd-brand.c ${SRCDIR}/bfd/elf64-x86-64.c