[src/trunk]: src/lib/libc Add two more Makefile conditionals required for RUM...

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

details:   https://anonhg.NetBSD.org/src/rev/7c08e6f948c9
branches:  trunk
changeset: 334850:7c08e6f948c9
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Dec 10 16:55:54 2014 +0000

description:
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.

diffstat:

 lib/libc/gen/Makefile.inc    |  8 ++++++--
 lib/libc/stdlib/Makefile.inc |  4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 567098b013bf -r 7c08e6f948c9 lib/libc/gen/Makefile.inc
--- a/lib/libc/gen/Makefile.inc Wed Dec 10 16:54:58 2014 +0000
+++ b/lib/libc/gen/Makefile.inc Wed Dec 10 16:55:54 2014 +0000
@@ -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 \
diff -r 567098b013bf -r 7c08e6f948c9 lib/libc/stdlib/Makefile.inc
--- a/lib/libc/stdlib/Makefile.inc      Wed Dec 10 16:54:58 2014 +0000
+++ b/lib/libc/stdlib/Makefile.inc      Wed Dec 10 16:55:54 2014 +0000
@@ -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 @@
 # 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