Module Name: src
Committed By: joerg
Date: Sat Sep 21 22:28:12 UTC 2013
Modified Files:
src/distrib/sets/lists/comp: md.amd64 md.i386
src/external/bsd/dhcp: Makefile.inc
src/external/bsd/ipf: Makefile.inc
src/external/bsd/libevent/lib: Makefile.inc
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/include: Makefile
src/external/bsd/llvm/lib/libLLVMScalarOpts: Makefile
src/external/bsd/llvm/lib/libLLVMSupport: Makefile
src/external/bsd/llvm/lib/liblldDriver: Makefile
src/external/bsd/ntp: Makefile.inc
src/external/bsd/tcpdump/bin: Makefile
src/lib/libm: Makefile
src/sys/conf: Makefile.kern.inc
src/usr.bin/nvi: Makefile.inc
Log Message:
Update LLVM/Clang snapshot to r191105. This brings in a better detection
of unused static variables and functions. Disable this for some external
code and for ioconf.c in the kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.136 -r1.137 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcp/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ipf/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libevent/lib/Makefile.inc
cvs rdiff -u -r1.54 -r1.55 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/llvm/include/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/llvm/lib/libLLVMSupport/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/liblldDriver/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.141 -r1.142 src/lib/libm/Makefile
cvs rdiff -u -r1.161 -r1.162 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/nvi/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.198 src/distrib/sets/lists/comp/md.amd64:1.199
--- src/distrib/sets/lists/comp/md.amd64:1.198 Sun Aug 11 22:29:02 2013
+++ src/distrib/sets/lists/comp/md.amd64 Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.198 2013/08/11 22:29:02 joerg Exp $
+# $NetBSD: md.amd64,v 1.199 2013/09/21 22:28:12 joerg Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -163,6 +163,7 @@
./usr/include/clang-3.4/prfchwintrin.h comp-c-include llvm
./usr/include/clang-3.4/rdseedintrin.h comp-c-include llvm
./usr/include/clang-3.4/rtmintrin.h comp-c-include llvm
+./usr/include/clang-3.4/shaintrin.h comp-c-include llvm
./usr/include/clang-3.4/smmintrin.h comp-c-include llvm
./usr/include/clang-3.4/tmmintrin.h comp-c-include llvm
./usr/include/clang-3.4/wmmintrin.h comp-c-include llvm
Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.136 src/distrib/sets/lists/comp/md.i386:1.137
--- src/distrib/sets/lists/comp/md.i386:1.136 Sun Aug 11 22:29:02 2013
+++ src/distrib/sets/lists/comp/md.i386 Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.136 2013/08/11 22:29:02 joerg Exp $
+# $NetBSD: md.i386,v 1.137 2013/09/21 22:28:12 joerg Exp $
./usr/include/clang-3.0/avx2intrin.h comp-obsolete obsolete
./usr/include/clang-3.0/avxintrin.h comp-obsolete obsolete
./usr/include/clang-3.0/bmi2intrin.h comp-obsolete obsolete
@@ -94,6 +94,7 @@
./usr/include/clang-3.4/prfchwintrin.h comp-c-include llvm
./usr/include/clang-3.4/rdseedintrin.h comp-c-include llvm
./usr/include/clang-3.4/rtmintrin.h comp-c-include llvm
+./usr/include/clang-3.4/shaintrin.h comp-c-include llvm
./usr/include/clang-3.4/smmintrin.h comp-c-include llvm
./usr/include/clang-3.4/tmmintrin.h comp-c-include llvm
./usr/include/clang-3.4/wmmintrin.h comp-c-include llvm
Index: src/external/bsd/dhcp/Makefile.inc
diff -u src/external/bsd/dhcp/Makefile.inc:1.7 src/external/bsd/dhcp/Makefile.inc:1.8
--- src/external/bsd/dhcp/Makefile.inc:1.7 Sun Aug 11 14:42:04 2013
+++ src/external/bsd/dhcp/Makefile.inc Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2013/08/11 14:42:04 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.8 2013/09/21 22:28:12 joerg Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -7,7 +7,7 @@ WARNS?= 1 # XXX -Wshadow -Wcast-qual -Ws
USE_FORT?= yes # network client/server
CWARNFLAGS.clang+= -Wno-tautological-compare \
-Wno-conversion -Wno-constant-logical-operand \
- -Wno-format-security
+ -Wno-format-security -Wno-error=unused-const-variable
DIST:= ${.PARSEDIR}/dist
BIND:= ${.PARSEDIR}/../bind/dist
Index: src/external/bsd/ipf/Makefile.inc
diff -u src/external/bsd/ipf/Makefile.inc:1.1 src/external/bsd/ipf/Makefile.inc:1.2
--- src/external/bsd/ipf/Makefile.inc:1.1 Fri Mar 23 21:29:44 2012
+++ src/external/bsd/ipf/Makefile.inc Sat Sep 21 22:28:12 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.1 2012/03/23 21:29:44 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/09/21 22:28:12 joerg Exp $
WARNS?= 1 # XXX -Wcast-qual -Wshadow
CWARNFLAGS.clang+= -Wno-format -Wno-tautological-compare \
- -Wno-self-assign -Wno-array-bounds
+ -Wno-self-assign -Wno-array-bounds \
+ -Wno-error=unused-const-variable
.include <bsd.own.mk>
Index: src/external/bsd/libevent/lib/Makefile.inc
diff -u src/external/bsd/libevent/lib/Makefile.inc:1.1 src/external/bsd/libevent/lib/Makefile.inc:1.2
--- src/external/bsd/libevent/lib/Makefile.inc:1.1 Thu Apr 11 16:59:16 2013
+++ src/external/bsd/libevent/lib/Makefile.inc Sat Sep 21 22:28:12 2013
@@ -1,2 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2013/04/11 16:59:16 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/09/21 22:28:12 joerg Exp $
.include "../Makefile.inc"
+
+CWARNFLAGS.clang+= -Wno-error=unused-function
Index: src/external/bsd/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.54 src/external/bsd/llvm/Makefile.inc:1.55
--- src/external/bsd/llvm/Makefile.inc:1.54 Mon Sep 2 14:34:55 2013
+++ src/external/bsd/llvm/Makefile.inc Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.54 2013/09/02 14:34:55 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.55 2013/09/21 22:28:12 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
@@ -7,7 +7,7 @@ LLVM_TOPLEVEL_MK=
SVN_ROOT= http://llvm.org/svn/llvm-project
-COMMON_REVISION= 189662
+COMMON_REVISION= 191105
CLANG_REVISION= ${COMMON_REVISION}
COMPILER_RT_REVISION= ${COMMON_REVISION}
LLD_REVISION= ${COMMON_REVISION}
Index: src/external/bsd/llvm/include/Makefile
diff -u src/external/bsd/llvm/include/Makefile:1.20 src/external/bsd/llvm/include/Makefile:1.21
--- src/external/bsd/llvm/include/Makefile:1.20 Sun Jul 7 21:36:43 2013
+++ src/external/bsd/llvm/include/Makefile Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2013/07/07 21:36:43 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2013/09/21 22:28:12 joerg Exp $
.include <bsd.init.mk>
@@ -27,6 +27,7 @@ INCS= __wmmintrin_aes.h \
prfchwintrin.h \
rdseedintrin.h \
rtmintrin.h \
+ shaintrin.h \
smmintrin.h \
tmmintrin.h \
wmmintrin.h \
@@ -71,10 +72,11 @@ CLANG_TABLEGEN_OUTPUT.Attr.td= \
clang/Lex/AttrSpellings.inc|-gen-clang-attr-spelling-list \
clang/Parse/AttrExprArgs.inc|-gen-clang-attr-expr-args-list \
clang/Parse/AttrLateParsed.inc|-gen-clang-attr-late-parsed-list \
- clang/Sema/AttrTemplateInstantiate.inc|-gen-clang-attr-template-instantiate \
+ clang/Sema/AttrParsedAttrImpl.inc|-gen-clang-attr-parsed-attr-impl \
clang/Sema/AttrParsedAttrKinds.inc|-gen-clang-attr-parsed-attr-kinds \
clang/Sema/AttrParsedAttrList.inc|-gen-clang-attr-parsed-attr-list \
clang/Sema/AttrSpellingListIndex.inc|-gen-clang-attr-spelling-index \
+ clang/Sema/AttrTemplateInstantiate.inc|-gen-clang-attr-template-instantiate \
clang/Serialization/AttrPCHRead.inc|-gen-clang-attr-pch-read \
clang/Serialization/AttrPCHWrite.inc|-gen-clang-attr-pch-write
Index: src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.11 src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.12
--- src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile:1.11 Mon Sep 2 14:34:56 2013
+++ src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/09/02 14:34:56 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2013/09/21 22:28:12 joerg Exp $
LIB= LLVMScalarOpts
@@ -7,7 +7,6 @@ LIB= LLVMScalarOpts
.PATH: ${LLVM_SRCDIR}/lib/Transforms/Scalar
SRCS+= ADCE.cpp \
- BasicBlockPlacement.cpp \
CodeGenPrepare.cpp \
ConstantProp.cpp \
CorrelatedValuePropagation.cpp \
Index: src/external/bsd/llvm/lib/libLLVMSupport/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.21 src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.22
--- src/external/bsd/llvm/lib/libLLVMSupport/Makefile:1.21 Tue Sep 3 14:54:00 2013
+++ src/external/bsd/llvm/lib/libLLVMSupport/Makefile Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2013/09/03 14:54:00 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2013/09/21 22:28:12 joerg Exp $
LIB= LLVMSupport
@@ -64,6 +64,7 @@ SRCS+= APFloat.cpp \
ToolOutputFile.cpp \
Triple.cpp \
Twine.cpp \
+ Unicode.cpp \
Watchdog.cpp \
YAMLParser.cpp \
YAMLTraits.cpp \
Index: src/external/bsd/llvm/lib/liblldDriver/Makefile
diff -u src/external/bsd/llvm/lib/liblldDriver/Makefile:1.1 src/external/bsd/llvm/lib/liblldDriver/Makefile:1.2
--- src/external/bsd/llvm/lib/liblldDriver/Makefile:1.1 Mon Sep 2 14:34:57 2013
+++ src/external/bsd/llvm/lib/liblldDriver/Makefile Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/09/02 14:34:57 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/21 22:28:12 joerg Exp $
LIB= lldDriver
@@ -14,14 +14,14 @@ SRCS+= CoreDriver.cpp \
UniversalDriver.cpp \
WinLinkDriver.cpp
-TABLEGEN_SRC= CoreOptions.td DarwinOptions.td LDOptions.td WinLinkOptions.td
+TABLEGEN_SRC= CoreOptions.td DarwinLdOptions.td GnuLdOptions.td WinLinkOptions.td
TABLEGEN_OUTPUT.CoreOptions.td= \
CoreOptions.inc|-gen-opt-parser-defs
-TABLEGEN_OUTPUT.DarwinOptions.td= \
- DarwinOptions.inc|-gen-opt-parser-defs
-TABLEGEN_OUTPUT.LDOptions.td= \
- LDOptions.inc|-gen-opt-parser-defs
+TABLEGEN_OUTPUT.DarwinLdOptions.td= \
+ DarwinLdOptions.inc|-gen-opt-parser-defs
+TABLEGEN_OUTPUT.GnuLdOptions.td= \
+ GnuLdOptions.inc|-gen-opt-parser-defs
TABLEGEN_OUTPUT.WinLinkOptions.td= \
WinLinkOptions.inc|-gen-opt-parser-defs
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.11 src/external/bsd/ntp/Makefile.inc:1.12
--- src/external/bsd/ntp/Makefile.inc:1.11 Wed Feb 1 20:48:01 2012
+++ src/external/bsd/ntp/Makefile.inc Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2012/02/01 20:48:01 kardel Exp $
+# $NetBSD: Makefile.inc,v 1.12 2013/09/21 22:28:12 joerg Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -8,7 +8,8 @@ USE_FORT?= yes # network client/server
CWARNFLAGS+= -Wno-missing-noreturn
CWARNFLAGS.clang+= -Wno-unneeded-internal-declaration \
-Wno-format-security \
- -Wno-parentheses -Wno-constant-logical-operand
+ -Wno-parentheses -Wno-constant-logical-operand \
+ -Wno-error=unused-const-variable
WARNS?= 4
Index: src/external/bsd/tcpdump/bin/Makefile
diff -u src/external/bsd/tcpdump/bin/Makefile:1.8 src/external/bsd/tcpdump/bin/Makefile:1.9
--- src/external/bsd/tcpdump/bin/Makefile:1.8 Sat Apr 6 19:33:07 2013
+++ src/external/bsd/tcpdump/bin/Makefile Sat Sep 21 22:28:12 2013
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2013/04/06 19:33:07 christos Exp $
+# $NetBSD: Makefile,v 1.9 2013/09/21 22:28:12 joerg Exp $
WARNS?= 1 # XXX: need to cleanup later
-CWARNFLAGS.clang+= -Wno-constant-logical-operand
+CWARNFLAGS.clang+= -Wno-constant-logical-operand -Wno-error=unused-function
.include <bsd.own.mk>
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.141 src/lib/libm/Makefile:1.142
--- src/lib/libm/Makefile:1.141 Thu Aug 22 08:24:30 2013
+++ src/lib/libm/Makefile Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2013/08/22 08:24:30 martin Exp $
+# $NetBSD: Makefile,v 1.142 2013/09/21 22:28:12 joerg Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -320,6 +320,9 @@ MLINKS+=fdim.3 fdimf.3
.include "${.CURDIR}/complex/Makefile.inc"
.endif
+COPTS.compat_cabs.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-library-redeclaration :}
+COPTS.compat_cabsf.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-library-redeclaration :}
+
.include "${.CURDIR}/gen/Makefile.inc"
.include <bsd.lib.mk>
.include <bsd.subdir.mk>
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.161 src/sys/conf/Makefile.kern.inc:1.162
--- src/sys/conf/Makefile.kern.inc:1.161 Fri Aug 9 09:08:47 2013
+++ src/sys/conf/Makefile.kern.inc Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.161 2013/08/09 09:08:47 skrll Exp $
+# $NetBSD: Makefile.kern.inc,v 1.162 2013/09/21 22:28:12 joerg Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -89,6 +89,8 @@ CWARNFLAGS.clang+= -Wno-unknown-pragmas
CWARNFLAGS.ah_regdomain.c= ${${ACTIVE_CC} == "clang":? \
-Wno-shift-count-negative -Wno-shift-count-overflow:}
+CWARNFLAGS.ioconf.c= ${${ACTIVE_CC} == "clang":? -Wno-unused-const-variable :}
+
CFLAGS+= -ffreestanding -fno-zero-initialized-in-bss
CFLAGS+= ${DEBUG} ${COPTS}
AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
Index: src/usr.bin/nvi/Makefile.inc
diff -u src/usr.bin/nvi/Makefile.inc:1.2 src/usr.bin/nvi/Makefile.inc:1.3
--- src/usr.bin/nvi/Makefile.inc:1.2 Sun Jul 13 03:44:41 2008
+++ src/usr.bin/nvi/Makefile.inc Sat Sep 21 22:28:12 2013
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.2 2008/07/13 03:44:41 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2013/09/21 22:28:12 joerg Exp $
.include <bsd.own.mk>
DIST= ${NETBSDSRCDIR}/dist/nvi
.PATH: ${DIST}
+
+CWARNFLAGS.clang+= -Wno-error=unused-const-variable
