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/linux | |
| 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/linux')
| -rw-r--r-- | sys/modules/linux/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 6474327..78f6f85 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -.if ${MACHINE_ARCH} == "amd64" +.if ${MACHINE_CPUARCH} == "amd64" SFX= 32 CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 .endif -.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux${SFX} +.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX} KMOD= linux SRCS= linux${SFX}_dummy.c linux_emul.c linux_file.c \ @@ -18,13 +18,13 @@ SRCS= linux${SFX}_dummy.c linux_emul.c linux_file.c \ # XXX: for assym.s SRCS+= opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_apic.h .endif OBJS= linux${SFX}_locore.o linux${SFX}_support.o -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_CPUARCH} == "i386" SRCS+= linux_ptrace.c imgact_linux.c opt_cpu.h .endif |
