From owner-svn-src-all@FreeBSD.ORG Thu Jan 27 14:16:12 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95244106564A; Thu, 27 Jan 2011 14:16:12 +0000 (UTC) (envelope-from jchandra@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 830D28FC12; Thu, 27 Jan 2011 14:16:12 +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 p0REGCXf019560; Thu, 27 Jan 2011 14:16:12 GMT (envelope-from jchandra@svn.freebsd.org) Received: (from jchandra@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0REGCHs019554; Thu, 27 Jan 2011 14:16:12 GMT (envelope-from jchandra@svn.freebsd.org) Message-Id: <201101271416.p0REGCHs019554@svn.freebsd.org> From: "Jayachandran C." Date: Thu, 27 Jan 2011 14:16:12 +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: r217942 - in head: gnu/lib/libgcc gnu/lib/libgomp gnu/usr.bin/binutils lib/libc usr.sbin X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jan 2011 14:16:12 -0000 Author: jchandra Date: Thu Jan 27 14:16:12 2011 New Revision: 217942 URL: http://svn.freebsd.org/changeset/base/217942 Log: Fix n32 compile. These changes are needed to fix n32 compile after the recent change of mips n32 MACHINE_ARCH to mipsn32eb/mipsn32el. Reviewed by: imp, bz (earlier version) Modified: head/gnu/lib/libgcc/Makefile head/gnu/lib/libgomp/Makefile head/gnu/usr.bin/binutils/Makefile.inc0 head/lib/libc/Makefile head/usr.sbin/Makefile.mips Modified: head/gnu/lib/libgcc/Makefile ============================================================================== --- head/gnu/lib/libgcc/Makefile Thu Jan 27 13:53:21 2011 (r217941) +++ head/gnu/lib/libgcc/Makefile Thu Jan 27 14:16:12 2011 (r217942) @@ -121,8 +121,8 @@ LIB2FUNCS_EXTRA = floatunsidf.c floatuns .if ${TARGET_CPUARCH} == mips LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c -# XXX do we need n32 here? -.if ${TARGET_ARCH:Mmips64*} != "" +# ABIs other than o32 need this +.if ${TARGET_ARCH:Mmipse[lb]} == "" LIB2FUNCS_EXTRA+= floatdidf.c fixunsdfsi.c LIB2FUNCS_EXTRA+= floatdisf.c floatundidf.c LIB2FUNCS_EXTRA+= fixsfdi.c floatundisf.c Modified: head/gnu/lib/libgomp/Makefile ============================================================================== --- head/gnu/lib/libgomp/Makefile Thu Jan 27 13:53:21 2011 (r217941) +++ head/gnu/lib/libgomp/Makefile Thu Jan 27 14:16:12 2011 (r217942) @@ -25,7 +25,7 @@ VERSION_MAP= ${SRCDIR}/libgomp.map # Target-specific OpenMP configuration .if ${MACHINE_CPUARCH} == arm || ${MACHINE_CPUARCH} == i386 || \ ${MACHINE_ARCH} == powerpc || \ - ${MACHINE_ARCH} == mipsel || ${MACHINE_ARCH} == mipseb + (${MACHINE_CPUARCH} == mips && ${MACHINE_ARCH:Mmips64*} == "") OMP_LOCK_ALIGN = 4 OMP_LOCK_KIND= 4 OMP_LOCK_SIZE= 4 Modified: head/gnu/usr.bin/binutils/Makefile.inc0 ============================================================================== --- head/gnu/usr.bin/binutils/Makefile.inc0 Thu Jan 27 13:53:21 2011 (r217941) +++ head/gnu/usr.bin/binutils/Makefile.inc0 Thu Jan 27 14:16:12 2011 (r217942) @@ -28,7 +28,7 @@ SRCDIR= ${.CURDIR}/${RELSRC} .if ${TARGET_CPUARCH} == "arm" || ${TARGET_CPUARCH} == "i386" || \ ${TARGET_ARCH} == "powerpc" || \ - ${TARGET_ARCH} == "mipsel" || ${TARGET_ARCH} == "mipseb" + (${TARGET_CPUARCH} == "mips" && ${TARGET_ARCH:Mmips64*} == "") CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=32 .else CFLAGS+= -DBFD_DEFAULT_TARGET_SIZE=64 Modified: head/lib/libc/Makefile ============================================================================== --- head/lib/libc/Makefile Thu Jan 27 13:53:21 2011 (r217941) +++ head/lib/libc/Makefile Thu Jan 27 14:16:12 2011 (r217942) @@ -68,6 +68,7 @@ NOASM= ${LIBC_ARCH} != "ia64" && \ ${LIBC_ARCH} != "powerpc64" && \ ${LIBC_ARCH} != "sparc64" && \ + ${MACHINE_ARCH:Mmipsn32*} == "" && \ ${MACHINE_ARCH:Mmips64*} == "" .include "${.CURDIR}/quad/Makefile.inc" .endif Modified: head/usr.sbin/Makefile.mips ============================================================================== --- head/usr.sbin/Makefile.mips Thu Jan 27 13:53:21 2011 (r217941) +++ head/usr.sbin/Makefile.mips Thu Jan 27 14:16:12 2011 (r217942) @@ -1,6 +1,7 @@ # $FreeBSD$ SUBDIR:= ${SUBDIR:Nsysinstall} -.if ${MACHINE_ARCH:Mmips64*} != "" +# uathload broken for n32 and n64 due to toolchain issues +.if ${MACHINE_ARCH:Mmipse[lb]} == "" SUBDIR:= ${SUBDIR:Nuathload} .endif