Upgrade to r224537.

Add support for -fformat-exentions as a no-op in clang. [0]

Submitted by:	lightside@gmx.com [0]

5 files changed, 75 insertions, 11 deletions

diff --git a/devel/llvm-devel/Makefile.svn_rev b/devel/llvm-devel/Makefile.svn_rev
index 1424ac8f5980..65146773901c 100644
--- a/devel/llvm-devel/Makefile.svn_rev
+++ b/devel/llvm-devel/Makefile.svn_rev
@@ -1 +1 @@
-SVN_REV=	222267
+SVN_REV=	224537
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 880febd156c0..440b39fe4de2 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (llvm-3.6.r222267.tar.bz2) = e2d4c12750c5ac3a4617f492841baef62eeca665469990f48925becad20c61e8
-SIZE (llvm-3.6.r222267.tar.bz2) = 14140626
+SHA256 (llvm-3.6.r224537.tar.bz2) = 27e9fcd0128dbbf470a55a3728afede0faf1496741439bfb1861be5abee52555
+SIZE (llvm-3.6.r224537.tar.bz2) = 14372233
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 71dedc654300..e16483cf3914 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -43,6 +43,7 @@ llvm-devel/bin/llvm-config
 llvm-devel/bin/llvm-cov
 llvm-devel/bin/llvm-diff
 llvm-devel/bin/llvm-dis
+llvm-devel/bin/llvm-dsymutil
 llvm-devel/bin/llvm-dwarfdump
 llvm-devel/bin/llvm-extract
 llvm-devel/bin/llvm-link
@@ -164,7 +165,6 @@ llvm-devel/include/llvm/Analysis/DependenceAnalysis.h
 llvm-devel/include/llvm/Analysis/DomPrinter.h
 llvm-devel/include/llvm/Analysis/DominanceFrontier.h
 llvm-devel/include/llvm/Analysis/DominanceFrontierImpl.h
-llvm-devel/include/llvm/Analysis/FindUsedTypes.h
 llvm-devel/include/llvm/Analysis/FunctionTargetTransformInfo.h
 llvm-devel/include/llvm/Analysis/IVUsers.h
 llvm-devel/include/llvm/Analysis/InlineCost.h
@@ -316,9 +316,7 @@ llvm-devel/include/llvm/ExecutionEngine/Interpreter.h
 llvm-devel/include/llvm/ExecutionEngine/JITEventListener.h
 llvm-devel/include/llvm/ExecutionEngine/MCJIT.h
 llvm-devel/include/llvm/ExecutionEngine/OProfileWrapper.h
-llvm-devel/include/llvm/ExecutionEngine/ObjectBuffer.h
 llvm-devel/include/llvm/ExecutionEngine/ObjectCache.h
-llvm-devel/include/llvm/ExecutionEngine/ObjectImage.h
 llvm-devel/include/llvm/ExecutionEngine/RTDyldMemoryManager.h
 llvm-devel/include/llvm/ExecutionEngine/RuntimeDyld.h
 llvm-devel/include/llvm/ExecutionEngine/RuntimeDyldChecker.h
@@ -380,7 +378,9 @@ llvm-devel/include/llvm/IR/LegacyPassManagers.h
 llvm-devel/include/llvm/IR/LegacyPassNameParser.h
 llvm-devel/include/llvm/IR/MDBuilder.h
 llvm-devel/include/llvm/IR/Mangler.h
+llvm-devel/include/llvm/IR/Metadata.def
 llvm-devel/include/llvm/IR/Metadata.h
+llvm-devel/include/llvm/IR/MetadataTracking.h
 llvm-devel/include/llvm/IR/Module.h
 llvm-devel/include/llvm/IR/NoFolder.h
 llvm-devel/include/llvm/IR/OperandTraits.h
@@ -388,7 +388,9 @@ llvm-devel/include/llvm/IR/Operator.h
 llvm-devel/include/llvm/IR/PassManager.h
 llvm-devel/include/llvm/IR/PatternMatch.h
 llvm-devel/include/llvm/IR/PredIteratorCache.h
+llvm-devel/include/llvm/IR/Statepoint.h
 llvm-devel/include/llvm/IR/SymbolTableListTraits.h
+llvm-devel/include/llvm/IR/TrackingMDRef.h
 llvm-devel/include/llvm/IR/Type.h
 llvm-devel/include/llvm/IR/TypeBuilder.h
 llvm-devel/include/llvm/IR/TypeFinder.h
@@ -539,6 +541,16 @@ llvm-devel/include/llvm/Support/Debug.h
 llvm-devel/include/llvm/Support/Dwarf.h
 llvm-devel/include/llvm/Support/DynamicLibrary.h
 llvm-devel/include/llvm/Support/ELF.h
+llvm-devel/include/llvm/Support/ELFRelocs/AArch64.def
+llvm-devel/include/llvm/Support/ELFRelocs/ARM.def
+llvm-devel/include/llvm/Support/ELFRelocs/Hexagon.def
+llvm-devel/include/llvm/Support/ELFRelocs/Mips.def
+llvm-devel/include/llvm/Support/ELFRelocs/PowerPC.def
+llvm-devel/include/llvm/Support/ELFRelocs/PowerPC64.def
+llvm-devel/include/llvm/Support/ELFRelocs/Sparc.def
+llvm-devel/include/llvm/Support/ELFRelocs/SystemZ.def
+llvm-devel/include/llvm/Support/ELFRelocs/i386.def
+llvm-devel/include/llvm/Support/ELFRelocs/x86_64.def
 llvm-devel/include/llvm/Support/Endian.h
 llvm-devel/include/llvm/Support/EndianStream.h
 llvm-devel/include/llvm/Support/Errc.h
@@ -701,7 +713,6 @@ llvm-devel/lib/libLLVMCppBackendCodeGen.a
 llvm-devel/lib/libLLVMCppBackendInfo.a
 llvm-devel/lib/libLLVMDebugInfo.a
 llvm-devel/lib/libLLVMExecutionEngine.a
-llvm-devel/lib/libLLVMHexagonAsmPrinter.a
 llvm-devel/lib/libLLVMHexagonCodeGen.a
 llvm-devel/lib/libLLVMHexagonDesc.a
 llvm-devel/lib/libLLVMHexagonDisassembler.a
@@ -784,9 +795,11 @@ llvm-devel/lib/libLTO.a
 llvm-devel/lib/libLTO.so
 llvm-devel/share/llvm/cmake/AddLLVM.cmake
 llvm-devel/share/llvm/cmake/AddLLVMDefinitions.cmake
+llvm-devel/share/llvm/cmake/AddOCaml.cmake
 llvm-devel/share/llvm/cmake/AddSphinxTarget.cmake
 llvm-devel/share/llvm/cmake/ChooseMSVCCRT.cmake
 llvm-devel/share/llvm/cmake/CrossCompile.cmake
+llvm-devel/share/llvm/cmake/FindOCaml.cmake
 llvm-devel/share/llvm/cmake/FindSphinx.cmake
 llvm-devel/share/llvm/cmake/GetSVN.cmake
 llvm-devel/share/llvm/cmake/HandleLLVMOptions.cmake
@@ -909,6 +922,8 @@ llvm-devel/share/llvm/cmake/TableGen.cmake
 %%PORTDOCS%%%%DOCSDIR%%/html/LangImpl7.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LangImpl8.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LangImpl8.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/LangImpl9.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LangIntro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/LangIntro.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/LangRef.html
@@ -929,6 +944,8 @@ llvm-devel/share/llvm/cmake/TableGen.cmake
 %%PORTDOCS%%%%DOCSDIR%%/html/MakefileGuide.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/MarkedUpDisassembly.html
 %%PORTDOCS%%%%DOCSDIR%%/html/MarkedUpDisassembly.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/MergeFunctions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/MergeFunctions.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/NVPTXUsage.html
 %%PORTDOCS%%%%DOCSDIR%%/html/NVPTXUsage.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/OCamlLangImpl1.html
@@ -971,6 +988,8 @@ llvm-devel/share/llvm/cmake/TableGen.cmake
 %%PORTDOCS%%%%DOCSDIR%%/html/SphinxQuickstartTemplate.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/StackMaps.html
 %%PORTDOCS%%%%DOCSDIR%%/html/StackMaps.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/Statepoints.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Statepoints.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/SystemLibrary.html
 %%PORTDOCS%%%%DOCSDIR%%/html/SystemLibrary.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/TableGenFundamentals.html
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index dd520f59cefd..d245793929a2 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.6.r222267.tar.bz2) = 20c4b61b0d14adf051d038349fcbd230fd2978ed58363751497514dbc11a0160
-SIZE (clang-3.6.r222267.tar.bz2) = 9374829
-SHA256 (llvm-3.6.r222267.tar.bz2) = e2d4c12750c5ac3a4617f492841baef62eeca665469990f48925becad20c61e8
-SIZE (llvm-3.6.r222267.tar.bz2) = 14140626
+SHA256 (clang-3.6.r224537.tar.bz2) = 45286670a136ac390a4fc6dcf14c66fb277c2df7967e77e134cd18437ba3a159
+SIZE (clang-3.6.r224537.tar.bz2) = 9410399
+SHA256 (llvm-3.6.r224537.tar.bz2) = 27e9fcd0128dbbf470a55a3728afede0faf1496741439bfb1861be5abee52555
+SIZE (llvm-3.6.r224537.tar.bz2) = 14372233
diff --git a/lang/clang-devel/files/patch-fformat_extensions.diff b/lang/clang-devel/files/patch-fformat_extensions.diff
new file mode 100644
index 000000000000..c44a69af565f
--- /dev/null
+++ b/lang/clang-devel/files/patch-fformat_extensions.diff
@@ -0,0 +1,45 @@
+diff -ruN tools/clang/include/clang/Basic/LangOptions.def tools/clang/include/clang/Basic/LangOptions.def
+--- tools/clang/include/clang/Basic/LangOptions.def	2014-07-16 07:13:50.000000000 +0400
++++ tools/clang/include/clang/Basic/LangOptions.def	2014-10-24 21:38:38.000000000 +0400
+@@ -87,6 +87,7 @@
+ LANGOPT(RTTIData          , 1, 1, "emit run-time type information data")
+ LANGOPT(MSBitfields       , 1, 0, "Microsoft-compatible structure layout")
+ LANGOPT(Freestanding, 1, 0, "freestanding implementation")
++LANGOPT(FormatExtensions  , 1, 0, "FreeBSD format extensions")
+ LANGOPT(NoBuiltin         , 1, 0, "disable builtin functions")
+ LANGOPT(NoMathBuiltin     , 1, 0, "disable math builtin functions")
+ 
+diff -ruN tools/clang/include/clang/Driver/Options.td tools/clang/include/clang/Driver/Options.td
+--- tools/clang/include/clang/Driver/Options.td	2014-08-07 08:51:51.000000000 +0400
++++ tools/clang/include/clang/Driver/Options.td	2014-10-24 21:39:23.000000000 +0400
+@@ -563,6 +563,8 @@
+ 
+ def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>,
+   HelpText<"Assert that the compilation takes place in a freestanding environment">;
++def fformat_extensions: Flag<["-"], "fformat-extensions">, Group<f_Group>, Flags<[CC1Option]>,
++  HelpText<"Enable FreeBSD kernel specific format string extensions">;
+ def fgnu_keywords : Flag<["-"], "fgnu-keywords">, Group<f_Group>, Flags<[CC1Option]>,
+   HelpText<"Allow GNU-extension keywords regardless of language standard">;
+ def fgnu89_inline : Flag<["-"], "fgnu89-inline">, Group<f_Group>, Flags<[CC1Option]>,
+diff -ruN tools/clang/lib/Driver/Tools.cpp tools/clang/lib/Driver/Tools.cpp
+--- tools/clang/lib/Driver/Tools.cpp	2014-08-07 08:51:51.000000000 +0400
++++ tools/clang/lib/Driver/Tools.cpp	2014-10-24 21:39:54.000000000 +0400
+@@ -3517,6 +3517,7 @@
+ 
+   // Forward -f (flag) options which we can pass directly.
+   Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls);
++  Args.AddLastArg(CmdArgs, options::OPT_fformat_extensions);
+   Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions);
+   Args.AddLastArg(CmdArgs, options::OPT_fstandalone_debug);
+   Args.AddLastArg(CmdArgs, options::OPT_fno_standalone_debug);
+diff -ruN tools/clang/lib/Frontend/CompilerInvocation.cpp tools/clang/lib/Frontend/CompilerInvocation.cpp
+--- tools/clang/lib/Frontend/CompilerInvocation.cpp	2014-08-07 08:51:51.000000000 +0400
++++ tools/clang/lib/Frontend/CompilerInvocation.cpp	2014-10-24 21:40:32.000000000 +0400
+@@ -1443,6 +1443,7 @@
+   Opts.ShortWChar = Args.hasFlag(OPT_fshort_wchar, OPT_fno_short_wchar, false);
+   Opts.ShortEnums = Args.hasArg(OPT_fshort_enums);
+   Opts.Freestanding = Args.hasArg(OPT_ffreestanding);
++  Opts.FormatExtensions = Args.hasArg(OPT_fformat_extensions);
+   Opts.NoBuiltin = Args.hasArg(OPT_fno_builtin) || Opts.Freestanding;
+   Opts.NoMathBuiltin = Args.hasArg(OPT_fno_math_builtin);
+   Opts.AssumeSaneOperatorNew = !Args.hasArg(OPT_fno_assume_sane_operator_new);