Module Name: src
Committed By: joerg
Date: Fri Aug 2 12:06:20 UTC 2019
Modified Files:
src/doc: TODO.clang
src/sys/arch/acorn32/stand/boot32: Makefile
src/sys/arch/acorn32/stand/nbfs: Makefile
Log Message:
Force use of GNU as for acorn32 boot code (pre-unified assembly)
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/doc/TODO.clang
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn32/stand/boot32/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/acorn32/stand/nbfs/Makefile
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.22 src/doc/TODO.clang:1.23
--- src/doc/TODO.clang:1.22 Tue May 14 19:24:09 2019
+++ src/doc/TODO.clang Fri Aug 2 12:06:20 2019
@@ -1,8 +1,11 @@
-$NetBSD: TODO.clang,v 1.22 2019/05/14 19:24:09 christos Exp $
+$NetBSD: TODO.clang,v 1.23 2019/08/02 12:06:20 joerg Exp $
Hacks for the clang integration
-------------------------------
+src/sys/arch/acorn32/stand
+ "-fno-integrated-as" is used for pre-unified ARM assembler.
+
src/sys/arch/i386/stand
"-no-integrated-as" is used to compensate
for the incomplete explicit positioning support in LLVM MC.
Index: src/sys/arch/acorn32/stand/boot32/Makefile
diff -u src/sys/arch/acorn32/stand/boot32/Makefile:1.5 src/sys/arch/acorn32/stand/boot32/Makefile:1.6
--- src/sys/arch/acorn32/stand/boot32/Makefile:1.5 Sat Apr 1 19:08:08 2006
+++ src/sys/arch/acorn32/stand/boot32/Makefile Fri Aug 2 12:06:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/04/01 19:08:08 bjh21 Exp $
+# $NetBSD: Makefile,v 1.6 2019/08/02 12:06:20 joerg Exp $
PROG= boot32
PROGSOURCE= rmheader.S rmvers.c srt0.S boot32.c start.S
@@ -17,4 +17,6 @@ rmvers.c: ${.CURDIR}/version
CLEANFILES+= rmvers.c
+AFLAGS.start.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+
.include "../Makefile.buildboot"
Index: src/sys/arch/acorn32/stand/nbfs/Makefile
diff -u src/sys/arch/acorn32/stand/nbfs/Makefile:1.3 src/sys/arch/acorn32/stand/nbfs/Makefile:1.4
--- src/sys/arch/acorn32/stand/nbfs/Makefile:1.3 Tue Jul 4 23:08:10 2006
+++ src/sys/arch/acorn32/stand/nbfs/Makefile Fri Aug 2 12:06:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/07/04 23:08:10 bjh21 Exp $
+# $NetBSD: Makefile,v 1.4 2019/08/02 12:06:20 joerg Exp $
PROG= nbfs
PROGSOURCE= rmheader.S rmvers.c nbfs.c rmalloc.c
@@ -13,4 +13,6 @@ rmvers.c: ${.CURDIR}/version
CLEANFILES+= rmvers.c
+AFLAGS.rmheader.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
+
.include "../Makefile.buildboot"
