From owner-svn-src-all@FreeBSD.ORG  Fri Jan 20 14:44:22 2012
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 523F11065670;
	Fri, 20 Jan 2012 14:44:22 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D0B48FC08;
	Fri, 20 Jan 2012 14:44:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0KEiMdG046084;
	Fri, 20 Jan 2012 14:44:22 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0KEiMC8046082;
	Fri, 20 Jan 2012 14:44:22 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <201201201444.q0KEiMC8046082@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Fri, 20 Jan 2012 14:44:22 +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: r230380 - head/lib/libc/softfloat/bits64
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, 20 Jan 2012 14:44:22 -0000

Author: das
Date: Fri Jan 20 14:44:21 2012
New Revision: 230380
URL: http://svn.freebsd.org/changeset/base/230380

Log:
  Conditionalize the __floatunsisf and __floatunsidf functions, added in
  NetBSD's rev 1.6 of this file, on !defined(SOFTFLOAT_FOR_GCC).  These
  functions are provided by libgcc, so we don't need them.  This should
  unbreak mips.

Modified:
  head/lib/libc/softfloat/bits64/softfloat.c

Modified: head/lib/libc/softfloat/bits64/softfloat.c
==============================================================================
--- head/lib/libc/softfloat/bits64/softfloat.c	Fri Jan 20 13:26:11 2012	(r230379)
+++ head/lib/libc/softfloat/bits64/softfloat.c	Fri Jan 20 14:44:21 2012	(r230380)
@@ -1126,6 +1126,7 @@ float32 int32_to_float32( int32 a )
 
 }
 
+#ifndef SOFTFLOAT_FOR_GCC /* __floatunsisf is in libgcc */
 float32 uint32_to_float32( uint32 a )
 {
     if ( a == 0 ) return 0;
@@ -1133,6 +1134,7 @@ float32 uint32_to_float32( uint32 a )
 	return normalizeRoundAndPackFloat32( 0, 0x9D, a >> 1 );
     return normalizeRoundAndPackFloat32( 0, 0x9C, a );
 }
+#endif
 
 
 /*
@@ -1158,6 +1160,7 @@ float64 int32_to_float64( int32 a )
 
 }
 
+#ifndef SOFTFLOAT_FOR_GCC /* __floatunsidf is in libgcc */
 float64 uint32_to_float64( uint32 a )
 {
     int8 shiftCount;
@@ -1168,6 +1171,7 @@ float64 uint32_to_float64( uint32 a )
     return packFloat64( 0, 0x432 - shiftCount, zSig<<shiftCount );
 
 }
+#endif
 
 #ifdef FLOATX80