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/acpi | |
| 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/acpi')
| -rw-r--r-- | sys/modules/acpi/acpi/Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile index e37b1d9..98289b3 100644 --- a/sys/modules/acpi/acpi/Makefile +++ b/sys/modules/acpi/acpi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.if ${MACHINE_ARCH} == "ia64" +.if ${MACHINE_CPUARCH} == "ia64" .error "ACPI can only be compiled into the kernel on the ia64 platform" .endif @@ -22,7 +22,7 @@ ${.CURDIR}/../../../pci \ ${.CURDIR}/../../../dev/acpica \ ${.CURDIR}/../../../dev/acpica/Osd \ - ${.CURDIR}/../../../${MACHINE_ARCH}/acpica + ${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica KMOD= acpi @@ -98,7 +98,10 @@ SRCS+= acpi_machdep.c acpi_wakecode.h acpi_wakeup.c SRCS+= assym.s madt.c CLEANFILES+= acpi_wakecode.bin acpi_wakecode.h acpi_wakecode.o -.if ${MACHINE_ARCH} == "amd64" +SRCS+= opt_global.h + +.if ${MACHINE_CPUARCH} == "amd64" +SRCS+= acpi_switch.S opt_global.h .if !defined(KERNBUILDDIR) CFLAGS+=-DSMP .endif @@ -119,8 +122,8 @@ acpi_wakedata.h: acpi_wakecode.o echo "#define $${what} 0x$${offset}"; done > ${.TARGET} .else acpi_wakecode.h: acpi_wakecode.S assym.s - ${MAKE} -f ${.CURDIR}/../../../${MACHINE_ARCH}/acpica/Makefile \ - MAKESRCPATH=${.CURDIR}/../../../${MACHINE_ARCH}/acpica + ${MAKE} -f ${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica/Makefile \ + MAKESRCPATH=${.CURDIR}/../../../${MACHINE_CPUARCH}/acpica .endif .include <bsd.kmod.mk> |
