[src/trunk]: src/sys LLVM's assembler parser doesn't support .code32 yet, so ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b3326ea76b23
branches:  trunk
changeset: 765157:b3326ea76b23
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri May 20 13:11:40 2011 +0000

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

diffstat:

 sys/arch/x86/acpi/Makefile.wakecode.inc |  7 +++++--
 sys/arch/xen/conf/Makefile.xen          |  5 ++++-
 sys/modules/compat_linux32/Makefile     |  4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r 35a127b75220 -r b3326ea76b23 sys/arch/x86/acpi/Makefile.wakecode.inc
--- a/sys/arch/x86/acpi/Makefile.wakecode.inc   Fri May 20 13:08:07 2011 +0000
+++ b/sys/arch/x86/acpi/Makefile.wakecode.inc   Fri May 20 13:11:40 2011 +0000
@@ -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
diff -r 35a127b75220 -r b3326ea76b23 sys/arch/xen/conf/Makefile.xen
--- a/sys/arch/xen/conf/Makefile.xen    Fri May 20 13:08:07 2011 +0000
+++ b/sys/arch/xen/conf/Makefile.xen    Fri May 20 13:11:40 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xen,v 1.31 2011/01/12 23:12:12 joerg Exp $
+#      $NetBSD: Makefile.xen,v 1.32 2011/05/20 13:12:59 joerg Exp $
 #      NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp 
 
 # Makefile for NetBSD
@@ -55,6 +55,9 @@
 ##
 KERN_AS=       obj
 
+AFLAGS.linux32_sigcode.S+=     ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.netbsd32_sigcode.S+=    ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
diff -r 35a127b75220 -r b3326ea76b23 sys/modules/compat_linux32/Makefile
--- a/sys/modules/compat_linux32/Makefile       Fri May 20 13:08:07 2011 +0000
+++ b/sys/modules/compat_linux32/Makefile       Fri May 20 13:11:40 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2009/02/14 13:56:41 abs Exp $
+#      $NetBSD: Makefile,v 1.6 2011/05/20 13:11:40 joerg Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.assym"
@@ -8,6 +8,8 @@
 CPPFLAGS+=     -DSYSVSHM -DSYSVSEM -DSYSVMSG -DCOMPAT_LINUX
 CPPFLAGS+=     -DCOMPAT_LINUX32 -DCOMPAT_NETBSD32
 
+COPTS.linux32_sigcode.S+=      ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+
 .PATH: ${S}/compat/linux32/common
 SRCS+= linux32_dirent.c linux32_exec.c linux32_exec_elf32.c linux32_fcntl.c
 SRCS+= linux32_ioctl.c linux32_misc.c linux32_mman.c