diff options
| author | imp <imp@FreeBSD.org> | 2010-08-23 06:13:29 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-08-23 06:13:29 +0000 |
| commit | c6e071ef3a85d3ced4148a303f1210bb9efcd5e5 (patch) | |
| tree | dd466dcfdfc46ee58c9cffd158a8267cf4f0db43 /sys/modules/dtrace | |
| parent | 89b2d8bbb41d5ec5413bd240bfb6033899482af5 (diff) | |
| download | FreeBSD-src-c6e071ef3a85d3ced4148a303f1210bb9efcd5e5.zip FreeBSD-src-c6e071ef3a85d3ced4148a303f1210bb9efcd5e5.tar.gz | |
MFtbemd:
Use MACHINE_CPUARCH in preference to MACHINE_ARCH. The former is the
source code location of the machine, the latter the binary output. In
general, we want to use MACHINE_CPUARCH instead of MACHINE_ARCH unless
we're tesitng for a specific target. The isn't even moot for
i386/amd64 where there's momemntum towards a MACHINE_CPUARCH == x86,
although a specific cleanup for that likely would be needed...
Diffstat (limited to 'sys/modules/dtrace')
| -rw-r--r-- | sys/modules/dtrace/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/dtrace/Makefile.inc | 4 | ||||
| -rw-r--r-- | sys/modules/dtrace/dtrace/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/dtrace/fasttrap/Makefile | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 8fad00c..75d4a44 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -14,7 +14,7 @@ SUBDIR= dtmalloc \ sdt \ systrace -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SUBDIR+= fbt .endif diff --git a/sys/modules/dtrace/Makefile.inc b/sys/modules/dtrace/Makefile.inc index c35764b..db32960 100644 --- a/sys/modules/dtrace/Makefile.inc +++ b/sys/modules/dtrace/Makefile.inc @@ -5,7 +5,7 @@ IGNORE_PRAGMA= 1 load : -kldload cyclic -kldload dtrace -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" -kldload sdt -kldload lockstat -kldload fbt @@ -18,7 +18,7 @@ load : unload : -kldunload systrace -kldunload profile -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" -kldunload prototype -kldunload fbt -kldunload lockstat diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile index 08e61a9..5f10e92 100644 --- a/sys/modules/dtrace/dtrace/Makefile +++ b/sys/modules/dtrace/dtrace/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -ARCHDIR= ${MACHINE_ARCH} +ARCHDIR= ${MACHINE_CPUARCH} .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common/dtrace .PATH: ${.CURDIR}/../../../cddl/kern @@ -12,7 +12,7 @@ SRCS= dtrace.c \ dtrace_asm.S \ dtrace_subr.c -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SRCS+= dis_tables.c \ instr_size.c .endif @@ -25,7 +25,7 @@ SRCS+= assym.s # These are needed for assym.s SRCS+= opt_compat.h opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_apic.h .endif diff --git a/sys/modules/dtrace/fasttrap/Makefile b/sys/modules/dtrace/fasttrap/Makefile index 104fd9a..0af63c4 100644 --- a/sys/modules/dtrace/fasttrap/Makefile +++ b/sys/modules/dtrace/fasttrap/Makefile @@ -10,7 +10,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ -I${.CURDIR}/../../.. -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel .endif |
