Module Name: src
Committed By: ozaki-r
Date: Wed Mar 5 06:40:45 UTC 2014
Modified Files:
src/sys/modules/cyclic: Makefile
src/sys/modules/dtrace/dtrace: Makefile
Log Message:
Tidy up Makefile of cyclic and dtrace modules to support ARM
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/cyclic/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/dtrace/dtrace/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/cyclic/Makefile
diff -u src/sys/modules/cyclic/Makefile:1.2 src/sys/modules/cyclic/Makefile:1.3
--- src/sys/modules/cyclic/Makefile:1.2 Fri Dec 14 15:46:51 2012
+++ src/sys/modules/cyclic/Makefile Wed Mar 5 06:40:45 2014
@@ -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
Index: src/sys/modules/dtrace/dtrace/Makefile
diff -u src/sys/modules/dtrace/dtrace/Makefile:1.3 src/sys/modules/dtrace/dtrace/Makefile:1.4
--- src/sys/modules/dtrace/dtrace/Makefile:1.3 Tue Dec 14 23:27:47 2010
+++ src/sys/modules/dtrace/dtrace/Makefile Wed Mar 5 06:40:45 2014
@@ -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
