Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
pooka 2014-12-10 16:55:54 +00:00
parent 1572824f8c
commit dc3c2e9560
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libc/gen/Makefile.inc
View File

@ -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 \

4
lib/libc/stdlib/Makefile.inc
View File

@ -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