[src/trunk]: src/sys/arch/i386/stand Disable integrated assembler for files t...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/i386/stand Disable integrated assembler for files t...
From: joerg <joerg%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 20:28:56 +0000
details:   https://anonhg.NetBSD.org/src/rev/30bf864fa951
branches:  trunk
changeset: 765185:30bf864fa951
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri May 20 22:29:55 2011 +0000

description:
Disable integrated assembler for files that use .code16 or .code32 for
now. Disable Clang completely for bootxx and netboot for now until the
size issue has been sorted out.

diffstat:

 sys/arch/i386/stand/boot/Makefile.boot       |   4 +++-
 sys/arch/i386/stand/bootxx/Makefile.bootxx   |   8 +++++++-
 sys/arch/i386/stand/cdboot/Makefile          |   4 +++-
 sys/arch/i386/stand/dosboot/Makefile         |   5 ++++-
 sys/arch/i386/stand/fatboot/Makefile.fat     |   4 +++-
 sys/arch/i386/stand/lib/Makefile             |  24 +++++++++++++++++++++++-
 sys/arch/i386/stand/netboot/Makefile.netboot |   6 +++++-
 sys/arch/i386/stand/pxeboot/Makefile         |   5 ++++-
 8 files changed, 52 insertions(+), 8 deletions(-)

diffs (160 lines):

diff -r 4687f0405834 -r 30bf864fa951 sys/arch/i386/stand/boot/Makefile.boot
--- a/sys/arch/i386/stand/boot/Makefile.boot    Fri May 20 22:22:44 2011 +0000
+++ b/sys/arch/i386/stand/boot/Makefile.boot    Fri May 20 22:29:55 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.50 2011/02/26 18:22:58 jakllsch Exp $
+# $NetBSD: Makefile.boot,v 1.51 2011/05/20 22:29:55 joerg Exp $
 
 S=     ${.CURDIR}/../../../../..
 
@@ -7,6 +7,8 @@
 NEWVERSWHAT?= "BIOS Boot"
 VERSIONFILE?= ${.CURDIR}/../version
 
+AFLAGS.biosboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+
 SOURCES?= biosboot.S boot2.c conf.c devopen.c exec.c
 SRCS= ${SOURCES}
 .if !make(depend)
diff -r 4687f0405834 -r 30bf864fa951 sys/arch/i386/stand/bootxx/Makefile.bootxx
--- a/sys/arch/i386/stand/bootxx/Makefile.bootxx        Fri May 20 22:22:44 2011 +0000
+++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx        Fri May 20 22:29:55 2011 +0000
@@ -1,7 +1,13 @@
-# $NetBSD: Makefile.bootxx,v 1.39 2010/05/27 06:58:14 dholland Exp $
+# $NetBSD: Makefile.bootxx,v 1.40 2011/05/20 22:29:55 joerg Exp $
 
 S=     ${.CURDIR}/../../../../..
 
+UNSUPPORTED_COMPILER.clang=    # defined
+
+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=
 PIE_LDFLAGS=
 PIE_AFLAGS=
diff -r 4687f0405834 -r 30bf864fa951 sys/arch/i386/stand/cdboot/Makefile
--- a/sys/arch/i386/stand/cdboot/Makefile       Fri May 20 22:22:44 2011 +0000
+++ b/sys/arch/i386/stand/cdboot/Makefile       Fri May 20 22:29:55 2011 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.11 2011/01/02 02:31:32 jakllsch Exp $
+#      $NetBSD: Makefile,v 1.12 2011/05/20 22:29:55 joerg Exp $
 
 S=             ${.CURDIR}/../../../..
 
+AFLAGS.cdboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+
 NOMAN=         # defined
 .include <bsd.own.mk>
 
diff -r 4687f0405834 -r 30bf864fa951 sys/arch/i386/stand/dosboot/Makefile
--- a/sys/arch/i386/stand/dosboot/Makefile      Fri May 20 22:22:44 2011 +0000
+++ b/sys/arch/i386/stand/dosboot/Makefile      Fri May 20 22:29:55 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.25 2009/03/30 09:22:52 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.26 2011/05/20 22:29:55 joerg Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -9,6 +9,9 @@
 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 4687f0405834 -r 30bf864fa951 sys/arch/i386/stand/fatboot/Makefile.fat
--- a/sys/arch/i386/stand/fatboot/Makefile.fat  Fri May 20 22:22:44 2011 +0000
+++ b/sys/arch/i386/stand/fatboot/Makefile.fat  Fri May 20 22:29:55 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.fat,v 1.5 2009/03/30 09:22:52 tsutsui Exp $
+#      $NetBSD: Makefile.fat,v 1.6 2011/05/20 22:29:56 joerg Exp $
 
 S=             ${.CURDIR}/../../../../..
 
@@ -10,6 +10,8 @@
 LIBCRTEND=     # nothing
 LIBC=          # nothing
 
+AFLAGS.fatboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+
 PIE_CFLAGS=
 PIE_LDFLAGS=
 PIE_AFLAGS=
diff -r 4687f0405834 -r 30bf864fa951 sys/arch/i386/stand/lib/Makefile
--- a/sys/arch/i386/stand/lib/Makefile  Fri May 20 22:22:44 2011 +0000
+++ b/sys/arch/i386/stand/lib/Makefile  Fri May 20 22:29:55 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.31 2011/01/05 22:06:59 jakllsch Exp $
+#      $NetBSD: Makefile,v 1.32 2011/05/20 22:29:56 joerg Exp $
 
 S?=    ${.CURDIR}/../../../..
 
@@ -11,6 +11,28 @@
 I386_INCLUDE_BUS?= no
 I386_INCLUDE_PS2?= yes
 
+AFLAGS.biosdelay.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.biosgetrtc.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.biosgetsystime.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.biosmca.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.biosmemps2.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.biosmem.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.biosmemx.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.biosreboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.biosvbe.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.biosvideomode.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.bios_disk.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.bios_pci.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.comio.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.conio.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.dos_file.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.dump_eax.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.message.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.message32.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.pvcopy.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.putstr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+AFLAGS.realprot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+
 CPPFLAGS= -I$S/lib/libsa ${I386CPPFLAGS} ${I386MISCCPPFLAGS}
 #CPPFLAGS+= -DDISK_DEBUG
 #CPPFLAGS+= -DNO_DISKLABEL
diff -r 4687f0405834 -r 30bf864fa951 sys/arch/i386/stand/netboot/Makefile.netboot
--- a/sys/arch/i386/stand/netboot/Makefile.netboot      Fri May 20 22:22:44 2011 +0000
+++ b/sys/arch/i386/stand/netboot/Makefile.netboot      Fri May 20 22:29:55 2011 +0000
@@ -1,7 +1,11 @@
-#      $NetBSD: Makefile.netboot,v 1.8 2009/03/30 09:22:52 tsutsui Exp $
+#      $NetBSD: Makefile.netboot,v 1.9 2011/05/20 22:29:56 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 4687f0405834 -r 30bf864fa951 sys/arch/i386/stand/pxeboot/Makefile
--- a/sys/arch/i386/stand/pxeboot/Makefile      Fri May 20 22:22:44 2011 +0000
+++ b/sys/arch/i386/stand/pxeboot/Makefile      Fri May 20 22:29:55 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.20 2010/01/17 17:02:47 drochner Exp $
+#      $NetBSD: Makefile,v 1.21 2011/05/20 22:29:56 joerg Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -9,6 +9,9 @@
 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
Prev by Date: [src/trunk]: src/libexec/ld.elf_so Disable use of various X86 extensions sinc...
Next by Date: [src/trunk]: src/usr.bin/error remove unused.
Previous by Thread: [src/trunk]: src/libexec/ld.elf_so Disable use of various X86 extensions sinc...
Next by Thread: [src/trunk]: src/usr.bin/error remove unused.
Indexes:
Home | Main Index | Thread Index | Old Index