Date: Sun, 29 Jun 2003 11:52:36 -0700 From: Peter Wemm <peter@wemm.org> To: Tinderbox <des+tinderbox@freebsd.org> Cc: current@freebsd.org Subject: Re: [-CURRENT tinderbox] failure on amd64/amd64 Message-ID: <20030629185236.AB8B92A7EA@canning.wemm.org> In-Reply-To: <200306291805.h5TI5L7v091498@cueball.rtp.FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Tinderbox wrote:
> TB --- 2003-06-29 17:28:12 - starting CURRENT tinderbox run for amd64/amd64
[..]
> >>> stage 3: cross tools
> >>> stage 4: populating /home/des/tinderbox/CURRENT/amd64/amd64/obj/amd64/vol
/vol0/users/des/tinderbox/CURRENT/amd64/amd64/src/i386/usr/include
> >>> stage 4: building libraries
> [...]
> cc -O -pipe -I/vol/vol0/users/des/tinderbox/CURRENT/amd64/amd64/src/lib/libs
mutil/../../contrib/sendmail/src -I/vol/vol0/users/des/tinderbox/CURRENT/am
d64/amd64/src/lib/libsmutil/../../contrib/sendmail/include -I. -DNEWDB -DNI
S -DMAP_REGEX -DNOT_SENDMAIL -c /vol/vol0/users/des/tinderbox/CURRENT/amd
64/amd64/src/contrib/sendmail/libsmutil/snprintf.c -o snprintf.o
> cc -O -pipe -I/vol/vol0/users/des/tinderbox/CURRENT/amd64/amd64/src/lib/libs
mutil/../../contrib/sendmail/src -I/vol/vol0/users/des/tinderbox/CURRENT/am
d64/amd64/src/lib/libsmutil/../../contrib/sendmail/include -I. -DNEWDB -DNI
S -DMAP_REGEX -DNOT_SENDMAIL -c /vol/vol0/users/des/tinderbox/CURRENT/amd
64/amd64/src/contrib/sendmail/libsmutil/cf.c -o cf.o
> building static smutil library
> ranlib libsmutil.a
> ===> lib/libstand
> cc -O -pipe -ffreestanding -Wformat -I/vol/vol0/users/des/tinderbox/CURRENT/
amd64/amd64/src/lib/libstand -m32 -I. -DBZ_NO_STDIO -DBZ_NO_COMPRESS -DHAVE
_MEMCPY -I/vol/vol0/users/des/tinderbox/CURRENT/amd64/amd64/src/lib/libstan
d/../libz -c /vol/vol0/users/des/tinderbox/CURRENT/amd64/amd64/src/lib/lib
stand/__main.c -o __main.o
> ld: unrecognised emulation mode: elf_i386_fbsd
> Supported emulations: elf_x86_64_fbsd
> *** Error code 1
In case anybody else is running into this, I am waiting on a straight
answer from David O'Brien about whether he objects to this patch or not:
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
There is a copy here: http://people.freebsd.org/~peter/binutils.diff
Cheers,
-Peter
--
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com
"All of this is for nothing if we don't go to the stars" - JMS/B5
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030629185236.AB8B92A7EA>