Module Name: src
Committed By: pooka
Date: Wed Dec 10 16:55:54 UTC 2014
Modified Files:
src/lib/libc/gen: Makefile.inc
src/lib/libc/stdlib: Makefile.inc
Log Message:
Add two more Makefile conditionals required for RUMPRUN=yes
* do not build _errno.c (different thread/tls handling)
* do not build either phk- or jemalloc (different backing page allocation)
Somehow I missed these in the previous commit, but now libc built with
RUMPRUN=yes works also with rumprun-posix, so there's reasonably high
confidence that I didn't miss anything anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/lib/libc/gen/Makefile.inc
cvs rdiff -u -r1.82 -r1.83 src/lib/libc/stdlib/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/Makefile.inc
diff -u src/lib/libc/gen/Makefile.inc:1.189 src/lib/libc/gen/Makefile.inc:1.190
--- src/lib/libc/gen/Makefile.inc:1.189 Fri Sep 26 19:28:03 2014
+++ src/lib/libc/gen/Makefile.inc Wed Dec 10 16:55:54 2014
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.189 2014/09/26 19:28:03 christos Exp $
+# $NetBSD: Makefile.inc,v 1.190 2014/12/10 16:55:54 pooka Exp $
# from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
# gen sources
.PATH: ${ARCHDIR}/gen ${.CURDIR}/gen
-SRCS+= _errno.c alarm.c alphasort.c arc4random.c assert.c asysctl.c \
+.if ${RUMPRUN} != "yes"
+SRCS+= _errno.c
+.endif
+
+SRCS+= alarm.c alphasort.c arc4random.c assert.c asysctl.c \
basename.c clock.c closedir.c closefrom.c \
confstr.c ctermid.c ctype_.c daemon.c \
dehumanize_number.c devname.c dirname.c disklabel.c err.c errx.c \
Index: src/lib/libc/stdlib/Makefile.inc
diff -u src/lib/libc/stdlib/Makefile.inc:1.82 src/lib/libc/stdlib/Makefile.inc:1.83
--- src/lib/libc/stdlib/Makefile.inc:1.82 Sun Jul 20 13:34:17 2014
+++ src/lib/libc/stdlib/Makefile.inc Wed Dec 10 16:55:54 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.82 2014/07/20 13:34:17 christos Exp $
+# $NetBSD: Makefile.inc,v 1.83 2014/12/10 16:55:54 pooka Exp $
# from: @(#)Makefile.inc 8.3 (Berkeley) 2/4/95
# stdlib sources
@@ -24,11 +24,13 @@ SRCS+= div.c ldiv.c imaxdiv.c
# This might be replaced by erand48.c
SRCS+= erand48_ieee754.c
+.if ${RUMPRUN} != "yes"
.if (${USE_JEMALLOC} != "no")
SRCS+= jemalloc.c
.else
SRCS+= malloc.c
.endif
+.endif
CPPFLAGS.strtol.c+= -I${LIBCDIR}/../../common/lib/libc/stdlib
CPPFLAGS.strtoq.c+= -I${LIBCDIR}/../../common/lib/libc/stdlib
