[src/trunk]: src Reduce amount of -no-integrated-as on x86 as .code16 is now ...

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

details:   https://anonhg.NetBSD.org/src/rev/9ac061a4feae
branches:  trunk
changeset: 326017:9ac061a4feae
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Jan 15 22:25:22 2014 +0000

description:
Reduce amount of -no-integrated-as on x86 as .code16 is now supported by
LLVM.

diffstat:

 doc/TODO.clang                               |  4 ++--
 sys/arch/amd64/conf/Makefile.amd64           |  6 +-----
 sys/arch/i386/conf/Makefile.i386             |  6 +-----
 sys/arch/i386/stand/bootxx/Makefile.bootxx   |  3 +--
 sys/arch/i386/stand/dosboot/Makefile         |  5 +----
 sys/arch/i386/stand/netboot/Makefile.netboot |  4 +---
 sys/arch/i386/stand/pxeboot/Makefile         |  5 +----
 sys/arch/x86/acpi/Makefile.wakecode.inc      |  4 ++--
 8 files changed, 10 insertions(+), 27 deletions(-)

diffs (142 lines):

diff -r 7aa6b49eecc8 -r 9ac061a4feae doc/TODO.clang
--- a/doc/TODO.clang    Wed Jan 15 22:24:41 2014 +0000
+++ b/doc/TODO.clang    Wed Jan 15 22:25:22 2014 +0000
@@ -1,10 +1,10 @@
-$NetBSD: TODO.clang,v 1.6 2014/01/15 21:14:54 joerg Exp $
+$NetBSD: TODO.clang,v 1.7 2014/01/15 22:25:22 joerg Exp $
 
 Hacks for the clang integration
 -------------------------------
 
 "-no-integrated-as" in src/sys/arch/amd64 and src/sys/arch/i386
-to compensate for the missing .code16 support in LLVM MC.
+to compensate for the incomplete explicit positioning support in LLVM MC.
 
 LLVM PR 18273 and -no-integrated-as as workaround:
     src/tests/libexec/ld.elf_so/helper_symver_dso1/Makefile
diff -r 7aa6b49eecc8 -r 9ac061a4feae sys/arch/amd64/conf/Makefile.amd64
--- a/sys/arch/amd64/conf/Makefile.amd64        Wed Jan 15 22:24:41 2014 +0000
+++ b/sys/arch/amd64/conf/Makefile.amd64        Wed Jan 15 22:25:22 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.amd64,v 1.41 2012/12/14 16:37:55 christos Exp $
+#      $NetBSD: Makefile.amd64,v 1.42 2014/01/15 22:25:22 joerg Exp $
 
 # Makefile for NetBSD
 #
@@ -68,10 +68,6 @@
 spl.o: ${AMD64}/amd64/spl.S assym.h
        ${NORMAL_S}
 
-AFLAGS.locore.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-AFLAGS.mptramp.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-AFLAGS.spl.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-
 ##
 ## (5) link settings
 ##
diff -r 7aa6b49eecc8 -r 9ac061a4feae sys/arch/i386/conf/Makefile.i386
--- a/sys/arch/i386/conf/Makefile.i386  Wed Jan 15 22:24:41 2014 +0000
+++ b/sys/arch/i386/conf/Makefile.i386  Wed Jan 15 22:25:22 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.i386,v 1.178 2012/10/03 18:58:31 dsl Exp $
+#      $NetBSD: Makefile.i386,v 1.179 2014/01/15 22:25:22 joerg Exp $
 
 # Makefile for NetBSD
 #
@@ -36,10 +36,6 @@
 CPPFLAGS+=     -Di386
 CFLAGS+=       -mno-sse -mno-sse2 -mno-sse3
 
-AFLAGS.mptramp.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-AFLAGS.spl.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-AFLAGS.lock_stubs.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-
 ##
 ## (3) libkern and compat
 ##
diff -r 7aa6b49eecc8 -r 9ac061a4feae sys/arch/i386/stand/bootxx/Makefile.bootxx
--- a/sys/arch/i386/stand/bootxx/Makefile.bootxx        Wed Jan 15 22:24:41 2014 +0000
+++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx        Wed Jan 15 22:25:22 2014 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.bootxx,v 1.47 2014/01/12 15:26:29 tsutsui Exp $
+# $NetBSD: Makefile.bootxx,v 1.48 2014/01/15 22:25:22 joerg Exp $
 
 S=     ${.CURDIR}/../../../../..
 
 AFLAGS.bootxx.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-AFLAGS.label.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 AFLAGS.pbr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 
 PIE_CFLAGS=
diff -r 7aa6b49eecc8 -r 9ac061a4feae sys/arch/i386/stand/dosboot/Makefile
--- a/sys/arch/i386/stand/dosboot/Makefile      Wed Jan 15 22:24:41 2014 +0000
+++ b/sys/arch/i386/stand/dosboot/Makefile      Wed Jan 15 22:25:22 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.27 2011/12/25 06:09:09 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.28 2014/01/15 22:25:22 joerg Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -9,9 +9,6 @@
 STARTFILE=     ${DOSSTART}
 RELOC=         0x100
 
-AFLAGS.dosboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-AFLAGS.start_dos.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-
 SRCS= main.c devopen.c exec.c
 
 CPPFLAGS+= -DSLOW      # for libz
diff -r 7aa6b49eecc8 -r 9ac061a4feae sys/arch/i386/stand/netboot/Makefile.netboot
--- a/sys/arch/i386/stand/netboot/Makefile.netboot      Wed Jan 15 22:24:41 2014 +0000
+++ b/sys/arch/i386/stand/netboot/Makefile.netboot      Wed Jan 15 22:25:22 2014 +0000
@@ -1,11 +1,9 @@
-#      $NetBSD: Makefile.netboot,v 1.9 2011/05/20 22:29:56 joerg Exp $
+#      $NetBSD: Makefile.netboot,v 1.10 2014/01/15 22:25:22 joerg Exp $
 
 NOMAN= # defined
 
 UNSUPPORTED_COMPILER.clang=    # defined
 
-AFLAGS.start_rom.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-
 PIE_CFLAGS=
 PIE_LDFLAGS=
 PIE_AFLAGS=
diff -r 7aa6b49eecc8 -r 9ac061a4feae sys/arch/i386/stand/pxeboot/Makefile
--- a/sys/arch/i386/stand/pxeboot/Makefile      Wed Jan 15 22:24:41 2014 +0000
+++ b/sys/arch/i386/stand/pxeboot/Makefile      Wed Jan 15 22:25:22 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.21 2011/05/20 22:29:56 joerg Exp $
+#      $NetBSD: Makefile,v 1.22 2014/01/15 22:25:22 joerg Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -9,9 +9,6 @@
 STARTFILE=     ${PXESTART}
 RELOC=         0x0
 
-AFLAGS.pxe_call.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-AFLAGS.start_pxe.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-
 .if (${BASE} != "pxeboot_ia32")
 .PATH.c: ${.CURDIR}/../pxeboot
 .PATH.S: ${.CURDIR}/../pxeboot
diff -r 7aa6b49eecc8 -r 9ac061a4feae sys/arch/x86/acpi/Makefile.wakecode.inc
--- a/sys/arch/x86/acpi/Makefile.wakecode.inc   Wed Jan 15 22:24:41 2014 +0000
+++ b/sys/arch/x86/acpi/Makefile.wakecode.inc   Wed Jan 15 22:25:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.wakecode.inc,v 1.8 2011/09/15 12:32:30 christos Exp $
+# $NetBSD: Makefile.wakecode.inc,v 1.9 2014/01/15 22:25:23 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,7 +8,7 @@
                        SED=${TOOL_SED:Q} \
                        ${HOST_SH}
 
-AFLAGS.acpi_wakecode.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:} -I${.CURDIR}
+AFLAGS.acpi_wakecode.S= -I${.CURDIR}
 
 
 acpi_wakecode.h: ${ACPI_WAKECODE_S} ${ACPI_GENWAKECODE}