From owner-svn-src-head@FreeBSD.ORG  Wed Nov 17 19:54:02 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22B2A10656A9;
	Wed, 17 Nov 2010 19:54:02 +0000 (UTC)
	(envelope-from tijl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 117938FC27;
	Wed, 17 Nov 2010 19:54:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAHJs18Z002527;
	Wed, 17 Nov 2010 19:54:01 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAHJs1pt002524;
	Wed, 17 Nov 2010 19:54:01 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201011171954.oAHJs1pt002524@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Wed, 17 Nov 2010 19:54:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215439 - in head/gnu/usr.bin: binutils/ld cc/cc_tools
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Nov 2010 19:54:02 -0000

Author: tijl
Date: Wed Nov 17 19:54:01 2010
New Revision: 215439
URL: http://svn.freebsd.org/changeset/base/215439

Log:
  Let gcc and ld know where to find 32 bit libraries on amd64.
  
  Reviewed by:	arch@
  Approved by:	kib (mentor)

Modified:
  head/gnu/usr.bin/binutils/ld/Makefile.amd64
  head/gnu/usr.bin/cc/cc_tools/Makefile

Modified: head/gnu/usr.bin/binutils/ld/Makefile.amd64
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile.amd64	Wed Nov 17 19:35:56 2010	(r215438)
+++ head/gnu/usr.bin/binutils/ld/Makefile.amd64	Wed Nov 17 19:54:01 2010	(r215439)
@@ -12,7 +12,7 @@ e${NATIVE_EMULATION}.c: emulparams/${NAT
 	    ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE}
 
 X86_EMULATION=	elf_i386_fbsd
-_i386_path=	\"${TOOLS_PREFIX}/usr/lib/i386\"
+_i386_path=	\"${TOOLS_PREFIX}/usr/lib32\"
 EMS+=		${X86_EMULATION}
 .for ext in ${ELF_SCR_EXT}
 LDSCRIPTS+=	${X86_EMULATION}.${ext}

Modified: head/gnu/usr.bin/cc/cc_tools/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/cc_tools/Makefile	Wed Nov 17 19:35:56 2010	(r215438)
+++ head/gnu/usr.bin/cc/cc_tools/Makefile	Wed Nov 17 19:54:01 2010	(r215439)
@@ -307,7 +307,7 @@ GENSRCS+=	gcov-iov.h
 
 # Multilib config file
 multilib.h:
-.if ${TARGET_ARCH} == "powerpc64"
+.if ${TARGET_ARCH} == "powerpc64" || ${TARGET_ARCH} == "amd64"
 	echo 'static const char *const multilib_raw[] = { \
 	    ". !m64 !m32;", \
 	    "64:../lib m64 !m32;", \