[BACK]Return to Makefile.rump CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / rump

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/rump/Makefile.rump between version 1.63.2.3 and 1.63.2.4

version 1.63.2.3, 2013/06/23 06:20:26 version 1.63.2.4, 2014/08/20 00:04:37
Line 1 
Line 1 
 #       $NetBSD$  #       $NetBSD$
 #  #
   
   .if !defined(_RUMP_MK)
   _RUMP_MK= #defined
   
 WARNS?=         3       # XXX: src/sys won't compile with -Wsign-compare yet  WARNS?=         3       # XXX: src/sys won't compile with -Wsign-compare yet
 NOLINT=         # kernel code  NOLINT=         # kernel code
   
 .include <bsd.own.mk>  .include <bsd.own.mk>
   
 # If RUMPKMOD is _not_ set (only on capable archs, from bsd.own.mk),  # Use NetBSD kernel ABI by default on x86 archs.  Performance-related
 # use rump ABI instead of the NetBSD kernel ABI.  # compile-time options may override this at a later date.
 .ifndef RUMPKMOD  .if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
   _RUMP_NATIVEABI= yes
   CPPFLAGS+=      -D_RUMP_NATIVE_ABI
   .else
   _RUMP_NATIVEABI= no
 CPPFLAGS:=      -I${RUMPTOP}/include ${CPPFLAGS}  CPPFLAGS:=      -I${RUMPTOP}/include ${CPPFLAGS}
 CPPFLAGS+=      -D_RUMPKERNEL  CPPFLAGS+=      -D_RUMPKERNEL -I${RUMPTOP}/librump/rumpkern
   .endif
   
   # Define baseline cpu for mips ports, required for
   # rumpcomp_sync_icache() hypercall.
   .if !empty(MACHINE_ARCH:Mmips*)
   .if !empty(MACHINE_ARCH:Mmips64*)
   CPPFLAGS+=      -DMIPS64=1
 .else  .else
 CPPFLAGS+=      -D_RUMP_NATIVE_ABI  CPPFLAGS+=      -DMIPS1=1
   .endif
 .endif  .endif
   
 CPPFLAGS+=      -DMAXUSERS=32  CPPFLAGS+=      -DMAXUSERS=32
 CPPFLAGS+=      -DCOMPAT_50=1  CPPFLAGS+=      -DCOMPAT_50=1 -DCOMPAT_60=1
   
 CPPFLAGS+=      -nostdinc  CPPFLAGS+=      -nostdinc
 CFLAGS+=        -ffreestanding -fno-strict-aliasing  CFLAGS+=        -ffreestanding -fno-strict-aliasing
Line 37  CPPFLAGS+= -I${RUMPTOP}/../arch
Line 52  CPPFLAGS+= -I${RUMPTOP}/../arch
 CPPFLAGS+=      -I${RUMPTOP}/..  CPPFLAGS+=      -I${RUMPTOP}/..
 .endif  .endif
   
 RUMP_LDSCRIPT?=yes  RUMP_LDSCRIPT?= GNU
 .if ${RUMP_LDSCRIPT} != "no"  .if ${RUMP_LDSCRIPT} != "no"
 # my ld or yours?  # my ld or yours?
 .ifdef HAVE_SUN_LD  .if ${RUMP_LDSCRIPT} == "sun"
 LDFLAGS+=       -Wl,-M ${RUMPTOP}/ldscript_sun.rump  LDFLAGS+=       -Wl,-M ${RUMPTOP}/ldscript_sun.rump
 SRCS+=          linksyms_sun.c  SRCS+=          linksyms_sun.c
 .PATH:          ${RUMPTOP}  .PATH:          ${RUMPTOP}
   .elif ${RUMP_LDSCRIPT} == "GNU"
   LDFLAGS+=       -Wl,-T,${RUMPTOP}/ldscript.rump
   .elif ${RUMP_LDSCRIPT} == "ctor"
   CPPFLAGS+=      -DRUMP_USE_CTOR
 .else  .else
 LDFLAGS+=       -Wl,-T ${RUMPTOP}/ldscript.rump  .error Unknown ldscript ${RUMP_LDSCRIPT}
   .endif
   .endif
   
   .if defined(RUMP_CURLWP)
   .if   ${RUMP_CURLWP} == "hypercall"
   CPPFLAGS+=      -DRUMP_CURLWP=RUMP_CURLWP_HYPERCALL
   .elif ${RUMP_CURLWP} == "__thread"
   CPPFLAGS+=      -DRUMP_CURLWP=RUMP_CURLWP___THREAD
   .elif ${RUMP_CURLWP} == "register"
   CPPFLAGS+=      -DRUMP_CURLWP=RUMP_CURLWP_REGISTER
   .else
   .error Unsupported curlwp scheme: ${RUMP_CURLWP}
 .endif  .endif
 .endif  .endif
   
Line 62  CPPFLAGS+= -DDEBUG
Line 93  CPPFLAGS+= -DDEBUG
 CPPFLAGS+=      -DLOCKDEBUG  CPPFLAGS+=      -DLOCKDEBUG
 .endif  .endif
   
   RUMP_KTRACE?=yes
   .if ${RUMP_KTRACE} == "yes"
   CPPFLAGS+=      -DKTRACE
   .endif
   
 # kernel libs should not get linked against libc  # kernel libs should not get linked against libc
 # XXX: actually, we would like to enable this but cannot, since it  # XXX: actually, we would like to enable this but cannot, since it
 # also leaves out libgcc, it causes problems on some platforms.  # also leaves out libgcc, it causes problems on some platforms.
Line 86  DPSRCS+= ${RUMPTOP}/Makefile.rump
Line 122  DPSRCS+= ${RUMPTOP}/Makefile.rump
 # Support for component-specific hypercalls  # Support for component-specific hypercalls
 #  #
   
   # XXX: Warning flags are not in CWARNFLAGS.  Manually add a few important ones.
   
 .ifdef RUMPCOMP_USER && !defined(RUMPTEST_BUILDSH)  .ifdef RUMPCOMP_USER
   .warning RUMPCOMP_USER is deprecated.  Use RUMPCOMP_USER_SRCS
   RUMPCOMP_USER_SRCS= rumpcomp_user.c
   .endif
   .ifdef RUMPCOMP_USER_SRCS && !defined(RUMPKERN_ONLY)
 .if empty(DESTDIR)  .if empty(DESTDIR)
 DESTDIR=/  DESTDIR=/
 .endif  .endif
 BUILDRUMP_CPPFLAGS ?= -isysroot ${DESTDIR}  BUILDRUMP_CPPFLAGS ?= -isysroot ${DESTDIR}
 rumpcomp_user.d: rumpcomp_user.c  RUMPCOMP_USER_WERROR = ${${_NOWERROR} == "no" :?-Werror:}
   .for rcusrc in ${RUMPCOMP_USER_SRCS:R}
   ${rcusrc}.d: ${rcusrc}.c
         ${_MKTARGET_CREATE}          ${_MKTARGET_CREATE}
         ${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${.ALLSRC:O:u:M*rumpcomp_user.c}          ${MKDEP} -f ${.TARGET} -- ${MKDEPFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${.ALLSRC:O:u:M*${rcusrc}.c}
   
 rumpcomp_user.o: rumpcomp_user.c  ${rcusrc}.o: ${rcusrc}.c
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${CC} -o ${.TARGET} ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*rumpcomp_user.c}          ${CC} -o ${.TARGET} ${DBG} ${CWARNFLAGS} ${RUMPCOMP_USER_WERROR} -Wall -Wmissing-prototypes ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*${rcusrc}.c}
   
 rumpcomp_user.pico: rumpcomp_user.c  ${rcusrc}.pico: ${rcusrc}.c
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${CC} -o ${.TARGET} -fPIC -DPIC ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*rumpcomp_user.c}          ${CC} -o ${.TARGET} -fPIC -DPIC ${DBG} ${CWARNFLAGS} ${RUMPCOMP_USER_WERROR} -Wall -Wmissing-prototypes ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*${rcusrc}.c}
   
 rumpcomp_user.po: rumpcomp_user.c  ${rcusrc}.po: ${rcusrc}.c
         ${_MKTARGET_COMPILE}          ${_MKTARGET_COMPILE}
         ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CPPFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*rumpcomp_user.c}          ${CC} -o ${.TARGET} ${PROFFLAGS} -pg ${DBG} ${CWARNFLAGS} ${RUMPCOMP_USER_WERROR} -Wall -Wmissing-prototypes ${BUILDRUMP_CPPFLAGS} ${BUILDRUMP_CFLAGS} ${RUMPCOMP_USER_CPPFLAGS} ${RUMPCOMP_USER_CFLAGS} -c ${.ALLSRC:O:u:M*${rcusrc}.c}
   
 RUMPCOMP_USEROBJ=rumpcomp_user.*o  RUMPOBJ_NORENAME+=${rcusrc}.o ${rcusrc}.pico ${rcusrc}.po
 SRCS+=rumpcomp_user.c  SRCS+=${rcusrc}.c
   .endfor
 .endif  .endif
   
 #  #
Line 172  __archivebuild: .USE
Line 216  __archivebuild: .USE
         ${_MKTARGET_BUILD}          ${_MKTARGET_BUILD}
         rm -f ${.TARGET}          rm -f ${.TARGET}
 .endif  .endif
         for obj in ${RUMP_SYMREN:U${.ALLSRC:N${RUMPCOMP_USEROBJ}}}; do \          for renameobj in ${RUMP_SYMREN:U${.ALLSRC:C/(${RUMPOBJ_NORENAME:ts|})//g}}; do \
                 ${NM} -go $${obj} | ${TOOL_AWK} ' \                  ${NM} -go $${renameobj} | ${TOOL_AWK} ' \
                     $$NF!~/^'${_PQ}'(rump|RUMP|__|_GLOBAL_OFFSET_TABLE'${_SYMQUIRK}')/ \                      $$NF!~/^'${_PQ}'(rump|RUMP|__|_GLOBAL_OFFSET_TABLE'${_SYMQUIRK}'${RUMP_SYM_NORENAME:D|${RUMP_SYM_NORENAME}})/ \
                       {s=$$NF;sub(/^'${_PQ}'/, "&rumpns_", s); print $$NF, s}'\                        {s=$$NF;sub(/^'${_PQ}'/, "&rumpns_", s); print $$NF, s}'\
                     | sort | uniq  > renametab.$${obj}; \                      | sort | uniq  > renametab.$${renameobj}; \
                 ${OBJCOPY} --preserve-dates --redefine-syms \                  ${OBJCOPY} --preserve-dates --redefine-syms \
                     renametab.$${obj} $${obj}; \                      renametab.$${renameobj} $${renameobj}; \
                 rm -f renametab.$${obj}; \                  rm -f renametab.$${renameobj}; \
         done          done
 .if !defined(RUMP_SYMREN)  .if !defined(RUMP_SYMREN)
         ${AR} ${_ARFL} ${.TARGET} \          ${AR} ${_ARFL} ${.TARGET} \
Line 191  _BSD_IOCONF_MK_USER_=1
Line 235  _BSD_IOCONF_MK_USER_=1
   
 .-include "${NETBSDSRCDIR}/sys/arch/${MACHINE_CPU}/include/Makefile.inc"  .-include "${NETBSDSRCDIR}/sys/arch/${MACHINE_CPU}/include/Makefile.inc"
 .-include "${NETBSDSRCDIR}/sys/arch/${MACHINE}/include/Makefile.inc"  .-include "${NETBSDSRCDIR}/sys/arch/${MACHINE}/include/Makefile.inc"
   
   .endif # _RUMP_MK

Legend:
Removed from v.1.63.2.3  
changed lines
  Added in v.1.63.2.4

CVSweb <webmaster@jp.NetBSD.org>