svn commit: r231064 - in projects/arm_eabi/lib: libc libc/quad
libcompiler_rt
Andrew Turner
andrew at FreeBSD.org
Mon Feb 6 08:40:35 UTC 2012
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 \
More information about the svn-src-projects
mailing list