From owner-svn-src-projects@FreeBSD.ORG  Mon Feb  6 08:40:35 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 770111065672;
	Mon,  6 Feb 2012 08:40:35 +0000 (UTC)
	(envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4B6D38FC14;
	Mon,  6 Feb 2012 08:40:35 +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 q168eZNf024369;
	Mon, 6 Feb 2012 08:40:35 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q168eZ1r024365;
	Mon, 6 Feb 2012 08:40:35 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201202060840.q168eZ1r024365@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 6 Feb 2012 08:40:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231064 - in projects/arm_eabi/lib: libc libc/quad
	libcompiler_rt
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Feb 2012 08:40:35 -0000

Author: andrew
Date: Mon Feb  6 08:40:34 2012
New Revision: 231064
URL: http://svn.freebsd.org/changeset/base/231064

Log:
  Use the compiler-rt softfloat code where possible as it includes the
  required __aeabi_* functions.

Modified:
  projects/arm_eabi/lib/libc/Makefile
  projects/arm_eabi/lib/libc/quad/Makefile.inc
  projects/arm_eabi/lib/libcompiler_rt/Makefile

Modified: projects/arm_eabi/lib/libc/Makefile
==============================================================================
--- projects/arm_eabi/lib/libc/Makefile	Mon Feb  6 08:28:44 2012	(r231063)
+++ projects/arm_eabi/lib/libc/Makefile	Mon Feb  6 08:40:34 2012	(r231064)
@@ -85,7 +85,7 @@ NOASM=
 .include "${.CURDIR}/rpc/Makefile.inc"
 .include "${.CURDIR}/uuid/Makefile.inc"
 .include "${.CURDIR}/xdr/Makefile.inc"
-.if ${LIBC_ARCH} == "arm" || ${LIBC_ARCH} == "mips"
+.if ${LIBC_ARCH} == "mips"
 .include "${.CURDIR}/softfloat/Makefile.inc"
 .endif
 .if ${MK_NIS} != "no"

Modified: projects/arm_eabi/lib/libc/quad/Makefile.inc
==============================================================================
--- projects/arm_eabi/lib/libc/quad/Makefile.inc	Mon Feb  6 08:28:44 2012	(r231063)
+++ projects/arm_eabi/lib/libc/quad/Makefile.inc	Mon Feb  6 08:40:34 2012	(r231064)
@@ -8,6 +8,10 @@
 
 SRCS+=	cmpdi2.c divdi3.c moddi3.c qdivrem.c ucmpdi2.c udivdi3.c umoddi3.c
 
+.elif ${LIBC_ARCH} == "arm"
+
+SRCS+=	adddi3.c anddi3.c floatunsdidf.c iordi3.c lshldi3.c notdi2.c \
+	qdivrem.c subdi3.c xordi3.c
 .else
 
 SRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c fixdfdi.c \

Modified: projects/arm_eabi/lib/libcompiler_rt/Makefile
==============================================================================
--- projects/arm_eabi/lib/libcompiler_rt/Makefile	Mon Feb  6 08:28:44 2012	(r231063)
+++ projects/arm_eabi/lib/libcompiler_rt/Makefile	Mon Feb  6 08:40:34 2012	(r231064)
@@ -123,7 +123,7 @@ SRCF=	absvdi2 \
 	umodti3
 
 # These are already shipped by libc.a on arm and mips
-.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
+.if ${MACHINE_CPUARCH} != "mips"
 SRCF+=	adddf3 \
 	addsf3 \
 	divdf3 \