From 316b3ac0de07fdbd5c29377fb29fbfcc348579fa Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 20 May 2011 13:11:40 +0000 Subject: [PATCH] LLVM's assembler parser doesn't support .code32 yet, so disable it as needed. --- 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(-) diff --git a/sys/arch/x86/acpi/Makefile.wakecode.inc b/sys/arch/x86/acpi/Makefile.wakecode.inc index 641088215e94..2318e7dd1d54 100644 --- a/sys/arch/x86/acpi/Makefile.wakecode.inc +++ b/sys/arch/x86/acpi/Makefile.wakecode.inc @@ -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 @@ ACPI_GENCMD= AWK=${TOOL_AWK:Q} \ 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 --git a/sys/arch/xen/conf/Makefile.xen b/sys/arch/xen/conf/Makefile.xen index 4e44d893cba8..0631e4b24185 100644 --- a/sys/arch/xen/conf/Makefile.xen +++ b/sys/arch/xen/conf/Makefile.xen @@ -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 @@ CFLAGS+= -mno-red-zone ## 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 --git a/sys/modules/compat_linux32/Makefile b/sys/modules/compat_linux32/Makefile index 8f31919c420a..9001733ff116 100644 --- a/sys/modules/compat_linux32/Makefile +++ b/sys/modules/compat_linux32/Makefile @@ -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 @@ KMOD= compat_linux32 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