svn commit: r206529 - user/imp/tbemd/sys/modules/acpi/acpi

[Warner Losh]

Author: imp
Date: Mon Apr 12 23:22:32 2010
New Revision: 206529
URL: http://svn.freebsd.org/changeset/base/206529

Log:
  merge from head, part 14 of 14

Modified:
  user/imp/tbemd/sys/modules/acpi/acpi/Makefile
Directory Properties:
  user/imp/tbemd/   (props changed)

Modified: user/imp/tbemd/sys/modules/acpi/acpi/Makefile
==============================================================================
--- user/imp/tbemd/sys/modules/acpi/acpi/Makefile	Mon Apr 12 23:19:27 2010	(r206528)
+++ user/imp/tbemd/sys/modules/acpi/acpi/Makefile	Mon Apr 12 23:22:32 2010	(r206529)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "ia64"
-.error "ACPI can only be compiled into the kernel on the amd64 and ia64 platforms"
+.if ${MACHINE_CPUARCH} == "ia64"
+.error "ACPI can only be compiled into the kernel on the ia64 platform"
 .endif
 
-.if ${MACHINE} != "i386"
-.error "The ACPI module is only for i386"
+.if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
+.error "The ACPI module is only for amd64 and i386"
 .endif
 
 .PATH:	${.CURDIR}/../../../contrib/dev/acpica/debugger \
@@ -35,10 +35,10 @@ SRCS+=	dsfield.c dsinit.c dsmethod.c dsm
 SRCS+=	dsutils.c dswexec.c dswload.c dswscope.c dswstate.c
 SRCS+=	evevent.c evgpe.c evgpeblk.c evmisc.c evregion.c evrgnini.c evsci.c
 SRCS+=	evxface.c evxfevnt.c evxfregn.c
-SRCS+=	exconfig.c exconvrt.c excreate.c exdump.c exfield.c exfldio.c exmisc.c
-SRCS+=	exmutex.c exnames.c exoparg1.c exoparg2.c exoparg3.c exoparg6.c
-SRCS+=	exprep.c exregion.c exresnte.c exresolv.c exresop.c exstore.c
-SRCS+=	exstoren.c exstorob.c exsystem.c exutils.c
+SRCS+=	exconfig.c exconvrt.c excreate.c exdebug.c exdump.c exfield.c
+SRCS+=	exfldio.c exmisc.c exmutex.c exnames.c exoparg1.c exoparg2.c
+SRCS+=	exoparg3.c exoparg6.c exprep.c exregion.c exresnte.c exresolv.c
+SRCS+=	exresop.c exstore.c exstoren.c exstorob.c exsystem.c exutils.c
 SRCS+=	hwacpi.c hwgpe.c hwregs.c hwsleep.c hwtimer.c hwvalid.c hwxface.c
 SRCS+=	nsaccess.c nsalloc.c nsdump.c nseval.c nsinit.c nsload.c nsnames.c
 SRCS+=	nsobject.c nsparse.c nspredef.c nsrepair.c nsrepair2.c nssearch.c
@@ -97,9 +97,13 @@ opt_ddb.h: Makefile
 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_CPUARCH} == "amd64"
-SRCS+=	opt_global.h
+SRCS+=	acpi_switch.S opt_global.h
 CLEANFILES+=	acpi_wakedata.h
+ASM_CFLAGS=	-x assembler-with-cpp -DLOCORE ${CFLAGS}
+acpi_switch.o:	acpi_switch.S
+	${CC} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}
 .endif
 
 acpi_wakecode.h: acpi_wakecode.S assym.s