From owner-svn-src-head@FreeBSD.ORG  Mon Mar  8 19:40:31 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A821C106566B;
	Mon,  8 Mar 2010 19:40:31 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 96E488FC1D;
	Mon,  8 Mar 2010 19:40:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o28JeVe3088076;
	Mon, 8 Mar 2010 19:40:31 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o28JeVG1088074;
	Mon, 8 Mar 2010 19:40:31 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201003081940.o28JeVG1088074@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 8 Mar 2010 19:40:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204877 - head/sys/modules/acpi/acpi
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Mar 2010 19:40:31 -0000

Author: jkim
Date: Mon Mar  8 19:40:31 2010
New Revision: 204877
URL: http://svn.freebsd.org/changeset/base/204877

Log:
  Enable ACPI module build on amd64.  Although we strongly recommend building
  it into kernel, there is no need to prevent it from building at all.

Modified:
  head/sys/modules/acpi/acpi/Makefile

Modified: head/sys/modules/acpi/acpi/Makefile
==============================================================================
--- head/sys/modules/acpi/acpi/Makefile	Mon Mar  8 19:40:22 2010	(r204876)
+++ head/sys/modules/acpi/acpi/Makefile	Mon Mar  8 19:40:31 2010	(r204877)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
-.error "ACPI can only be compiled into the kernel on the amd64 and ia64 platforms"
+.if ${MACHINE_ARCH} == "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 \
@@ -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_ARCH} == "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