Module Name:    src
Committed By:   joerg
Date:           Fri May 20 13:14:58 UTC 2011

Modified Files:
        src/sys/arch/x86/acpi: Makefile.wakecode.inc

Log Message:
LLVM's assembler parser doesn't support .code32 yet, so disable it as
needed.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/acpi/Makefile.wakecode.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/acpi/Makefile.wakecode.inc
diff -u src/sys/arch/x86/acpi/Makefile.wakecode.inc:1.4 src/sys/arch/x86/acpi/Makefile.wakecode.inc:1.5
--- src/sys/arch/x86/acpi/Makefile.wakecode.inc:1.4	Sun Jan 18 13:55:31 2009
+++ src/sys/arch/x86/acpi/Makefile.wakecode.inc	Fri May 20 13:14:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.wakecode.inc,v 1.4 2009/01/18 13:55:31 hans Exp $
+# $NetBSD: Makefile.wakecode.inc,v 1.5 2011/05/20 13:14:58 joerg Exp $
 # FreeBSD: src/sys/i386/acpica/Makefile,v 1.3 2002/05/01 21:54:07 peter Exp
 
 ACPI_WAKECODE_S=	${S}/arch/${MACHINE}/acpi/acpi_wakecode.S
@@ -8,9 +8,12 @@
 			SED=${TOOL_SED:Q} \
 			${HOST_SH}
 
+AFLAGS.acpi_wakecode.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} -I${.CURDIR}
+
+
 acpi_wakecode.h: ${ACPI_WAKECODE_S} ${ACPI_GENWAKECODE}
 	${_MKTARGET_CREATE}
-	${CC} -I${.CURDIR} -c ${ACPI_WAKECODE_S}
+	${CC} ${AFLAGS.acpi_wakecode.S} -c ${ACPI_WAKECODE_S}
 	${LD} -M -Map acpi_wakecode.bin.map -z defs -nostdlib \
 	    --oformat binary -e wakeup_16 -Ttext 0 \
 	    -o acpi_wakecode.bin acpi_wakecode.o

Reply via email to