[coreboot-gerrit] Patch set updated for coreboot: buildgcc: enable multilib on AMD64

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10497

-gerrit

commit acbf2bc6f6e79fce883ee8ed40f0e32b8dc0ad9a
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Tue Jun 9 14:59:58 2015 -0700

    buildgcc: enable multilib on AMD64
    
    Incomplete / does not work.
    
    Change-Id: Ic86a009eccfdf3e33a398bcdcc13b15c8dfc0d31
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 util/crossgcc/buildgcc | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 3bee6dc..9561154 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -379,16 +379,27 @@ build_LIBELF() {
 }
 
 build_BINUTILS() {
-	# Now build binutils
+	if [ $TARGETARCH == "x86_64-elf" ]; then
+		ADDITIONALTARGET=",i386-elf"
+	fi
 	CC="$CC" ../binutils-${BINUTILS_VERSION}/configure --prefix=$TARGETDIR \
-		--target=${TARGETARCH} --disable-werror --disable-nls \
-		--enable-lto --enable-gold --enable-plugins CFLAGS="$HOSTCFLAGS" || touch .failed
+		--target=${TARGETARCH} --enable-targets=${TARGETARCH}${ADDITIONALTARGET} \
+		--disable-werror --disable-nls --enable-lto --enable-gold \
+		--enable-plugins --enable-multilibs CFLAGS="$HOSTCFLAGS" || touch .failed
 	$MAKE $JOBS || touch .failed
 	$MAKE install DESTDIR=$DESTDIR || touch .failed
 }
 
 
 build_GCC() {
+	if [ $TARGETARCH == "x86_64-elf" ]; then
+		GCC_OPTIONS="${GCC_OPTIONS} --enable-multilib \
+			--with-arch-32=i386 -enable-targets=i386-elf,x86_64-elf \
+			--enable-multiarch --with-arch-32=i386 \
+			--with-multilib-list=m32,m64,mx32 \
+			--enable-targets=x86_64-elf,i386-elf \
+			--with-tune=generic --enable-version-specific-runtime-libs "
+	fi
 	# GCC does not honor HOSTCFLAGS at all. CFLAGS are used for
 	# both target and host object files.
 	# There's a work-around called CFLAGS_FOR_BUILD and CFLAGS_FOR_TARGET