Module Name: src
Committed By: joerg
Date: Wed Jan 29 23:37:18 UTC 2014
Modified Files:
src/common/lib/libc: Makefile.inc
src/lib/libc: Makefile
src/lib/libc/arch/arm: Makefile.inc
src/lib/libc/arch/arm/gen: Makefile.inc
src/lib/libm: Makefile
src/sys/lib/libkern: Makefile.libkern
src/sys/lib/libkern/arch/arm: Makefile.inc
Removed Files:
src/common/lib/libc/arch/arm/gen: divide.S divsi3.S modsi3.S udivsi3.S
umodsi3.S
src/sys/lib/libkern/arch/arm: clzsi2.S
Log Message:
Include compiler-rt in libc, libm and libkern.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/common/lib/libc/Makefile.inc
cvs rdiff -u -r1.4 -r0 src/common/lib/libc/arch/arm/gen/divide.S \
src/common/lib/libc/arch/arm/gen/modsi3.S \
src/common/lib/libc/arch/arm/gen/umodsi3.S
cvs rdiff -u -r1.13 -r0 src/common/lib/libc/arch/arm/gen/divsi3.S
cvs rdiff -u -r1.9 -r0 src/common/lib/libc/arch/arm/gen/udivsi3.S
cvs rdiff -u -r1.163 -r1.164 src/lib/libc/Makefile
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/arch/arm/Makefile.inc
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/arch/arm/gen/Makefile.inc
cvs rdiff -u -r1.153 -r1.154 src/lib/libm/Makefile
cvs rdiff -u -r1.30 -r1.31 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.20 -r1.21 src/sys/lib/libkern/arch/arm/Makefile.inc
cvs rdiff -u -r1.6 -r0 src/sys/lib/libkern/arch/arm/clzsi2.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/Makefile.inc
diff -u src/common/lib/libc/Makefile.inc:1.14 src/common/lib/libc/Makefile.inc:1.15
--- src/common/lib/libc/Makefile.inc:1.14 Thu Jan 16 11:43:49 2014
+++ src/common/lib/libc/Makefile.inc Wed Jan 29 23:37:18 2014
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.14 2014/01/16 11:43:49 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.15 2014/01/29 23:37:18 joerg Exp $
.include <bsd.own.mk>
COMMON_DIR:=${.PARSEDIR}
COMMON_CODEDIRS=atomic gen gmon inet md net stdlib string sys
COMMON_CODEDIRS+=hash/sha1 hash/sha2 hash/rmd160 hash/murmurhash
-.if ${HAVE_LIBGCC} != "no"
-COMMON_CODEDIRS+=quad
-.endif
.if defined(COMMON_MACHINE_ARCH) && !empty(COMMON_MACHINE_ARCH) && \
exists(${COMMON_DIR}/arch/${COMMON_MACHINE_ARCH})
Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.163 src/lib/libc/Makefile:1.164
--- src/lib/libc/Makefile:1.163 Sun Jan 19 11:36:45 2014
+++ src/lib/libc/Makefile Wed Jan 29 23:37:18 2014
@@ -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
Index: src/lib/libc/arch/arm/Makefile.inc
diff -u src/lib/libc/arch/arm/Makefile.inc:1.26 src/lib/libc/arch/arm/Makefile.inc:1.27
--- src/lib/libc/arch/arm/Makefile.inc:1.26 Fri Jan 17 22:19:46 2014
+++ src/lib/libc/arch/arm/Makefile.inc Wed Jan 29 23:37:18 2014
@@ -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>
Index: src/lib/libc/arch/arm/gen/Makefile.inc
diff -u src/lib/libc/arch/arm/gen/Makefile.inc:1.27 src/lib/libc/arch/arm/gen/Makefile.inc:1.28
--- src/lib/libc/arch/arm/gen/Makefile.inc:1.27 Fri Jan 17 22:19:46 2014
+++ src/lib/libc/arch/arm/gen/Makefile.inc Wed Jan 29 23:37:18 2014
@@ -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_ieee7
.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
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.153 src/lib/libm/Makefile:1.154
--- src/lib/libm/Makefile:1.153 Sat Jan 18 17:20:36 2014
+++ src/lib/libm/Makefile Wed Jan 29 23:37:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2014/01/18 17:20:36 skrll Exp $
+# $NetBSD: Makefile,v 1.154 2014/01/29 23:37:18 joerg Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -341,11 +341,8 @@ MLINKS+=fdim.3 fdimf.3
COPTS.compat_cabs.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-library-redeclaration :}
COPTS.compat_cabsf.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-library-redeclaration :}
-.include "${.CURDIR}/gen/Makefile.inc"
-
-.if ${HAVE_LIBGCC} == "no"
.include "${.CURDIR}/compiler_rt/Makefile.inc"
-.endif
+.include "${.CURDIR}/gen/Makefile.inc"
.include <bsd.lib.mk>
.include <bsd.subdir.mk>
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.30 src/sys/lib/libkern/Makefile.libkern:1.31
--- src/sys/lib/libkern/Makefile.libkern:1.30 Wed Jan 15 21:12:57 2014
+++ src/sys/lib/libkern/Makefile.libkern Wed Jan 29 23:37:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.30 2014/01/15 21:12:57 joerg Exp $
+# $NetBSD: Makefile.libkern,v 1.31 2014/01/29 23:37:18 joerg Exp $
#
# Variable definitions for libkern.
@@ -43,21 +43,7 @@ CPPFLAGS+= -I${KERNDIR}/../../../common/
.include "$M/Makefile.inc"
.endif
-.if ${HAVE_LIBGCC} == "no"
.include ".${PARSEDIR}/Makefile.compiler-rt"
-.else
-.if (${MACHINE_ARCH} != "alpha") && \
- (${MACHINE_ARCH} != "mips64eb" || !empty(CFLAGS:M-mabi=32)) && \
- (${MACHINE_ARCH} != "mips64el" || !empty(CFLAGS:M-mabi=32)) && \
- (${MACHINE_ARCH} != "powerpc64") && \
- (${MACHINE_ARCH} != "sparc64") && \
- (${MACHINE_ARCH} != "x86_64" || !empty(CFLAGS:M-m32))
-# Quad support
-SRCS+= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
- lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
- subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c
-.endif
-.endif
# Other stuff
SRCS+= kern_assert.c __main.c
Index: src/sys/lib/libkern/arch/arm/Makefile.inc
diff -u src/sys/lib/libkern/arch/arm/Makefile.inc:1.20 src/sys/lib/libkern/arch/arm/Makefile.inc:1.21
--- src/sys/lib/libkern/arch/arm/Makefile.inc:1.20 Tue Aug 20 21:43:03 2013
+++ src/sys/lib/libkern/arch/arm/Makefile.inc Wed Jan 29 23:37:18 2014
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.20 2013/08/20 21:43:03 matt Exp $
+# $NetBSD: Makefile.inc,v 1.21 2014/01/29 23:37:18 joerg Exp $
SRCS+= byte_swap_2.S byte_swap_4.S
SRCS+= ffs.S
-SRCS+= divsi3.S udivsi3.S divide.S clzsi2.S
SRCS+= memcmp.S memcpy.S memset.S memmove.S strcmp.S strncmp.S
-SRCS+= modsi3.S umodsi3.S
.if !empty(MACHINE_ARCH:Mearm*)
-SRCS+= __aeabi_ldivmod.S __aeabi_uldivmod.S __aeabi_lcmp.c __aeabi_ulcmp.c
SRCS+= unwind_stub.c
.endif
.if empty(MACHINE_ARCH:Mearmv7*)
