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

Tidy up Makefile of cyclic and dtrace modules to support ARM

This commit is contained in:
ozaki-r 2014-03-05 06:40:45 +00:00
parent f6c17acba3
commit e5e9a71f64
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/modules/cyclic/Makefile
View File

@ -2,14 +2,26 @@
.include "../Makefile.inc"
.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/cyclic
.include <bsd.own.mk>
OSNETDIR=${NETBSDSRCDIR}/external/cddl/osnet
.if exists(${OSNETDIR}/dev/cyclic/${MACHINE:S/amd64/i386/})
ARCH=${MACHINE:S/amd64/i386/}
.elif exists(${OSNETDIR}/dev/cyclic/${MACHINE_CPU})
ARCH=${MACHINE_CPU}
.else
.error ${MACHINE} or ${MACHINE_CPU} not supported.
.endif
.PATH: ${OSNETDIR}/dev/cyclic
KMOD= cyclic
SRCS= cyclic.c
CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
-I${NETBSDSRCDIR}/external/cddl/osnet/dev/cyclic/${MACHINE:S/amd64/i386/} \
-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
CPPFLAGS+= -I${OSNETDIR}/sys \
-I${OSNETDIR}/dev/cyclic/${ARCH} \
-I${OSNETDIR}/dist/uts/common
CPPFLAGS+= -Wno-unknown-pragmas -Wno-cast-qual

26
sys/modules/dtrace/dtrace/Makefile
View File

@ -3,11 +3,21 @@
.include "../../Makefile.inc"
.include "../../Makefile.assym"
ARCHDIR= ${MACHINE}
.include <bsd.own.mk>
.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common/dtrace
.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace
.PATH: ${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace/${ARCHDIR}
OSNETDIR=${NETBSDSRCDIR}/external/cddl/osnet
.if exists(${OSNETDIR}/dev/dtrace/${MACHINE})
ARCH=${MACHINE}
.elif exists(${OSNETDIR}/dev/dtrace/${MACHINE_CPU})
ARCH=${MACHINE_CPU}
.else
.error ${MACHINE} or ${MACHINE_CPU} not supported.
.endif
.PATH: ${OSNETDIR}/dist/uts/common/dtrace
.PATH: ${OSNETDIR}/dev/dtrace
.PATH: ${OSNETDIR}/dev/dtrace/${ARCH}
KMOD= dtrace
SRCS= dtrace.c \
@ -19,10 +29,10 @@ SRCS+= dis_tables.c \
instr_size.c
.endif
CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys \
-I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace \
-I${NETBSDSRCDIR}/external/cddl/osnet/dev/dtrace/${ARCHDIR} \
-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common \
CPPFLAGS+= -I${OSNETDIR}/sys \
-I${OSNETDIR}/dev/dtrace \
-I${OSNETDIR}/dev/dtrace/${ARCH} \
-I${OSNETDIR}/dist/uts/common \
-DDIS_MEM
CPPFLAGS+= -DSMP -DDEBUG