Module Name: src
Committed By: joerg
Date: Wed Jan 15 22:25:23 UTC 2014
Modified Files:
src/doc: TODO.clang
src/sys/arch/amd64/conf: Makefile.amd64
src/sys/arch/i386/conf: Makefile.i386
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
src/sys/arch/i386/stand/dosboot: Makefile
src/sys/arch/i386/stand/netboot: Makefile.netboot
src/sys/arch/i386/stand/pxeboot: Makefile
src/sys/arch/x86/acpi: Makefile.wakecode.inc
Log Message:
Reduce amount of -no-integrated-as on x86 as .code16 is now supported by
LLVM.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/doc/TODO.clang
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.178 -r1.179 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/stand/dosboot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/stand/netboot/Makefile.netboot
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/stand/pxeboot/Makefile
cvs rdiff -u -r1.8 -r1.9 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/doc/TODO.clang
diff -u src/doc/TODO.clang:1.6 src/doc/TODO.clang:1.7
--- src/doc/TODO.clang:1.6 Wed Jan 15 21:14:54 2014
+++ src/doc/TODO.clang Wed Jan 15 22:25:22 2014
@@ -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
Index: src/sys/arch/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.41 src/sys/arch/amd64/conf/Makefile.amd64:1.42
--- src/sys/arch/amd64/conf/Makefile.amd64:1.41 Fri Dec 14 16:37:55 2012
+++ src/sys/arch/amd64/conf/Makefile.amd64 Wed Jan 15 22:25:22 2014
@@ -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 @@ copy.o: ${AMD64}/amd64/copy.S assym.h
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
##
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.178 src/sys/arch/i386/conf/Makefile.i386:1.179
--- src/sys/arch/i386/conf/Makefile.i386:1.178 Wed Oct 3 18:58:31 2012
+++ src/sys/arch/i386/conf/Makefile.i386 Wed Jan 15 22:25:22 2014
@@ -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 @@ GENASSYM_CONF= ${I386}/i386/genassym.cf
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
##
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.47 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.48
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.47 Sun Jan 12 15:26:29 2014
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Wed Jan 15 22:25:22 2014
@@ -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=
Index: src/sys/arch/i386/stand/dosboot/Makefile
diff -u src/sys/arch/i386/stand/dosboot/Makefile:1.27 src/sys/arch/i386/stand/dosboot/Makefile:1.28
--- src/sys/arch/i386/stand/dosboot/Makefile:1.27 Sun Dec 25 06:09:09 2011
+++ src/sys/arch/i386/stand/dosboot/Makefile Wed Jan 15 22:25:22 2014
@@ -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 @@ NEWVERSWHAT= "DOS Boot"
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
Index: src/sys/arch/i386/stand/netboot/Makefile.netboot
diff -u src/sys/arch/i386/stand/netboot/Makefile.netboot:1.9 src/sys/arch/i386/stand/netboot/Makefile.netboot:1.10
--- src/sys/arch/i386/stand/netboot/Makefile.netboot:1.9 Fri May 20 22:29:56 2011
+++ src/sys/arch/i386/stand/netboot/Makefile.netboot Wed Jan 15 22:25:22 2014
@@ -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=
Index: src/sys/arch/i386/stand/pxeboot/Makefile
diff -u src/sys/arch/i386/stand/pxeboot/Makefile:1.21 src/sys/arch/i386/stand/pxeboot/Makefile:1.22
--- src/sys/arch/i386/stand/pxeboot/Makefile:1.21 Fri May 20 22:29:56 2011
+++ src/sys/arch/i386/stand/pxeboot/Makefile Wed Jan 15 22:25:22 2014
@@ -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 @@ NEWVERSWHAT= "PXE Boot"
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
Index: src/sys/arch/x86/acpi/Makefile.wakecode.inc
diff -u src/sys/arch/x86/acpi/Makefile.wakecode.inc:1.8 src/sys/arch/x86/acpi/Makefile.wakecode.inc:1.9
--- src/sys/arch/x86/acpi/Makefile.wakecode.inc:1.8 Thu Sep 15 12:32:30 2011
+++ src/sys/arch/x86/acpi/Makefile.wakecode.inc Wed Jan 15 22:25:23 2014
@@ -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 @@ ACPI_GENCMD= AWK=${TOOL_AWK:Q} \
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}
