Module Name: src
Committed By: joerg
Date: Sat Feb 27 19:26:14 UTC 2016
Modified Files:
src/sys/arch/sparc/conf: Makefile.sparc
src/sys/arch/sparc/stand: Makefile.inc
src/sys/arch/sparc64/conf: Makefile.sparc64
Log Message:
Ignore unused arguments for clang as we pass assembler flags and the
like to the preprocessor-only mode. Conditionalize GCC flags that are
not known to clang accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/sparc/conf/Makefile.sparc
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/stand/Makefile.inc
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/sparc64/conf/Makefile.sparc64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/conf/Makefile.sparc
diff -u src/sys/arch/sparc/conf/Makefile.sparc:1.93 src/sys/arch/sparc/conf/Makefile.sparc:1.94
--- src/sys/arch/sparc/conf/Makefile.sparc:1.93 Mon Aug 24 14:04:25 2015
+++ src/sys/arch/sparc/conf/Makefile.sparc Sat Feb 27 19:26:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc,v 1.93 2015/08/24 14:04:25 uebayasi Exp $
+# $NetBSD: Makefile.sparc,v 1.94 2016/02/27 19:26:13 joerg Exp $
# Makefile for NetBSD
#
@@ -33,10 +33,12 @@ GENASSYM_CONF= ${SPARC}/sparc/genassym.c
##
# work around GCC (egcs-2.91.66) bug which is liable
# to use FPU registers as temporaries:
-CFLAGS+= -mno-fpu
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -mno-fpu :}
CFLAGS+= -Wa,-Av8
+CFLAGS+= ${${ACTIVE_CC} == "clang":? -Qunused-arguments :}
AFLAGS+= -x assembler-with-cpp
AFLAGS+= -Wa,-Av8
+AFLAGS+= ${${ACTIVE_CC} == "clang":? -Qunused-arguments :}
##
## (3) libkern and compat
Index: src/sys/arch/sparc/stand/Makefile.inc
diff -u src/sys/arch/sparc/stand/Makefile.inc:1.10 src/sys/arch/sparc/stand/Makefile.inc:1.11
--- src/sys/arch/sparc/stand/Makefile.inc:1.10 Sun Dec 11 12:19:08 2005
+++ src/sys/arch/sparc/stand/Makefile.inc Sat Feb 27 19:26:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2005/12/11 12:19:08 christos Exp $
+# $NetBSD: Makefile.inc,v 1.11 2016/02/27 19:26:14 joerg Exp $
.ifndef __INCLUDED_STAND_MAKEFILE_INC
__INCLUDED_STAND_MAKEFILE_INC=
@@ -6,7 +6,7 @@ __INCLUDED_STAND_MAKEFILE_INC=
BINDIR= /usr/mdec
CPPFLAGS+= -DSTANDALONE -I.
-CFLAGS+= -msoft-float -ffreestanding
+CFLAGS+= -ffreestanding ${${ACTIVE_CC} == "gcc":? -msoft-float :}
.if ${MACHINE} == "sparc64"
CPPFLAGS+= -DSUN4U
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.80 src/sys/arch/sparc64/conf/Makefile.sparc64:1.81
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.80 Mon Aug 31 08:00:44 2015
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sat Feb 27 19:26:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.80 2015/08/31 08:00:44 martin Exp $
+# $NetBSD: Makefile.sparc64,v 1.81 2016/02/27 19:26:14 joerg Exp $
#=========================================================================
#
@@ -56,6 +56,7 @@ CPPFLAGS+= -Dsparc64 -D__sparc64__
.if ${LP64} == "yes"
# 64-bit kernels
CPPFLAGS+= -D_LP64 -Wa,-Av9a
+CPPFLAGS+= ${${ACTIVE_CC} == "clang":? -Qunused-arguments :}
AFLAGS+= -Wa,-Av9a
.if defined(PROF)
# Profiling is only supported in the medium low memory model.
@@ -69,9 +70,11 @@ CFLAGS+= ${${ACTIVE_CC} == "clang":? -mc
.else
# 32-bit kernels
CPPFLAGS+= -m32 -Wa,-Av8plusa -mcpu=ultrasparc
+CPPFLAGS+= ${${ACTIVE_CC} == "clang":? -Qunused-arguments :}
AFLAGS+= -Wa,-Av8plusa
+AFLAGS+= ${${ACTIVE_CC} == "clang":? -Qunused-arguments :}
.endif
-CFLAGS+= -mno-fpu
+CFLAGS+= ${${ACTIVE_CC} == "gcc":? -mno-fpu :}
AFLAGS+= -x assembler-with-cpp
##
