summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2019-11-11 22:44:56 +0000
committerjoerg <joerg@NetBSD.org>2019-11-11 22:44:56 +0000
commit918c74ea12c6bac6ca9bd2147337c0e4fec5010e (patch)
tree3ef5212d84042aedbd5e0629e2c7dc2de1751526 /sys
parent5578004b9757994411ac0c8b959a53c2063844d1 (diff)
Update LLVM to 10.0.0git (01f3a59fb3e2542fce74c768718f594d0debd0da)
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/arm/conf/Makefile.arm23
-rw-r--r--sys/modules/lua/Makefile4
-rw-r--r--sys/modules/radeondrm/Makefile4
3 files changed, 19 insertions, 12 deletions
diff --git a/sys/arch/arm/conf/Makefile.arm b/sys/arch/arm/conf/Makefile.arm
index d09a57e16c6..a82c72e6647 100644
--- a/sys/arch/arm/conf/Makefile.arm
+++ b/sys/arch/arm/conf/Makefile.arm
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.arm,v 1.50 2019/08/26 17:18:42 rin Exp $
+# $NetBSD: Makefile.arm,v 1.51 2019/11/11 22:45:27 joerg Exp $
# Makefile for NetBSD
#
@@ -36,15 +36,18 @@ GENASSYM_CONF= ${ARM}/arm32/genassym.cf
AFLAGS+= -x assembler-with-cpp
COPTS.arm32_kvminit.c+= -fno-stack-protector
COPTS.vfp_init.c= -mfpu=vfp
-AFLAGS.bcopyinout.S+=-marm
-AFLAGS.cpuswitch.S+=-marm -mfpu=vfp
-AFLAGS.locore.S+=-marm
-AFLAGS.fusu.S+=-marm
-AFLAGS.exception.S+=-marm
-AFLAGS.irq_dispatch.S+=-marm
-AFLAGS.blockio.S+=-marm
-AFLAGS.copystr.S+=-marm
-CFLAGS+= -mfloat-abi=soft
+CLANG_OBSOLETE_MULTI_ST= ${${ACTIVE_CC} == "clang":? -Wa,-W :}
+AFLAGS.bcopyinout.S+= -marm
+AFLAGS.blockio.S+= -marm ${CLANG_OBSOLETE_MULTI_ST}
+AFLAGS.copystr.S+= -marm
+AFLAGS.cpufunc_asm.S+= ${CLANG_OBSOLETE_MULTI_ST}
+AFLAGS.cpuswitch.S+= -marm -mfpu=vfp
+AFLAGS.exception.S+= -marm ${CLANG_OBSOLETE_MULTI_ST}
+AFLAGS.fiq_subr.S+= ${CLANG_OBSOLETE_MULTI_ST}
+AFLAGS.fusu.S+= -marm
+AFLAGS.irq_dispatch.S+= -marm ${CLANG_OBSOLETE_MULTI_ST}
+AFLAGS.locore.S+= -marm ${CLANG_OBSOLETE_MULTI_ST}
+CFLAGS+= -mfloat-abi=soft
# This files use instructions deprecated for ARMv7+, but still
# included in kernel that build with higher -mcpu=... settings.
diff --git a/sys/modules/lua/Makefile b/sys/modules/lua/Makefile
index 715c2169e5a..654f8f1c7b9 100644
--- a/sys/modules/lua/Makefile
+++ b/sys/modules/lua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/07/19 20:21:52 christos Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/11 22:45:27 joerg Exp $
.include "../Makefile.inc"
@@ -22,4 +22,6 @@ SRCS+= lauxlib.c lbaselib.c lbitlib.c lcorolib.c ldblib.c \
CPPFLAGS+= -I${S}/../external/mit/lua/dist/src \
-I${S}/sys
+CWARNFLAGS.clang+= -Wno-error=string-plus-int
+
.include <bsd.kmodule.mk>
diff --git a/sys/modules/radeondrm/Makefile b/sys/modules/radeondrm/Makefile
index 01a3760252e..94d1211c5b0 100644
--- a/sys/modules/radeondrm/Makefile
+++ b/sys/modules/radeondrm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/09/29 23:45:00 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/11 22:45:27 joerg Exp $
.include "../Makefile.inc"
@@ -27,4 +27,6 @@ WARNS= 3
COPTS.radeon_cs.c+= -Wno-error=implicit-fallthrough
.endif
+CWARNFLAGS.clang+= -Wno-error=bool-operation
+
.include <bsd.kmodule.mk>