summaryrefslogtreecommitdiff
path: root/lib/libc
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2014-01-29 23:37:18 +0000
committerjoerg <joerg@NetBSD.org>2014-01-29 23:37:18 +0000
commit4185acf319eaeec8a6c7d2a0b62d0e309d8c8ebc (patch)
treedeb76a7d9af3caaa86ac277dbd714465bad07362 /lib/libc
parentc8a6eb903cf136442fb451c4ffd74d54d533fe69 (diff)
Include compiler-rt in libc, libm and libkern.
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/Makefile7
-rw-r--r--lib/libc/arch/arm/Makefile.inc8
-rw-r--r--lib/libc/arch/arm/gen/Makefile.inc8
3 files changed, 6 insertions, 17 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 7487551292a..20fae1010c1 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2014/01/19 11:36:45 apb Exp $
+# $NetBSD: Makefile,v 1.164 2014/01/29 23:37:18 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -63,9 +63,7 @@ CPPFLAGS+= -D__BUILD_LEGACY
.include "${.CURDIR}/db/Makefile.inc"
.include "${.CURDIR}/citrus/Makefile.inc"
.include "${.CURDIR}/compat-43/Makefile.inc"
-.if ${HAVE_LIBGCC} == "no"
.include "${.CURDIR}/compiler_rt/Makefile.inc"
-.endif
.include "${.CURDIR}/dlfcn/Makefile.inc"
.include "${.CURDIR}/gdtoa/Makefile.inc"
.include "${.CURDIR}/gen/Makefile.inc"
@@ -80,9 +78,6 @@ CPPFLAGS+= -D__BUILD_LEGACY
.include "${.CURDIR}/net/Makefile.inc"
.include "${.CURDIR}/nameser/Makefile.inc"
.include "${.CURDIR}/nls/Makefile.inc"
-.if ${HAVE_LIBGCC} != "no" && ${MACHINE_ARCH} != "alpha" && ${ARCHSUBDIR} != "sparc64"
-.include "${.CURDIR}/quad/Makefile.inc"
-.endif
.if (${USE_LIBTRE} == "yes")
.include "${NETBSDSRCDIR}/external/bsd/tre/Makefile.inc"
.else
diff --git a/lib/libc/arch/arm/Makefile.inc b/lib/libc/arch/arm/Makefile.inc
index be675b710a8..b3d21824b70 100644
--- a/lib/libc/arch/arm/Makefile.inc
+++ b/lib/libc/arch/arm/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2014/01/17 22:19:46 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.27 2014/01/29 23:37:18 joerg Exp $
.include <bsd.own.mk>
@@ -11,10 +11,6 @@ AFLAGS+= -marm
CPPFLAGS += -I.
.if !empty(LIBC_MACHINE_ARCH:Mearm*)
-SRCS+= __aeabi_ldivmod.S __aeabi_uldivmod.S
-SRCS+= __aeabi_lcmp.c __aeabi_ulcmp.c
-SRCS+= fixunsgen_ieee754.c fixunssfsi_ieee754.c
-SRCS+= fixunsgen64_ieee754.c fixunsdfsi_ieee754.c
SRCS+= arm_initfini.c
.endif
@@ -24,7 +20,7 @@ CPPFLAGS += -DSOFTFLOAT
# for earm, use the 64-bit softfloat
.if ${LIBC_MACHINE_ARCH} == "arm" || ${LIBC_MACHINE_ARCH} == "armeb"
SOFTFLOAT_BITS=32
-#SRCS+= floatunsidf_ieee754.c floatunsisf_ieee754.c
+SRCS+= floatunsidf_ieee754.c floatunsisf_ieee754.c
.endif
.include <softfloat/Makefile.inc>
diff --git a/lib/libc/arch/arm/gen/Makefile.inc b/lib/libc/arch/arm/gen/Makefile.inc
index 6afee175e61..9c9576b8cbd 100644
--- a/lib/libc/arch/arm/gen/Makefile.inc
+++ b/lib/libc/arch/arm/gen/Makefile.inc
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.27 2014/01/17 22:19:46 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.28 2014/01/29 23:37:18 joerg Exp $
-SRCS+= alloca.S byte_swap_2.S byte_swap_4.S bswap64.c divide.S divsi3.S \
- fabs_ieee754.c flt_rounds.c udivsi3.S
+SRCS+= alloca.S byte_swap_2.S byte_swap_4.S bswap64.c \
+ fabs_ieee754.c flt_rounds.c
CPUFLAGS.divide.S+= -marm
@@ -16,8 +16,6 @@ SRCS+= signbitf_ieee754.c signbitd_ieee754.c
.if !empty(LIBC_MACHINE_ARCH:Mearm*)
SRCS+= __aeabi_fcmpun.c __aeabi_dcmpun.c
SRCS+= __aeabi_idiv0.c __aeabi_ldiv0.c
-.else
-SRCS+= modsi3.S umodsi3.S
.endif
AFLAGS._setjmp.S= -mfpu=vfp