Merge from head

39 files changed, 514 insertions, 79 deletions

diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index 4d4d2ec..c19f7b6 100644
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -12,14 +12,18 @@ SUBDIR+=bugpoint \
 	llvm-ar \
 	llvm-as \
 	llvm-bcanalyzer \
-	llvm-diff \
 	llvm-cov \
+	llvm-cxxdump \
+	llvm-diff \
 	llvm-dis \
+	llvm-dwarfdump \
 	llvm-extract \
 	llvm-link \
+	llvm-lto \
 	llvm-mc \
 	llvm-nm \
 	llvm-objdump \
+	llvm-pdbdump \
 	llvm-profdata \
 	llvm-rtdyld \
 	llvm-symbolizer \
diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile
index a8b34c3..dc520bb 100644
--- a/usr.bin/clang/bugpoint/Makefile
+++ b/usr.bin/clang/bugpoint/Makefile
@@ -17,6 +17,7 @@ SRCS=	BugDriver.cpp \
 
 TGHDRS=	Intrinsics
 LIBDEPS=llvmcodegen \
+	llvmtarget \
 	llvmobjcarcopts \
 	llvmirreader \
 	llvmbitwriter \
@@ -32,9 +33,8 @@ LIBDEPS=llvmcodegen \
 	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
-	llvmanalysis \
-	llvmtarget \
 	llvmmc \
+	llvmanalysis \
 	llvmasmparser \
 	llvmcore \
 	llvmsupport
diff --git a/usr.bin/clang/bugpoint/bugpoint.1 b/usr.bin/clang/bugpoint/bugpoint.1
index 9537d9e..0590b79 100644
--- a/usr.bin/clang/bugpoint/bugpoint.1
+++ b/usr.bin/clang/bugpoint/bugpoint.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "BUGPOINT" "1" "2015-03-14" "3.6" "LLVM"
+.TH "BUGPOINT" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 bugpoint \- automatic test case reduction tool
 .
diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk
index b0efe24..359236f 100644
--- a/usr.bin/clang/clang.prog.mk
+++ b/usr.bin/clang/clang.prog.mk
@@ -14,6 +14,9 @@ PACKAGE=	clang
 DPADD+=	${LIBNCURSESW}
 LDADD+=	-lncursesw
 
+DPADD+=	${LIBPTHREAD}
+LDADD+=	-lpthread
+
 BINDIR?= /usr/bin
 
 
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index 201e494..7ee3ad8 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -66,10 +66,8 @@ LIBDEPS=clangfrontendtool \
 	llvmirreader \
 	llvmipo \
 	llvmvectorize \
-	llvminstrumentation \
 	llvmbitwriter \
 	llvmasmparser \
-	llvmaarch64disassembler \
 	llvmaarch64codegen \
 	llvmaarch64asmparser \
 	llvmaarch64desc \
@@ -82,7 +80,6 @@ LIBDEPS=clangfrontendtool \
 	llvmarmdesc \
 	llvmarminfo \
 	llvmarminstprinter \
-	llvmmipsdisassembler \
 	llvmmipscodegen \
 	llvmmipsasmparser \
 	llvmmipsdesc \
@@ -94,25 +91,24 @@ LIBDEPS=clangfrontendtool \
 	llvmpowerpcdesc \
 	llvmpowerpcinfo \
 	llvmpowerpcinstprinter \
-	llvmsparcdisassembler \
 	llvmsparccodegen \
 	llvmsparcasmparser \
 	llvmsparcdesc \
 	llvmsparcinfo \
 	llvmsparcinstprinter \
-	llvmx86disassembler \
 	llvmx86asmparser \
 	llvmx86codegen \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
+	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile
index eef537e..75d8337 100644
--- a/usr.bin/clang/llc/Makefile
+++ b/usr.bin/clang/llc/Makefile
@@ -7,7 +7,9 @@ PROG_CXX=llc
 SRCDIR=	tools/llc
 SRCS=	llc.cpp
 
-LIBDEPS=llvmirreader \
+TGHDRS=	Intrinsics
+LIBDEPS=llvmmirparser \
+	llvmirreader \
 	llvmasmparser \
 	llvmaarch64disassembler \
 	llvmaarch64codegen \
@@ -46,13 +48,14 @@ LIBDEPS=llvmirreader \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
+	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llc/llc.1 b/usr.bin/clang/llc/llc.1
index 02c2f9e..c355eb5 100644
--- a/usr.bin/clang/llc/llc.1
+++ b/usr.bin/clang/llc/llc.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLC" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLC" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llc \- LLVM static compiler
 .
diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile
index ebb2a89..7a052a7 100644
--- a/usr.bin/clang/lldb/Makefile
+++ b/usr.bin/clang/lldb/Makefile
@@ -30,11 +30,17 @@ LLDB_LIBS=\
 	lldbHostFreeBSD \
 	lldbHostCommon \
 	lldbHostPOSIX \
+	lldbInitialization \
 	lldbInterpreter \
 	lldbSymbol \
 	lldbTarget \
 	lldbUtility \
 	\
+	lldbPluginABISysV_arm \
+	lldbPluginABISysV_arm64 \
+	lldbPluginABISysV_i386 \
+	lldbPluginABISysV_mips \
+	lldbPluginABISysV_mips64 \
 	lldbPluginABISysV_ppc \
 	lldbPluginABISysV_ppc64 \
 	lldbPluginABISysV_x86_64 \
@@ -42,6 +48,8 @@ LLDB_LIBS=\
 	lldbPluginDisassemblerLLVM \
 	lldbPluginInstructionARM \
 	lldbPluginInstructionARM64 \
+	lldbPluginInstructionMIPS \
+	lldbPluginInstructionMIPS64 \
 	lldbPluginInstrumentationRuntimeAddressSanitizer \
 	lldbPluginJITLoaderGDB \
 	lldbPluginSymbolFileDWARF \
@@ -82,13 +90,11 @@ LIBDEPS=\
 	clanganalysis \
 	clangedit \
 	clangast \
-	clangbasic \
 	clanglex \
+	clangbasic \
 	\
-	llvmmcdisassembler \
-	llvmobjcarcopts \
-	llvmprofiledata \
 	llvmoption \
+	llvmobjcarcopts \
 	llvmlinker \
 	llvmmcjit \
 	llvmruntimedyld \
@@ -96,7 +102,6 @@ LIBDEPS=\
 	llvmirreader \
 	llvmipo \
 	llvmvectorize \
-	llvminstrumentation \
 	llvmbitwriter \
 	llvmasmparser \
 	llvmaarch64disassembler \
@@ -136,21 +141,24 @@ LIBDEPS=\
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
+	llvmprofiledata \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
+	llvminstrumentation \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
 	llvmbitreader \
-	llvmcore \
+	llvmmcdisassembler \
 	llvmx86info \
 	llvmx86instprinter \
 	llvmmc \
 	llvmx86utils \
+	llvmcore \
 	llvmsupport
 
 .include "../clang.prog.mk"
diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile
index b672acf..33aa71f 100644
--- a/usr.bin/clang/lli/Makefile
+++ b/usr.bin/clang/lli/Makefile
@@ -5,10 +5,11 @@
 PROG_CXX=lli
 
 SRCDIR=	tools/lli
-SRCS=	lli.cpp \
+SRCS=	OrcLazyJIT.cpp \
 	RemoteMemoryManager.cpp \
 	RemoteTarget.cpp \
-	RemoteTargetExternal.cpp
+	RemoteTargetExternal.cpp \
+	lli.cpp
 
 LIBDEPS=llvmx86disassembler \
 	llvmx86asmparser \
@@ -28,13 +29,14 @@ LIBDEPS=llvmx86disassembler \
 	llvmprofiledata \
 	llvminstcombine \
 	llvminstrumentation \
+	llvmorcjit \
 	llvmtransformutils \
 	llvmipa \
-	llvmanalysis \
 	llvmmcjit \
+	llvmexecutionengine \
 	llvmtarget \
+	llvmanalysis \
 	llvmruntimedyld \
-	llvmexecutionengine \
 	llvmobject \
 	llvmmcparser \
 	llvmbitreader \
diff --git a/usr.bin/clang/lli/lli.1 b/usr.bin/clang/lli/lli.1
index de9e30c..9d571e9 100644
--- a/usr.bin/clang/lli/lli.1
+++ b/usr.bin/clang/lli/lli.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLI" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLI" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 lli \- directly execute programs from LLVM bitcode
 .
diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile
index 44586dc..9165773 100644
--- a/usr.bin/clang/llvm-ar/Makefile
+++ b/usr.bin/clang/llvm-ar/Makefile
@@ -7,7 +7,9 @@ PROG_CXX=llvm-ar
 SRCDIR=	tools/llvm-ar
 SRCS=	llvm-ar.cpp
 
-LIBDEPS=llvmaarch64disassembler \
+LIBDEPS=llvmlibdriver \
+	llvmoption \
+	llvmaarch64disassembler \
 	llvmaarch64codegen \
 	llvmaarch64asmparser \
 	llvmaarch64desc \
@@ -44,13 +46,14 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
+	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llvm-ar/llvm-ar.1 b/usr.bin/clang/llvm-ar/llvm-ar.1
index 729e2d4..3254954 100644
--- a/usr.bin/clang/llvm-ar/llvm-ar.1
+++ b/usr.bin/clang/llvm-ar/llvm-ar.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-AR" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-AR" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-ar \- LLVM archiver
 .
diff --git a/usr.bin/clang/llvm-as/llvm-as.1 b/usr.bin/clang/llvm-as/llvm-as.1
index bda01da..651136a 100644
--- a/usr.bin/clang/llvm-as/llvm-as.1
+++ b/usr.bin/clang/llvm-as/llvm-as.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-AS" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-AS" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-as \- LLVM assembler
 .
diff --git a/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1 b/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1
index fef510d..6d59ddd 100644
--- a/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1
+++ b/usr.bin/clang/llvm-bcanalyzer/llvm-bcanalyzer.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-BCANALYZER" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-BCANALYZER" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-bcanalyzer \- LLVM bitcode analyzer
 .
diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile
index 16834cf..f752034 100644
--- a/usr.bin/clang/llvm-cov/Makefile
+++ b/usr.bin/clang/llvm-cov/Makefile
@@ -8,7 +8,6 @@ SRCDIR=	tools/llvm-cov
 SRCS=	CodeCoverage.cpp \
 	CoverageFilters.cpp \
 	CoverageReport.cpp \
-	CoverageSummary.cpp \
 	CoverageSummaryInfo.cpp \
 	SourceCoverageView.cpp \
 	TestingSupport.cpp \
diff --git a/usr.bin/clang/llvm-cov/llvm-cov.1 b/usr.bin/clang/llvm-cov/llvm-cov.1
index c76b7ab..fdcb17a 100644
--- a/usr.bin/clang/llvm-cov/llvm-cov.1
+++ b/usr.bin/clang/llvm-cov/llvm-cov.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-COV" "1" "2015-04-01" "3.6" "LLVM"
+.TH "LLVM-COV" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-cov \- emit coverage information
 .
@@ -33,16 +33,39 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 ..
 .SH SYNOPSIS
 .sp
-\fBllvm\-cov\fP [options] SOURCEFILE
+\fBllvm\-cov\fP \fIcommand\fP [\fIargs...\fP]
 .SH DESCRIPTION
 .sp
-The \fBllvm\-cov\fP tool reads code coverage data files and displays the
-coverage information for a specified source file. It is compatible with the
-\fBgcov\fP tool from version 4.2 of \fBGCC\fP and may also be compatible with
-some later versions of \fBgcov\fP\&.
+The \fBllvm\-cov\fP tool shows code coverage information for
+programs that are instrumented to emit profile data. It can be used to
+work with \fBgcov\fP\-style coverage or with \fBclang\fP\(aqs instrumentation
+based profiling.
 .sp
-To use llvm\-cov, you must first build an instrumented version of your
-application that collects coverage data as it runs. Compile with the
+If the program is invoked with a base name of \fBgcov\fP, it will behave as if
+the \fBllvm\-cov gcov\fP command were called. Otherwise, a command should
+be provided.
+.SH COMMANDS
+.INDENT 0.0
+.IP \(bu 2
+\fI\%gcov\fP
+.IP \(bu 2
+\fI\%show\fP
+.IP \(bu 2
+\fI\%report\fP
+.UNINDENT
+.SH GCOV COMMAND
+.SS SYNOPSIS
+.sp
+\fBllvm\-cov gcov\fP [\fIoptions\fP] \fISOURCEFILE\fP
+.SS DESCRIPTION
+.sp
+The \fBllvm\-cov gcov\fP tool reads code coverage data files and displays
+the coverage information for a specified source file. It is compatible with the
+\fBgcov\fP tool from version 4.2 of \fBGCC\fP and may also be compatible with some
+later versions of \fBgcov\fP\&.
+.sp
+To use \fBllvm\-cov gcov\fP, you must first build an instrumented version
+of your application that collects coverage data as it runs. Compile with the
 \fB\-fprofile\-arcs\fP and \fB\-ftest\-coverage\fP options to add the
 instrumentation. (Alternatively, you can use the \fB\-\-coverage\fP option, which
 includes both of those other options.) You should compile with debugging
@@ -66,21 +89,21 @@ directories, the prefix from the \fBGCOV_PREFIX\fP variable is added. These
 environment variables allow you to run the instrumented program on a machine
 where the original object file directories are not accessible, but you will
 then need to copy the \fB\&.gcda\fP files back to the object file directories
-where llvm\-cov expects to find them.
+where \fBllvm\-cov gcov\fP expects to find them.
 .sp
-Once you have generated the coverage data files, run llvm\-cov for each main
-source file where you want to examine the coverage results. This should be run
-from the same directory where you previously ran the compiler. The results for
-the specified source file are written to a file named by appending a \fB\&.gcov\fP
-suffix. A separate output file is also created for each file included by the
-main source file, also with a \fB\&.gcov\fP suffix added.
+Once you have generated the coverage data files, run \fBllvm\-cov gcov\fP
+for each main source file where you want to examine the coverage results. This
+should be run from the same directory where you previously ran the
+compiler. The results for the specified source file are written to a file named
+by appending a \fB\&.gcov\fP suffix. A separate output file is also created for
+each file included by the main source file, also with a \fB\&.gcov\fP suffix added.
 .sp
-The basic content of an llvm\-cov output file is a copy of the source file with
+The basic content of an \fB\&.gcov\fP output file is a copy of the source file with
 an execution count and line number prepended to every line. The execution
 count is shown as \fB\-\fP if a line does not contain any executable code. If
 a line contains code but that code was never executed, the count is displayed
 as \fB#####\fP\&.
-.SH OPTIONS
+.SS OPTIONS
 .INDENT 0.0
 .TP
 .B \-a, \-\-all\-blocks
@@ -153,10 +176,141 @@ option.
 .B \-version
 Display the version of llvm\-cov.
 .UNINDENT
-.SH EXIT STATUS
+.SS EXIT STATUS
+.sp
+\fBllvm\-cov gcov\fP returns 1 if it cannot read input files.  Otherwise,
+it exits with zero.
+.SH SHOW COMMAND
+.SS SYNOPSIS
+.sp
+\fBllvm\-cov show\fP [\fIoptions\fP] \-instr\-profile \fIPROFILE\fP \fIBIN\fP [\fISOURCES\fP]
+.SS DESCRIPTION
+.sp
+The \fBllvm\-cov show\fP command shows line by line coverage of a binary
+\fIBIN\fP using the profile data \fIPROFILE\fP\&. It can optionally be filtered to only
+show the coverage for the files listed in \fISOURCES\fP\&.
+.sp
+To use \fBllvm\-cov show\fP, you need a program that is compiled with
+instrumentation to emit profile and coverage data. To build such a program with
+\fBclang\fP use the \fB\-fprofile\-instr\-generate\fP and \fB\-fcoverage\-mapping\fP
+flags. If linking with the \fBclang\fP driver, pass \fB\-fprofile\-instr\-generate\fP
+to the link stage to make sure the necessary runtime libraries are linked in.
+.sp
+The coverage information is stored in the built executable or library itself,
+and this is what you should pass to \fBllvm\-cov show\fP as the \fIBIN\fP
+argument. The profile data is generated by running this instrumented program
+normally. When the program exits it will write out a raw profile file,
+typically called \fBdefault.profraw\fP, which can be converted to a format that
+is suitable for the \fIPROFILE\fP argument using the \fBllvm\-profdata merge\fP
+tool.
+.SS OPTIONS
+.INDENT 0.0
+.TP
+.B \-show\-line\-counts
+Show the execution counts for each line. This is enabled by default, unless
+another \fB\-show\fP option is used.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-show\-expansions
+Expand inclusions, such as preprocessor macros or textual inclusions, inline
+in the display of the source file.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-show\-instantiations
+For source regions that are instantiated multiple times, such as templates in
+\fBC++\fP, show each instantiation separately as well as the combined summary.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-show\-regions
+Show the execution counts for each region by displaying a caret that points to
+the character where the region starts.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-show\-line\-counts\-or\-regions
+Show the execution counts for each line if there is only one region on the
+line, but show the individual regions if there are multiple on the line.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-use\-color[=VALUE]
+Enable or disable color output. By default this is autodetected.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-arch=<name>
+If the covered binary is a universal binary, select the architecture to use.
+It is an error to specify an architecture that is not included in the
+universal binary or to use an architecture that does not match a
+non\-universal binary.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-name=<NAME>
+Show code coverage only for functions with the given name.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-name\-regex=<PATTERN>
+Show code coverage only for functions that match the given regular expression.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-line\-coverage\-gt=<N>
+Show code coverage only for functions with line coverage greater than the
+given threshold.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-line\-coverage\-lt=<N>
+Show code coverage only for functions with line coverage less than the given
+threshold.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-region\-coverage\-gt=<N>
+Show code coverage only for functions with region coverage greater than the
+given threshold.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-region\-coverage\-lt=<N>
+Show code coverage only for functions with region coverage less than the given
+threshold.
+.UNINDENT
+.SH REPORT COMMAND
+.SS SYNOPSIS
+.sp
+\fBllvm\-cov report\fP [\fIoptions\fP] \-instr\-profile \fIPROFILE\fP \fIBIN\fP [\fISOURCES\fP]
+.SS DESCRIPTION
+.sp
+The \fBllvm\-cov report\fP command displays a summary of the coverage of a
+binary \fIBIN\fP using the profile data \fIPROFILE\fP\&. It can optionally be filtered to
+only show the coverage for the files listed in \fISOURCES\fP\&.
 .sp
-\fBllvm\-cov\fP returns 1 if it cannot read input files.  Otherwise, it
-exits with zero.
+If no source files are provided, a summary line is printed for each file in the
+coverage data. If any files are provided, summaries are shown for each function
+in the listed files instead.
+.sp
+For information on compiling programs for coverage and generating profile data,
+see \fI\%SHOW COMMAND\fP\&.
+.SS OPTIONS
+.INDENT 0.0
+.TP
+.B \-use\-color[=VALUE]
+Enable or disable color output. By default this is autodetected.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-arch=<name>
+If the covered binary is a universal binary, select the architecture to use.
+It is an error to specify an architecture that is not included in the
+universal binary or to use an architecture that does not match a
+non\-universal binary.
+.UNINDENT
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
diff --git a/usr.bin/clang/llvm-cxxdump/Makefile b/usr.bin/clang/llvm-cxxdump/Makefile
new file mode 100644
index 0000000..34af239
--- /dev/null
+++ b/usr.bin/clang/llvm-cxxdump/Makefile
@@ -0,0 +1,72 @@
+# $FreeBSD$
+
+MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=llvm-cxxdump
+
+SRCDIR=	tools/llvm-cxxdump
+SRCS=	Error.cpp \
+	llvm-cxxdump.cpp
+
+LIBDEPS=llvmaarch64disassembler \
+	llvmaarch64codegen \
+	llvmaarch64asmparser \
+	llvmaarch64desc \
+	llvmaarch64info \
+	llvmaarch64instprinter \
+	llvmaarch64utils \
+	llvmarmdisassembler \
+	llvmarmcodegen \
+	llvmarmasmparser \
+	llvmarmdesc \
+	llvmarminfo \
+	llvmarminstprinter \
+	llvmmipsdisassembler \
+	llvmmipscodegen \
+	llvmmipsasmparser \
+	llvmmipsdesc \
+	llvmmipsinfo \
+	llvmmipsinstprinter \
+	llvmpowerpcdisassembler \
+	llvmpowerpccodegen \
+	llvmpowerpcasmparser \
+	llvmpowerpcdesc \
+	llvmpowerpcinfo \
+	llvmpowerpcinstprinter \
+	llvmsparcdisassembler \
+	llvmsparccodegen \
+	llvmsparcasmparser \
+	llvmsparcdesc \
+	llvmsparcinfo \
+	llvmsparcinstprinter \
+	llvmx86disassembler \
+	llvmx86asmparser \
+	llvmx86codegen \
+	llvmselectiondag \
+	llvmasmprinter \
+	llvmcodegen \
+	llvmtarget \
+	llvmscalaropts \
+	llvmprofiledata \
+	llvminstcombine \
+	llvminstrumentation \
+	llvmtransformutils \
+	llvmipa \
+	llvmanalysis \
+	llvmx86desc \
+	llvmmcdisassembler \
+	llvmx86info \
+	llvmx86instprinter \
+	llvmx86utils \
+	llvmobject \
+	llvmmcparser \
+	llvmmc \
+	llvmbitreader \
+	llvmcore \
+	llvmsupport
+
+.include "../clang.prog.mk"
+
+DPADD+=	${LIBZ}
+LDADD+=	-lz
diff --git a/usr.bin/clang/llvm-diff/llvm-diff.1 b/usr.bin/clang/llvm-diff/llvm-diff.1
index 0fa5a01..c15d6d8 100644
--- a/usr.bin/clang/llvm-diff/llvm-diff.1
+++ b/usr.bin/clang/llvm-diff/llvm-diff.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-DIFF" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-DIFF" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-diff \- LLVM structural 'diff'
 .
diff --git a/usr.bin/clang/llvm-dis/Makefile b/usr.bin/clang/llvm-dis/Makefile
index 18be77a..62e5b2e 100644
--- a/usr.bin/clang/llvm-dis/Makefile
+++ b/usr.bin/clang/llvm-dis/Makefile
@@ -9,8 +9,6 @@ SRCS=	llvm-dis.cpp
 
 TGHDRS=	Intrinsics
 LIBDEPS=llvmanalysis \
-	llvmtarget \
-	llvmmc \
 	llvmbitreader \
 	llvmcore \
 	llvmsupport
diff --git a/usr.bin/clang/llvm-dis/llvm-dis.1 b/usr.bin/clang/llvm-dis/llvm-dis.1
index bdf0bdb..21044fc 100644
--- a/usr.bin/clang/llvm-dis/llvm-dis.1
+++ b/usr.bin/clang/llvm-dis/llvm-dis.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-DIS" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-DIS" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-dis \- LLVM disassembler
 .
diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile
new file mode 100644
index 0000000..d27a91e
--- /dev/null
+++ b/usr.bin/clang/llvm-dwarfdump/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+PROG_CXX=llvm-dwarfdump
+
+SRCDIR=	tools/llvm-dwarfdump
+SRCS=	llvm-dwarfdump.cpp
+
+LIBDEPS=llvmdebuginfodwarf \
+	llvmobject \
+	llvmmcparser \
+	llvmmc \
+	llvmbitreader \
+	llvmcore \
+	llvmsupport
+
+.include "../clang.prog.mk"
+
+DPADD+=	${LIBZ}
+LDADD+=	-lz
diff --git a/usr.bin/clang/llvm-dwarfdump/llvm-dwarfdump.1 b/usr.bin/clang/llvm-dwarfdump/llvm-dwarfdump.1
new file mode 100644
index 0000000..cb6cf64
--- /dev/null
+++ b/usr.bin/clang/llvm-dwarfdump/llvm-dwarfdump.1
@@ -0,0 +1,60 @@
+.\" $FreeBSD$
+.\" Man page generated from reStructuredText.
+.
+.TH "LLVM-DWARFDUMP" "1" "2015-05-30" "3.7" "LLVM"
+.SH NAME
+llvm-dwarfdump \- print contents of DWARF sections
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.SH SYNOPSIS
+.sp
+\fBllvm\-dwarfdump\fP [\fIoptions\fP] [\fIfilenames...\fP]
+.SH DESCRIPTION
+.sp
+\fBllvm\-dwarfdump\fP parses DWARF sections in the object files
+and prints their contents in human\-readable form.
+.SH OPTIONS
+.INDENT 0.0
+.TP
+.B \-debug\-dump=section
+Specify the DWARF section to dump.
+For example, use \fBabbrev\fP to dump the contents of \fB\&.debug_abbrev\fP section,
+\fBloc.dwo\fP to dump the contents of \fB\&.debug_loc.dwo\fP etc.
+See \fBllvm\-dwarfdump \-\-help\fP for the complete list of supported sections.
+Use \fBall\fP to dump all DWARF sections. It is the default.
+.UNINDENT
+.SH EXIT STATUS
+.sp
+\fBllvm\-dwarfdump\fP returns 0. Other exit codes imply internal
+program error.
+.SH AUTHOR
+Maintained by The LLVM Team (http://llvm.org/).
+.SH COPYRIGHT
+2003-2014, LLVM Project
+.\" Generated by docutils manpage writer.
+.
diff --git a/usr.bin/clang/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile
index 8456a0f..5e5f4a9 100644
--- a/usr.bin/clang/llvm-extract/Makefile
+++ b/usr.bin/clang/llvm-extract/Makefile
@@ -16,13 +16,12 @@ LIBDEPS=llvmirreader \
 	llvmprofiledata \
 	llvmobject \
 	llvmmcparser \
+	llvmmc \
 	llvmbitreader \
 	llvminstcombine \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
-	llvmmc \
 	llvmcore \
 	llvmsupport
 
diff --git a/usr.bin/clang/llvm-extract/llvm-extract.1 b/usr.bin/clang/llvm-extract/llvm-extract.1
index 6de6452..6cad6ed 100644
--- a/usr.bin/clang/llvm-extract/llvm-extract.1
+++ b/usr.bin/clang/llvm-extract/llvm-extract.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-EXTRACT" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-EXTRACT" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-extract \- extract a function from an LLVM module
 .
diff --git a/usr.bin/clang/llvm-link/Makefile b/usr.bin/clang/llvm-link/Makefile
index b7e1fed..d75a854 100644
--- a/usr.bin/clang/llvm-link/Makefile
+++ b/usr.bin/clang/llvm-link/Makefile
@@ -15,8 +15,6 @@ LIBDEPS=llvmirreader \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
-	llvmmc \
 	llvmcore \
 	llvmsupport
 
diff --git a/usr.bin/clang/llvm-link/llvm-link.1 b/usr.bin/clang/llvm-link/llvm-link.1
index 136344a..9df31b1 100644
--- a/usr.bin/clang/llvm-link/llvm-link.1
+++ b/usr.bin/clang/llvm-link/llvm-link.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-LINK" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-LINK" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-link \- LLVM bitcode linker
 .
diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile
new file mode 100644
index 0000000..98d673b
--- /dev/null
+++ b/usr.bin/clang/llvm-lto/Makefile
@@ -0,0 +1,78 @@
+# $FreeBSD$
+
+MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=llvm-lto
+
+SRCDIR=	tools/llvm-lto
+SRCS=	llvm-lto.cpp
+
+TGHDRS=	Intrinsics
+LIBDEPS=llvmaarch64disassembler \
+	llvmaarch64codegen \
+	llvmaarch64asmparser \
+	llvmaarch64desc \
+	llvmaarch64info \
+	llvmaarch64instprinter \
+	llvmaarch64utils \
+	llvmarmdisassembler \
+	llvmarmcodegen \
+	llvmarmasmparser \
+	llvmarmdesc \
+	llvmarminfo \
+	llvmarminstprinter \
+	llvmmipsdisassembler \
+	llvmmipscodegen \
+	llvmmipsasmparser \
+	llvmmipsdesc \
+	llvmmipsinfo \
+	llvmmipsinstprinter \
+	llvmpowerpcdisassembler \
+	llvmpowerpccodegen \
+	llvmpowerpcasmparser \
+	llvmpowerpcdesc \
+	llvmpowerpcinfo \
+	llvmpowerpcinstprinter \
+	llvmsparcdisassembler \
+	llvmsparccodegen \
+	llvmsparcasmparser \
+	llvmsparcdesc \
+	llvmsparcinfo \
+	llvmsparcinstprinter \
+	llvmx86disassembler \
+	llvmx86asmparser \
+	llvmx86codegen \
+	llvmselectiondag \
+	llvmasmprinter \
+	llvmx86desc \
+	llvmx86info \
+	llvmx86instprinter \
+	llvmx86utils \
+	llvmmcdisassembler \
+	llvmlto \
+	llvmobjcarcopts \
+	llvmlinker \
+	llvmipo \
+	llvmvectorize \
+	llvmcodegen \
+	llvmtarget \
+	llvmscalaropts \
+	llvmprofiledata \
+	llvmobject \
+	llvmmcparser \
+	llvminstcombine \
+	llvminstrumentation \
+	llvmtransformutils \
+	llvmipa \
+	llvmmc \
+	llvmbitwriter \
+	llvmbitreader \
+	llvmanalysis \
+	llvmcore \
+	llvmsupport
+
+.include "../clang.prog.mk"
+
+DPADD+=	${LIBZ}
+LDADD+=	-lz
diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile
index 6e85993..f0c2367 100644
--- a/usr.bin/clang/llvm-mc/Makefile
+++ b/usr.bin/clang/llvm-mc/Makefile
@@ -6,8 +6,8 @@ MAN=
 PROG_CXX=llvm-mc
 
 SRCDIR=	tools/llvm-mc
-SRCS=	llvm-mc.cpp \
-	Disassembler.cpp
+SRCS=	Disassembler.cpp \
+	llvm-mc.cpp
 
 LIBDEPS=llvmaarch64disassembler \
 	llvmaarch64codegen \
@@ -46,13 +46,14 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
+	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile
index 79afa5a..76dfa62 100644
--- a/usr.bin/clang/llvm-nm/Makefile
+++ b/usr.bin/clang/llvm-nm/Makefile
@@ -44,13 +44,14 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
+	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llvm-nm/llvm-nm.1 b/usr.bin/clang/llvm-nm/llvm-nm.1
index c20e701..467bd21 100644
--- a/usr.bin/clang/llvm-nm/llvm-nm.1
+++ b/usr.bin/clang/llvm-nm/llvm-nm.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-NM" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-NM" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-nm \- list LLVM bitcode and object file's symbol table
 .
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index ccb7ed9..4e87913 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -11,7 +11,7 @@ SRCS=	llvm-objdump.cpp \
 	ELFDump.cpp \
 	MachODump.cpp
 
-LIBDEPS=llvmdebuginfo \
+LIBDEPS=llvmdebuginfodwarf \
 	llvmaarch64disassembler \
 	llvmaarch64codegen \
 	llvmaarch64asmparser \
@@ -49,13 +49,14 @@ LIBDEPS=llvmdebuginfo \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
+	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llvm-pdbdump/Makefile b/usr.bin/clang/llvm-pdbdump/Makefile
new file mode 100644
index 0000000..f557ccf
--- /dev/null
+++ b/usr.bin/clang/llvm-pdbdump/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+MAN=
+.include <bsd.own.mk>
+
+PROG_CXX=llvm-pdbdump
+
+SRCDIR=	tools/llvm-pdbdump
+SRCS=	BuiltinDumper.cpp \
+	ClassDefinitionDumper.cpp \
+	CompilandDumper.cpp \
+	EnumDumper.cpp \
+	ExternalSymbolDumper.cpp \
+	FunctionDumper.cpp \
+	LinePrinter.cpp \
+	TypeDumper.cpp \
+	TypedefDumper.cpp \
+	VariableDumper.cpp \
+	llvm-pdbdump.cpp
+
+LIBDEPS=llvmdebuginfopdb \
+	llvmobject \
+	llvmmcparser \
+	llvmmc \
+	llvmbitreader \
+	llvmcore \
+	llvmsupport
+
+.include "../clang.prog.mk"
+
+DPADD+=	${LIBZ}
+LDADD+=	-lz
diff --git a/usr.bin/clang/llvm-profdata/llvm-profdata.1 b/usr.bin/clang/llvm-profdata/llvm-profdata.1
index 4f66e63..1c59b50 100644
--- a/usr.bin/clang/llvm-profdata/llvm-profdata.1
+++ b/usr.bin/clang/llvm-profdata/llvm-profdata.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-PROFDATA" "1" "2015-04-01" "3.6" "LLVM"
+.TH "LLVM-PROFDATA" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-profdata \- Profile data tool
 .
diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile
index df74a5b..7656543 100644
--- a/usr.bin/clang/llvm-rtdyld/Makefile
+++ b/usr.bin/clang/llvm-rtdyld/Makefile
@@ -8,7 +8,7 @@ PROG_CXX=llvm-rtdyld
 SRCDIR=	tools/llvm-rtdyld
 SRCS=	llvm-rtdyld.cpp
 
-LIBDEPS=llvmdebuginfo \
+LIBDEPS=llvmdebuginfodwarf \
 	llvmmcjit \
 	llvmexecutionengine \
 	llvmruntimedyld \
@@ -49,13 +49,14 @@ LIBDEPS=llvmdebuginfo \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmscalaropts \
 	llvmprofiledata \
 	llvminstcombine \
+	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
 	llvmanalysis \
-	llvmtarget \
 	llvmx86desc \
 	llvmobject \
 	llvmmcparser \
diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile
index 9e3b584..0c3c974d 100644
--- a/usr.bin/clang/llvm-symbolizer/Makefile
+++ b/usr.bin/clang/llvm-symbolizer/Makefile
@@ -8,7 +8,8 @@ SRCDIR=	tools/llvm-symbolizer
 SRCS=	llvm-symbolizer.cpp \
 	LLVMSymbolize.cpp
 
-LIBDEPS=llvmdebuginfo \
+LIBDEPS=llvmdebuginfopdb \
+	llvmdebuginfodwarf \
 	llvmobject \
 	llvmmcparser \
 	llvmmc \
diff --git a/usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1 b/usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1
index 6372aed..f05a5ce 100644
--- a/usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1
+++ b/usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "LLVM-SYMBOLIZER" "1" "2015-03-14" "3.6" "LLVM"
+.TH "LLVM-SYMBOLIZER" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 llvm-symbolizer \- convert addresses into source code locations
 .
diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile
index 075a7bd..1931393 100644
--- a/usr.bin/clang/opt/Makefile
+++ b/usr.bin/clang/opt/Makefile
@@ -10,12 +10,12 @@ SRCS=	AnalysisWrappers.cpp \
 	GraphPrinters.cpp \
 	NewPMDriver.cpp \
 	PassPrinters.cpp \
-	Passes.cpp \
 	PrintSCC.cpp \
 	opt.cpp
 
 TGHDRS=	Intrinsics
-LIBDEPS=llvmaarch64disassembler \
+LIBDEPS=llvmpasses \
+	llvmaarch64disassembler \
 	llvmaarch64codegen \
 	llvmaarch64asmparser \
 	llvmaarch64desc \
@@ -52,6 +52,7 @@ LIBDEPS=llvmaarch64disassembler \
 	llvmselectiondag \
 	llvmasmprinter \
 	llvmcodegen \
+	llvmtarget \
 	llvmx86desc \
 	llvmmcdisassembler \
 	llvmx86info \
@@ -68,9 +69,8 @@ LIBDEPS=llvmaarch64disassembler \
 	llvminstrumentation \
 	llvmtransformutils \
 	llvmipa \
-	llvmanalysis \
-	llvmtarget \
 	llvmmc \
+	llvmanalysis \
 	llvmirreader \
 	llvmasmparser \
 	llvmbitwriter \
diff --git a/usr.bin/clang/opt/opt.1 b/usr.bin/clang/opt/opt.1
index bf357d9..e5bacdf 100644
--- a/usr.bin/clang/opt/opt.1
+++ b/usr.bin/clang/opt/opt.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "OPT" "1" "2015-03-14" "3.6" "LLVM"
+.TH "OPT" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 opt \- LLVM optimizer
 .
diff --git a/usr.bin/clang/tblgen/tblgen.1 b/usr.bin/clang/tblgen/tblgen.1
index 1f8dec0..9ee3841 100644
--- a/usr.bin/clang/tblgen/tblgen.1
+++ b/usr.bin/clang/tblgen/tblgen.1
@@ -1,7 +1,7 @@
 .\" $FreeBSD$
 .\" Man page generated from reStructuredText.
 .
-.TH "TBLGEN" "1" "2015-03-14" "3.6" "LLVM"
+.TH "TBLGEN" "1" "2015-05-30" "3.7" "LLVM"
 .SH NAME
 tblgen \- Target Description To C++ Code Generator
 .