[src/trunk]: src/lib/libc/compiler_rt Don't include bswap for ARM right now, ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c5226ad61e61
branches:  trunk
changeset: 791811:c5226ad61e61
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Dec 03 16:14:50 2013 +0000

description:
Don't include bswap for ARM right now, the routines require ARMv6.
Separate the soft-float code and don't include it in the libgcc case.

diffstat:

 lib/libc/compiler_rt/Makefile.inc |  50 ++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 24 deletions(-)

diffs (133 lines):

diff -r d3bd0eca4985 -r c5226ad61e61 lib/libc/compiler_rt/Makefile.inc
--- a/lib/libc/compiler_rt/Makefile.inc Tue Dec 03 16:13:49 2013 +0000
+++ b/lib/libc/compiler_rt/Makefile.inc Tue Dec 03 16:14:50 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2013/12/03 02:28:51 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2013/12/03 16:14:50 joerg Exp $
 
 COMPILER_RT_SRCDIR=    ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
 
@@ -35,15 +35,31 @@
 # Conflicts with soft-float
 GENERIC_SRCS+= \
        comparedf2.c \
-       comparesf2.c
+       comparesf2.c \
+       adddf3.c \
+       addsf3.c \
+       divdf3.c \
+       divsf3.c \
+       extendsfdf2.c \
+       fixdfdi.c \
+       fixdfsi.c \
+       fixdfti.c \
+       fixsfdi.c \
+       fixsfsi.c \
+       fixsfti.c \
+       floatsidf.c \
+       floatsisf.c \
+       muldf3.c \
+       mulsf3.c \
+       subdf3.c \
+       subsf3.c \
+       truncdfsf2.c
 .endif
 
 GENERIC_SRCS+= \
        absvdi2.c \
        absvsi2.c \
        absvti2.c \
-       adddf3.c \
-       addsf3.c \
        addvdi3.c \
        addvsi3.c \
        addvti3.c \
@@ -59,22 +75,13 @@
        ctzdi2.c \
        ctzsi2.c \
        ctzti2.c \
-       divdf3.c \
        divdi3.c \
        divmoddi4.c \
        divmodsi4.c \
-       divsf3.c \
        divsi3.c \
        divti3.c \
-       extendsfdf2.c \
        ffsdi2.c \
        ffsti2.c \
-       fixdfdi.c \
-       fixdfsi.c \
-       fixdfti.c \
-       fixsfdi.c \
-       fixsfsi.c \
-       fixsfti.c \
        fixunsdfdi.c \
        fixunsdfsi.c \
        fixunsdfti.c \
@@ -89,8 +96,6 @@
        floatdidf.c \
        floatdisf.c \
        floatdixf.c \
-       floatsidf.c \
-       floatsisf.c \
        floattidf.c \
        floattisf.c \
        floattixf.c \
@@ -109,12 +114,10 @@
        modsi3.c \
        modti3.c \
        muldc3.c \
-       muldf3.c \
        muldi3.c \
        mulodi4.c \
        mulosi4.c \
        muloti4.c \
-       mulsf3.c \
        multi3.c \
        mulvdi3.c \
        mulvsi3.c \
@@ -136,12 +139,9 @@
        powisf2.c \
        powitf2.c \
        powixf2.c \
-       subdf3.c \
-       subsf3.c \
        subvdi3.c \
        subvsi3.c \
        subvti3.c \
-       truncdfsf2.c \
        ucmpdi2.c \
        ucmpti2.c \
        udivdi3.c \
@@ -154,6 +154,7 @@
        umodsi3.c \
        umodti3.c
 
+.if ${HAVE_LIBGCC} == "no"
 .if ${MACHINE_ARCH} == "powerpc"
 GENERIC_SRCS+= \
        fixtfdi.c \
@@ -165,6 +166,7 @@
        gcc_qmul.c \
        gcc_qsub.c
 .endif
+.endif
 
 .if ${MACHINE_CPU} == "arm"
 .if !empty(LIBC_MACHINE_ARCH:Mearm*)
@@ -176,10 +178,10 @@
        aeabi_uidivmod.S \
        aeabi_uldivmod.S
 .endif
-
-GENERIC_SRCS+= \
-       bswapdi2.S \
-       bswapsi2.S
+# Not yet, requires ARMv6
+#GENERIC_SRCS+= \
+#      bswapdi2.S \
+#      bswapsi2.S
 .endif
 
 .for src in ${GENERIC_SRCS}