Module Name:    src
Committed By:   joerg
Date:           Mon Dec 19 14:06:17 UTC 2011

Modified Files:
        src/sys/arch/amd64/conf: Makefile.amd64
        src/sys/arch/i386/conf: Makefile.i386
        src/sys/arch/xen/conf: Makefile.xen
        src/sys/conf: Makefile.kern.inc

Log Message:
Move Clang-warning flags for ah_regdomain.c into sys/conf, they are
platform independent. Use the selective -Wno-* flags instead of
-Wno-error.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/amd64/conf/Makefile.amd64
cvs rdiff -u -r1.175 -r1.176 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/xen/conf/Makefile.xen
cvs rdiff -u -r1.149 -r1.150 src/sys/conf/Makefile.kern.inc

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/amd64/conf/Makefile.amd64
diff -u src/sys/arch/amd64/conf/Makefile.amd64:1.39 src/sys/arch/amd64/conf/Makefile.amd64:1.40
--- src/sys/arch/amd64/conf/Makefile.amd64:1.39	Wed Sep 14 14:59:29 2011
+++ src/sys/arch/amd64/conf/Makefile.amd64	Mon Dec 19 14:06:16 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.amd64,v 1.39 2011/09/14 14:59:29 christos Exp $
+#	$NetBSD: Makefile.amd64,v 1.40 2011/12/19 14:06:16 joerg Exp $
 
 # Makefile for NetBSD
 #
@@ -66,7 +66,6 @@ spl.o: ${AMD64}/amd64/spl.S assym.h
 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:}
-CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == "clang":?-Wno-error:}
 
 ##
 ## (5) link settings

Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.175 src/sys/arch/i386/conf/Makefile.i386:1.176
--- src/sys/arch/i386/conf/Makefile.i386:1.175	Wed Sep 14 14:58:08 2011
+++ src/sys/arch/i386/conf/Makefile.i386	Mon Dec 19 14:06:16 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.i386,v 1.175 2011/09/14 14:58:08 christos Exp $
+#	$NetBSD: Makefile.i386,v 1.176 2011/12/19 14:06:16 joerg Exp $
 
 # Makefile for NetBSD
 #
@@ -37,7 +37,6 @@ CPPFLAGS+=	-Di386
 CFLAGS+=	-mno-sse -mno-sse2 -mno-sse3
 
 AFLAGS.mptramp.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == "clang":?-Wno-error:}
 AFLAGS.spl.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 AFLAGS.lock_stubs.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 

Index: src/sys/arch/xen/conf/Makefile.xen
diff -u src/sys/arch/xen/conf/Makefile.xen:1.34 src/sys/arch/xen/conf/Makefile.xen:1.35
--- src/sys/arch/xen/conf/Makefile.xen:1.34	Wed Aug 17 21:42:16 2011
+++ src/sys/arch/xen/conf/Makefile.xen	Mon Dec 19 14:06:17 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.xen,v 1.34 2011/08/17 21:42:16 joerg Exp $
+#	$NetBSD: Makefile.xen,v 1.35 2011/12/19 14:06:17 joerg Exp $
 #	NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp 
 
 # Makefile for NetBSD
@@ -55,8 +55,6 @@ CFLAGS+=	-mno-red-zone
 ##
 KERN_AS=	obj
 
-CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == "clang":?-Wno-error:}
-
 ##
 ## (4) local objects, compile rules, and dependencies
 ##

Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.149 src/sys/conf/Makefile.kern.inc:1.150
--- src/sys/conf/Makefile.kern.inc:1.149	Sun Sep 25 22:26:33 2011
+++ src/sys/conf/Makefile.kern.inc	Mon Dec 19 14:06:17 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.149 2011/09/25 22:26:33 joerg Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.150 2011/12/19 14:06:17 joerg Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -83,6 +83,9 @@ CWARNFLAGS+=	-Wno-sign-compare
 CWARNFLAGS.clang+=	-Wno-unknown-pragmas -Wno-conversion \
 			-Wno-self-assign
 
+CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == "clang":? \
+    -Wno-shift-count-negative -Wno-shift-count-overflow:}
+
 CFLAGS+=	-ffreestanding -fno-zero-initialized-in-bss
 CFLAGS+=	${DEBUG} ${COPTS}
 AFLAGS+=	-D_LOCORE -Wa,--fatal-warnings

Reply via email to