4 files changed, 51 insertions, 91 deletions

diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index d714f32c6cc5..8f793d0db3b1 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	clang
-PORTVERSION=	3.6.r${SVN_REV}
+PORTVERSION=	3.7.r${SVN_REV}
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index 77eba6179885..20c90a96750a 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.6.r225991.tar.bz2) = cbf00819fa4b342edf1ef067d4f63fbdd504ff9641800b219860dcceff223b55
-SIZE (clang-3.6.r225991.tar.bz2) = 9458288
-SHA256 (llvm-3.6.r225991.tar.bz2) = ea977cdac118c98a72f7985ef035a30a33788521c82f9340de11119f134be585
-SIZE (llvm-3.6.r225991.tar.bz2) = 14522782
+SHA256 (clang-3.7.r234164.tar.bz2) = 513fdab237bc94b54f5d453dd5617bf59a9cb8a13a5ac5c9a86c51da40556235
+SIZE (clang-3.7.r234164.tar.bz2) = 9636246
+SHA256 (llvm-3.7.r234164.tar.bz2) = aadef776f14c7b43d6caf661ac1b19da5b7b3c25f6422282a14091ee9e8fb1da
+SIZE (llvm-3.7.r234164.tar.bz2) = 15311690
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp
deleted file mode 100644
index ab29c87f92ed..000000000000
--- a/lang/clang-devel/files/patch-tools_clang_lib_Analysis_PrintfFormatString.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD$
-
---- tools/clang/lib/Analysis/PrintfFormatString.cpp.orig
-+++ tools/clang/lib/Analysis/PrintfFormatString.cpp
-@@ -208,7 +208,7 @@
-     case 'm': k = ConversionSpecifier::PrintErrno; break;
-     // Apple-specific.
-     case 'D':
--      if (Target.getTriple().isOSDarwin())
-+      if (Target.getTriple().isOSDarwin() || Target.getTriple().isOSFreeBSD())
-         k = ConversionSpecifier::DArg;
-       break;
-     case 'O':
-@@ -219,6 +219,19 @@
-       if (Target.getTriple().isOSDarwin())
-         k = ConversionSpecifier::UArg;
-       break;
-+    // FreeBSD-specific
-+    case 'b':
-+      if (Target.getTriple().isOSFreeBSD())
-+        k = ConversionSpecifier::bArg;
-+      break;
-+    case 'r':
-+      if (Target.getTriple().isOSFreeBSD())
-+        k = ConversionSpecifier::xArg;
-+      break;
-+    case 'y':
-+      if (Target.getTriple().isOSFreeBSD())
-+        k = ConversionSpecifier::iArg;
-+      break;
-     // MS specific.
-     case 'Z':
-       if (Target.getTriple().isOSMSVCRT())
-@@ -228,6 +241,10 @@
-   FS.setConversionSpecifier(CS);
-   if (CS.consumesDataArgument() && !FS.usesPositionalArg())
-     FS.setArgIndex(argIndex++);
-+  // FreeBSD extension
-+  if (Target.getTriple().isOSFreeBSD() && (k == ConversionSpecifier::bArg ||
-+    k == ConversionSpecifier::DArg))
-+      argIndex++;
- 
-   if (k == ConversionSpecifier::InvalidSpecifier) {
-     // Assume the conversion takes one argument.
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index 878ac2c7ffd0..aef4da0a06bd 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -177,6 +177,7 @@ llvm-devel/include/clang/Basic/BuiltinsNEON.def
 llvm-devel/include/clang/Basic/BuiltinsNVPTX.def
 llvm-devel/include/clang/Basic/BuiltinsPPC.def
 llvm-devel/include/clang/Basic/BuiltinsR600.def
+llvm-devel/include/clang/Basic/BuiltinsSystemZ.def
 llvm-devel/include/clang/Basic/BuiltinsX86.def
 llvm-devel/include/clang/Basic/BuiltinsXCore.def
 llvm-devel/include/clang/Basic/CapturedStmt.h
@@ -336,6 +337,7 @@ llvm-devel/include/clang/Parse/ParseDiagnostic.h
 llvm-devel/include/clang/Parse/Parser.h
 llvm-devel/include/clang/Rewrite/Core/DeltaTree.h
 llvm-devel/include/clang/Rewrite/Core/HTMLRewrite.h
+llvm-devel/include/clang/Rewrite/Core/RewriteBuffer.h
 llvm-devel/include/clang/Rewrite/Core/RewriteRope.h
 llvm-devel/include/clang/Rewrite/Core/Rewriter.h
 llvm-devel/include/clang/Rewrite/Core/TokenRewriter.h
@@ -449,47 +451,50 @@ llvm-devel/include/clang/Tooling/Refactoring.h
 llvm-devel/include/clang/Tooling/RefactoringCallbacks.h
 llvm-devel/include/clang/Tooling/ReplacementsYaml.h
 llvm-devel/include/clang/Tooling/Tooling.h
-llvm-devel/lib/clang/3.6.0/include/__wmmintrin_aes.h
-llvm-devel/lib/clang/3.6.0/include/__wmmintrin_pclmul.h
-llvm-devel/lib/clang/3.6.0/include/adxintrin.h
-llvm-devel/lib/clang/3.6.0/include/altivec.h
-llvm-devel/lib/clang/3.6.0/include/ammintrin.h
-llvm-devel/lib/clang/3.6.0/include/arm_neon.h
-llvm-devel/lib/clang/3.6.0/include/avx2intrin.h
-llvm-devel/lib/clang/3.6.0/include/avx512bwintrin.h
-llvm-devel/lib/clang/3.6.0/include/avx512erintrin.h
-llvm-devel/lib/clang/3.6.0/include/avx512fintrin.h
-llvm-devel/lib/clang/3.6.0/include/avx512vlbwintrin.h
-llvm-devel/lib/clang/3.6.0/include/avx512vlintrin.h
-llvm-devel/lib/clang/3.6.0/include/avxintrin.h
-llvm-devel/lib/clang/3.6.0/include/bmi2intrin.h
-llvm-devel/lib/clang/3.6.0/include/bmiintrin.h
-llvm-devel/lib/clang/3.6.0/include/cpuid.h
-llvm-devel/lib/clang/3.6.0/include/emmintrin.h
-llvm-devel/lib/clang/3.6.0/include/f16cintrin.h
-llvm-devel/lib/clang/3.6.0/include/fma4intrin.h
-llvm-devel/lib/clang/3.6.0/include/fmaintrin.h
-llvm-devel/lib/clang/3.6.0/include/ia32intrin.h
-llvm-devel/lib/clang/3.6.0/include/immintrin.h
-llvm-devel/lib/clang/3.6.0/include/lzcntintrin.h
-llvm-devel/lib/clang/3.6.0/include/mm3dnow.h
-llvm-devel/lib/clang/3.6.0/include/mm_malloc.h
-llvm-devel/lib/clang/3.6.0/include/mmintrin.h
-llvm-devel/lib/clang/3.6.0/include/module.modulemap
-llvm-devel/lib/clang/3.6.0/include/nmmintrin.h
-llvm-devel/lib/clang/3.6.0/include/pmmintrin.h
-llvm-devel/lib/clang/3.6.0/include/popcntintrin.h
-llvm-devel/lib/clang/3.6.0/include/prfchwintrin.h
-llvm-devel/lib/clang/3.6.0/include/rdseedintrin.h
-llvm-devel/lib/clang/3.6.0/include/rtmintrin.h
-llvm-devel/lib/clang/3.6.0/include/shaintrin.h
-llvm-devel/lib/clang/3.6.0/include/smmintrin.h
-llvm-devel/lib/clang/3.6.0/include/tbmintrin.h
-llvm-devel/lib/clang/3.6.0/include/tmmintrin.h
-llvm-devel/lib/clang/3.6.0/include/wmmintrin.h
-llvm-devel/lib/clang/3.6.0/include/x86intrin.h
-llvm-devel/lib/clang/3.6.0/include/xmmintrin.h
-llvm-devel/lib/clang/3.6.0/include/xopintrin.h
+llvm-devel/lib/clang/3.7.0/include/__wmmintrin_aes.h
+llvm-devel/lib/clang/3.7.0/include/__wmmintrin_pclmul.h
+llvm-devel/lib/clang/3.7.0/include/adxintrin.h
+llvm-devel/lib/clang/3.7.0/include/altivec.h
+llvm-devel/lib/clang/3.7.0/include/ammintrin.h
+llvm-devel/lib/clang/3.7.0/include/arm_neon.h
+llvm-devel/lib/clang/3.7.0/include/avx2intrin.h
+llvm-devel/lib/clang/3.7.0/include/avx512bwintrin.h
+llvm-devel/lib/clang/3.7.0/include/avx512erintrin.h
+llvm-devel/lib/clang/3.7.0/include/avx512fintrin.h
+llvm-devel/lib/clang/3.7.0/include/avx512vlbwintrin.h
+llvm-devel/lib/clang/3.7.0/include/avx512vlintrin.h
+llvm-devel/lib/clang/3.7.0/include/avxintrin.h
+llvm-devel/lib/clang/3.7.0/include/bmi2intrin.h
+llvm-devel/lib/clang/3.7.0/include/bmiintrin.h
+llvm-devel/lib/clang/3.7.0/include/cpuid.h
+llvm-devel/lib/clang/3.7.0/include/emmintrin.h
+llvm-devel/lib/clang/3.7.0/include/f16cintrin.h
+llvm-devel/lib/clang/3.7.0/include/fma4intrin.h
+llvm-devel/lib/clang/3.7.0/include/fmaintrin.h
+llvm-devel/lib/clang/3.7.0/include/htmintrin.h
+llvm-devel/lib/clang/3.7.0/include/htmxlintrin.h
+llvm-devel/lib/clang/3.7.0/include/ia32intrin.h
+llvm-devel/lib/clang/3.7.0/include/immintrin.h
+llvm-devel/lib/clang/3.7.0/include/lzcntintrin.h
+llvm-devel/lib/clang/3.7.0/include/mm3dnow.h
+llvm-devel/lib/clang/3.7.0/include/mm_malloc.h
+llvm-devel/lib/clang/3.7.0/include/mmintrin.h
+llvm-devel/lib/clang/3.7.0/include/module.modulemap
+llvm-devel/lib/clang/3.7.0/include/nmmintrin.h
+llvm-devel/lib/clang/3.7.0/include/pmmintrin.h
+llvm-devel/lib/clang/3.7.0/include/popcntintrin.h
+llvm-devel/lib/clang/3.7.0/include/prfchwintrin.h
+llvm-devel/lib/clang/3.7.0/include/rdseedintrin.h
+llvm-devel/lib/clang/3.7.0/include/rtmintrin.h
+llvm-devel/lib/clang/3.7.0/include/s390intrin.h
+llvm-devel/lib/clang/3.7.0/include/shaintrin.h
+llvm-devel/lib/clang/3.7.0/include/smmintrin.h
+llvm-devel/lib/clang/3.7.0/include/tbmintrin.h
+llvm-devel/lib/clang/3.7.0/include/tmmintrin.h
+llvm-devel/lib/clang/3.7.0/include/wmmintrin.h
+llvm-devel/lib/clang/3.7.0/include/x86intrin.h
+llvm-devel/lib/clang/3.7.0/include/xmmintrin.h
+llvm-devel/lib/clang/3.7.0/include/xopintrin.h
 llvm-devel/lib/libclang.a
 llvm-devel/lib/libclang.so
 llvm-devel/lib/libclangARCMigrate.a