From owner-svn-src-all@FreeBSD.ORG  Fri Jan  7 20:53:00 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 E58D3106564A;
	Fri,  7 Jan 2011 20:53:00 +0000 (UTC) (envelope-from imp@bsdimp.com)
Received: from harmony.bsdimp.com (bsdimp.com [199.45.160.85])
	by mx1.freebsd.org (Postfix) with ESMTP id A00DF8FC18;
	Fri,  7 Jan 2011 20:53:00 +0000 (UTC)
Received: from [127.0.0.1] (localhost [127.0.0.1])
	by harmony.bsdimp.com (8.14.3/8.14.1) with ESMTP id p07Kmmcs051191;
	Fri, 7 Jan 2011 13:48:48 -0700 (MST) (envelope-from imp@bsdimp.com)
Message-ID: <4D277C2E.2070300@bsdimp.com>
Date: Fri, 07 Jan 2011 13:48:46 -0700
From: Warner Losh <imp@bsdimp.com>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US;
	rv:1.9.2.12) Gecko/20101029 Thunderbird/3.1.6
MIME-Version: 1.0
To: Juli Mallett <jmallett@FreeBSD.org>
References: <201101072026.p07KQXKe064774@svn.freebsd.org>
	<AANLkTimuCCTsYczrKOewyxVOuZgnbPsy9iQUgGKtiGXb@mail.gmail.com>
In-Reply-To: <AANLkTimuCCTsYczrKOewyxVOuZgnbPsy9iQUgGKtiGXb@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org, Warner Losh <imp@FreeBSD.org>
Subject: Re: svn commit: r217123 - in head: . gnu/lib/libgcc gnu/lib/libgomp
 gnu/usr.bin/binutils gnu/usr.bin/binutils/ld
 gnu/usr.bin/binutils/libbfd
 gnu/usr.bin/cc gnu/usr.bin/gdb gnu/usr.bin/gdb/libgdb lib/li...
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jan 2011 20:53:01 -0000

On 01/07/2011 13:32, Juli Mallett wrote:
> On Fri, Jan 7, 2011 at 12:26, Warner Losh<imp@freebsd.org>  wrote:
>> --- head/gnu/lib/libgcc/Makefile        Fri Jan  7 20:07:30 2011        (r217122)
>> +++ head/gnu/lib/libgcc/Makefile        Fri Jan  7 20:26:33 2011        (r217123)
>> @@ -119,9 +119,10 @@ LIB2FUNCS_EXTRA = floatunsidf.c floatuns
>>   #      _fixsfsi _fixunssfsi _floatdidf _floatdisf
>>   .endif
>>
>> -.if ${TARGET_CPUARCH} == "mips"
>> +.if ${TARGET_CPUARCH} == mips
>>   LIB2FUNCS_EXTRA = floatunsidf.c floatunsisf.c
>> -.if defined(TARGET_ABI)&&  ${TARGET_ABI} != "o32"
>> +# XXX do we need n32 here?
>> +.if ${TARGET_ARCH:Mmips64*} != ""
> Almost certainly.  n32 fails the != o32 check.  I was careful when I
> made the TARGET_ABI changes.  There's a possibility that this was
> wrong for some reason, but I'm skeptical.

I'll update then.  It appears to work without it.
>
> ==============================================================================
>> --- head/lib/libc/Makefile      Fri Jan  7 20:07:30 2011        (r217122)
>> +++ head/lib/libc/Makefile      Fri Jan  7 20:26:33 2011        (r217123)
>> @@ -68,11 +68,7 @@ NOASM=
>>      ${LIBC_ARCH} != "ia64"&&  \
>>      ${LIBC_ARCH} != "powerpc64"&&  \
>>      ${LIBC_ARCH} != "sparc64"&&  \
>> -    ${LIBC_ARCH} != "mips"
>> -.include "${.CURDIR}/quad/Makefile.inc"
>> -.endif
>> -.if ${LIBC_ARCH} == "mips"&&  \
>> -    (!defined(TARGET_ABI) || ${TARGET_ABI} == "o32")
>> +    ${MACHINE_ARCH:Mmips64*} == ""
>>   .include "${.CURDIR}/quad/Makefile.inc"
> Here it's definitely wrong to restate !=o32 as ==n64; n32 doesn't need
> soft quads, it has 64-bit registers.

I thought sure that I'd fixed this one too.

Warner