Date: Mon, 8 Mar 2010 16:09:25 -0500 From: John Baldwin <jhb@freebsd.org> To: "Jung-uk Kim" <jkim@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r204877 - head/sys/modules/acpi/acpi Message-ID: <201003081609.25643.jhb@freebsd.org> In-Reply-To: <201003081940.o28JeVG1088074@svn.freebsd.org> References: <201003081940.o28JeVG1088074@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Monday 08 March 2010 2:40:31 pm Jung-uk Kim wrote: > 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 > -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003081609.25643.jhb>