diff --git a/usr.bin/clang/bugpoint/bugpoint.1 b/usr.bin/clang/bugpoint/bugpoint.1
index b2211e0696c7..9537d9eb9074 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-01-10" "3.5" "LLVM"
+.TH "BUGPOINT" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 bugpoint \- automatic test case reduction tool
 .
diff --git a/usr.bin/clang/clang/clang.1 b/usr.bin/clang/clang/clang.1
index df6fcc7df0f9..24207222575b 100644
--- a/usr.bin/clang/clang/clang.1
+++ b/usr.bin/clang/clang/clang.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.Dd November 18, 2013
+.Dd February 25, 2015
 .Dt CLANG 1
 .Os
 .Sh NAME
@@ -175,7 +175,7 @@ a number of cross compilers, or may only support a native target.
 .It  Sy -arch Em architecture
 Specify the architecture to build for.
 .It  Sy -mmacosx-version-min Ns = Ns  Em version
-When building for Mac OS/X, specify the minimum version supported by your
+When building for Mac OS X, specify the minimum version supported by your
 application.
 .It  Sy -miphoneos-version-min
 When building for iPhone OS, specify the minimum version supported by your
@@ -230,8 +230,22 @@ Currently equivalent to
 .It  Sy -g
 Generate debug information.  Note that Clang debug information works best at
 .Sy -O0 .
-At higher optimization levels, only line number information is
-currently available.
+.It  Sy -fstandalone-debug Sy -fno-standalone-debug
+Clang supports a number of optimizations to reduce the size of debug
+information in the binary. They work based on the assumption that the
+debug type information can be spread out over multiple compilation
+units.  For instance, Clang will not emit type definitions for types
+that are not needed by a module and could be replaced with a forward
+declaration.  Further, Clang will only emit type info for a dynamic
+C++ class in the module that contains the vtable for the class.
+.Pp
+The 
+.Sy -fstandalone-debug
+option turns off these optimizations.  This
+is useful when working with 3rd-party libraries that don't come with
+debug information.  This is the default on Darwin.  Note that Clang
+will never emit type information for types that are not referenced at
+all by the program.
 .It  Sy -fexceptions
 Enable generation of unwind information, this allows exceptions to be thrown
 through Clang compiled stack frames.  This is on by default in x86-64.
@@ -262,7 +276,7 @@ to the linker depending on the stage selection options).
 .Ss Driver Options
 .Bl -tag -width Ds
 .It  Sy -###
-Print the commands to run for this compilation.
+Print (but do not run) the commands to run for this compilation.
 .It  Sy --help
 Display available options.
 .It  Sy -Qunused-arguments
diff --git a/usr.bin/clang/llc/llc.1 b/usr.bin/clang/llc/llc.1
index c93aa1f038b9..02c2f9e91096 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-01-10" "3.5" "LLVM"
+.TH "LLC" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 llc \- LLVM static compiler
 .
diff --git a/usr.bin/clang/lli/lli.1 b/usr.bin/clang/lli/lli.1
index 2484370d1e45..de9e30c45efd 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-01-10" "3.5" "LLVM"
+.TH "LLI" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 lli \- directly execute programs from LLVM bitcode
 .
diff --git a/usr.bin/clang/llvm-ar/llvm-ar.1 b/usr.bin/clang/llvm-ar/llvm-ar.1
index bcff566ae151..729e2d4f2df6 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-01-10" "3.5" "LLVM"
+.TH "LLVM-AR" "1" "2015-03-14" "3.6" "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 423dffa12470..bda01da7eb3e 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-01-10" "3.5" "LLVM"
+.TH "LLVM-AS" "1" "2015-03-14" "3.6" "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 a7e15843714e..fef510d7cf40 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-01-10" "3.5" "LLVM"
+.TH "LLVM-BCANALYZER" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 llvm-bcanalyzer \- LLVM bitcode analyzer
 .
diff --git a/usr.bin/clang/llvm-diff/llvm-diff.1 b/usr.bin/clang/llvm-diff/llvm-diff.1
index 764964a1a9ac..0fa5a01989ef 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-01-10" "3.5" "LLVM"
+.TH "LLVM-DIFF" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 llvm-diff \- LLVM structural 'diff'
 .
diff --git a/usr.bin/clang/llvm-dis/llvm-dis.1 b/usr.bin/clang/llvm-dis/llvm-dis.1
index c6eafa521649..bdf0bdb74e5b 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-01-10" "3.5" "LLVM"
+.TH "LLVM-DIS" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 llvm-dis \- LLVM disassembler
 .
diff --git a/usr.bin/clang/llvm-extract/llvm-extract.1 b/usr.bin/clang/llvm-extract/llvm-extract.1
index 1d6495ed5f86..6de6452fa962 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-01-10" "3.5" "LLVM"
+.TH "LLVM-EXTRACT" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 llvm-extract \- extract a function from an LLVM module
 .
diff --git a/usr.bin/clang/llvm-link/llvm-link.1 b/usr.bin/clang/llvm-link/llvm-link.1
index 710391e1690e..136344ad26bd 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-01-10" "3.5" "LLVM"
+.TH "LLVM-LINK" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 llvm-link \- LLVM bitcode linker
 .
diff --git a/usr.bin/clang/llvm-nm/llvm-nm.1 b/usr.bin/clang/llvm-nm/llvm-nm.1
index b837a3b3216e..c20e7015a888 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-01-10" "3.5" "LLVM"
+.TH "LLVM-NM" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 llvm-nm \- list LLVM bitcode and object file's symbol table
 .
diff --git a/usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1 b/usr.bin/clang/llvm-symbolizer/llvm-symbolizer.1
index c763ad3433bc..6372aed28a09 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-01-10" "3.5" "LLVM"
+.TH "LLVM-SYMBOLIZER" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 llvm-symbolizer \- convert addresses into source code locations
 .
@@ -126,6 +126,13 @@ You can also specify architecture by writing \fBbinary_name:arch_name\fP in the
 input (see example above). If architecture is not specified in either way,
 address will not be symbolized. Defaults to empty string.
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-dsym\-hint=<path/to/file.dSYM>
+(Darwin\-only flag). If the debug info for a binary isn\(aqt present in the default
+location, look for the debug info at the .dSYM path provided via the
+\fB\-dsym\-hint\fP flag. This flag can be used multiple times.
+.UNINDENT
 .SH EXIT STATUS
 .sp
 \fBllvm\-symbolizer\fP returns 0. Other exit codes imply internal program error.
diff --git a/usr.bin/clang/opt/opt.1 b/usr.bin/clang/opt/opt.1
index a346402636ce..bf357d922d15 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-01-10" "3.5" "LLVM"
+.TH "OPT" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 opt \- LLVM optimizer
 .
@@ -93,34 +93,14 @@ order in which they are executed (within pass constraints).
 .UNINDENT
 .INDENT 0.0
 .TP
-.B \-std\-compile\-opts
-This is short hand for a standard list of \fIcompile time optimization\fP passes.
-It might be useful for other front end compilers as well.  To discover the
-full set of options available, use the following command:
-.INDENT 7.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-llvm\-as < /dev/null | opt \-std\-compile\-opts \-disable\-output \-debug\-pass=Arguments
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.UNINDENT
-.INDENT 0.0
-.TP
 .B \-disable\-inlining
-This option is only meaningful when \fI\%\-std\-compile\-opts\fP is given.  It
-simply removes the inlining pass from the standard list.
+This option simply removes the inlining pass from the standard list.
 .UNINDENT
 .INDENT 0.0
 .TP
 .B \-disable\-opt
-This option is only meaningful when \fI\%\-std\-compile\-opts\fP is given.  It
-disables most, but not all, of the \fI\%\-std\-compile\-opts\fP\&.  The ones that
-remain are \fI\-verify\fP, \fI\-lower\-setjmp\fP, and
-\fI\-funcresolve\fP\&.
+This option is only meaningful when \fI\-std\-link\-opts\fP is given.  It
+disables most passes.
 .UNINDENT
 .INDENT 0.0
 .TP
@@ -135,9 +115,7 @@ but it ensures that stripping of debug information is done first.
 This option causes opt to add a verify pass after every pass otherwise
 specified on the command line (including \fI\-verify\fP).  This is useful
 for cases where it is suspected that a pass is creating an invalid module but
-it is not clear which pass is doing it.  The combination of
-\fI\%\-std\-compile\-opts\fP and \fI\%\-verify\-each\fP can quickly track down
-this kind of problem.
+it is not clear which pass is doing it.
 .UNINDENT
 .INDENT 0.0
 .TP
diff --git a/usr.bin/clang/tblgen/tblgen.1 b/usr.bin/clang/tblgen/tblgen.1
index 848d5bacfef1..1f8dec0ce03f 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-01-10" "3.5" "LLVM"
+.TH "TBLGEN" "1" "2015-03-14" "3.6" "LLVM"
 .SH NAME
 tblgen \- Target Description To C++ Code Generator
 .