Module Name: src
Committed By: joerg
Date: Wed Jan 15 20:58:09 UTC 2014
Modified Files:
src/common/lib/libc: Makefile.inc
src/lib/libc: Makefile
Log Message:
Use the quad support from compiler-rt for MKLIBGCC=no.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/common/lib/libc/Makefile.inc
cvs rdiff -u -r1.160 -r1.161 src/lib/libc/Makefile
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.12 src/common/lib/libc/Makefile.inc:1.13
--- src/common/lib/libc/Makefile.inc:1.12 Sun Jul 8 01:21:12 2012
+++ src/common/lib/libc/Makefile.inc Wed Jan 15 20:58:09 2014
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.12 2012/07/08 01:21:12 rmind Exp $
+# $NetBSD: Makefile.inc,v 1.13 2014/01/15 20:58:09 joerg Exp $
COMMON_DIR:=${.PARSEDIR}
-COMMON_CODEDIRS=atomic gen gmon inet md net quad stdlib string sys
+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.160 src/lib/libc/Makefile:1.161
--- src/lib/libc/Makefile:1.160 Mon Oct 14 16:00:17 2013
+++ src/lib/libc/Makefile Wed Jan 15 20:58:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2013/10/14 16:00:17 joerg Exp $
+# $NetBSD: Makefile,v 1.161 2014/01/15 20:58:09 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -80,7 +80,7 @@ CPPFLAGS+= -D__BUILD_LEGACY
.include "${.CURDIR}/net/Makefile.inc"
.include "${.CURDIR}/nameser/Makefile.inc"
.include "${.CURDIR}/nls/Makefile.inc"
-.if (${MACHINE_ARCH} != "alpha") && (${ARCHSUBDIR} != "sparc64")
+.if ${HAVE_LIBGCC} != "no" && ${MACHINE_ARCH} != "alpha" && ${ARCHSUBDIR} != "sparc64"
.include "${.CURDIR}/quad/Makefile.inc"
.endif
.if (${USE_LIBTRE} == "yes")
