4 files changed, 47 insertions, 48 deletions

diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 95ec3e667fff..cbc4df830326 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	clang
-PORTVERSION=	3.5.r${SVN_REV}
+PORTVERSION=	3.6.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 2b0077f6217e..491c0b7d33ee 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.5.r211638.tar.bz2) = dbd0c8deb2e989cbc3127528f0687a744b1dce70b24eb8fb016fde7df86237e8
-SIZE (clang-3.5.r211638.tar.bz2) = 8967411
-SHA256 (llvm-3.5.r211638.tar.bz2) = 8ea2dd01388ab59734c223052dc7c6e971ffced94df918a7684a96b46a4bd4ed
-SIZE (llvm-3.5.r211638.tar.bz2) = 13269862
+SHA256 (clang-3.6.r216160.tar.bz2) = 1d383becbde1aea79528f63ce13587c4c7f9d021f0a531574f0eaaa816db76d1
+SIZE (clang-3.6.r216160.tar.bz2) = 9165471
+SHA256 (llvm-3.6.r216160.tar.bz2) = ee6707ff2a62edb0cbf70421330054c6323fdb257320eb7e9e3b420f4cad0534
+SIZE (llvm-3.6.r216160.tar.bz2) = 13714057
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp
index bb0f833e5a30..a258b6acfe09 100644
--- a/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp
+++ b/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp
@@ -3,12 +3,11 @@ $FreeBSD$
 
 --- tools/clang/lib/Basic/Targets.cpp.orig
 +++ tools/clang/lib/Basic/Targets.cpp
-@@ -4981,6 +4981,8 @@
+@@ -5723,6 +5723,7 @@
      LongDoubleWidth = LongDoubleAlign = 128;
      LongDoubleFormat = &llvm::APFloat::IEEEquad;
      if (getTriple().getOS() == llvm::Triple::FreeBSD) {
 +      IntMaxType = SignedLong;
-+      UIntMaxType = UnsignedLong;
        LongDoubleWidth = LongDoubleAlign = 64;
        LongDoubleFormat = &llvm::APFloat::IEEEdouble;
      }
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index 53eb00fe703b..e7a141663a8f 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -134,6 +134,7 @@ llvm-devel/include/clang/ASTMatchers/Dynamic/Registry.h
 llvm-devel/include/clang/ASTMatchers/Dynamic/VariantValue.h
 llvm-devel/include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
 llvm-devel/include/clang/Analysis/Analyses/Consumed.h
+llvm-devel/include/clang/Analysis/Analyses/DataflowWorklist.h
 llvm-devel/include/clang/Analysis/Analyses/Dominators.h
 llvm-devel/include/clang/Analysis/Analyses/FormatString.h
 llvm-devel/include/clang/Analysis/Analyses/LiveVariables.h
@@ -246,8 +247,6 @@ llvm-devel/include/clang/CodeGen/CodeGenAction.h
 llvm-devel/include/clang/CodeGen/ModuleBuilder.h
 llvm-devel/include/clang/Config/config.h
 llvm-devel/include/clang/Driver/Action.h
-llvm-devel/include/clang/Driver/CC1AsOptions.h
-llvm-devel/include/clang/Driver/CC1AsOptions.inc
 llvm-devel/include/clang/Driver/Compilation.h
 llvm-devel/include/clang/Driver/Driver.h
 llvm-devel/include/clang/Driver/DriverDiagnostic.h
@@ -271,7 +270,6 @@ llvm-devel/include/clang/Format/Format.h
 llvm-devel/include/clang/Frontend/ASTConsumers.h
 llvm-devel/include/clang/Frontend/ASTUnit.h
 llvm-devel/include/clang/Frontend/ChainedDiagnosticConsumer.h
-llvm-devel/include/clang/Frontend/ChainedIncludesSource.h
 llvm-devel/include/clang/Frontend/CodeGenOptions.def
 llvm-devel/include/clang/Frontend/CodeGenOptions.h
 llvm-devel/include/clang/Frontend/CommandLineSourceLoc.h
@@ -444,41 +442,43 @@ 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.5.0/include/__wmmintrin_aes.h
-llvm-devel/lib/clang/3.5.0/include/__wmmintrin_pclmul.h
-llvm-devel/lib/clang/3.5.0/include/altivec.h
-llvm-devel/lib/clang/3.5.0/include/ammintrin.h
-llvm-devel/lib/clang/3.5.0/include/arm_neon.h
-llvm-devel/lib/clang/3.5.0/include/avx2intrin.h
-llvm-devel/lib/clang/3.5.0/include/avxintrin.h
-llvm-devel/lib/clang/3.5.0/include/bmi2intrin.h
-llvm-devel/lib/clang/3.5.0/include/bmiintrin.h
-llvm-devel/lib/clang/3.5.0/include/cpuid.h
-llvm-devel/lib/clang/3.5.0/include/emmintrin.h
-llvm-devel/lib/clang/3.5.0/include/f16cintrin.h
-llvm-devel/lib/clang/3.5.0/include/fma4intrin.h
-llvm-devel/lib/clang/3.5.0/include/fmaintrin.h
-llvm-devel/lib/clang/3.5.0/include/ia32intrin.h
-llvm-devel/lib/clang/3.5.0/include/immintrin.h
-llvm-devel/lib/clang/3.5.0/include/lzcntintrin.h
-llvm-devel/lib/clang/3.5.0/include/mm3dnow.h
-llvm-devel/lib/clang/3.5.0/include/mm_malloc.h
-llvm-devel/lib/clang/3.5.0/include/mmintrin.h
-llvm-devel/lib/clang/3.5.0/include/module.modulemap
-llvm-devel/lib/clang/3.5.0/include/nmmintrin.h
-llvm-devel/lib/clang/3.5.0/include/pmmintrin.h
-llvm-devel/lib/clang/3.5.0/include/popcntintrin.h
-llvm-devel/lib/clang/3.5.0/include/prfchwintrin.h
-llvm-devel/lib/clang/3.5.0/include/rdseedintrin.h
-llvm-devel/lib/clang/3.5.0/include/rtmintrin.h
-llvm-devel/lib/clang/3.5.0/include/shaintrin.h
-llvm-devel/lib/clang/3.5.0/include/smmintrin.h
-llvm-devel/lib/clang/3.5.0/include/tbmintrin.h
-llvm-devel/lib/clang/3.5.0/include/tmmintrin.h
-llvm-devel/lib/clang/3.5.0/include/wmmintrin.h
-llvm-devel/lib/clang/3.5.0/include/x86intrin.h
-llvm-devel/lib/clang/3.5.0/include/xmmintrin.h
-llvm-devel/lib/clang/3.5.0/include/xopintrin.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/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/avx512erintrin.h
+llvm-devel/lib/clang/3.6.0/include/avx512fintrin.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/libclang.a
 llvm-devel/lib/libclang.so
 llvm-devel/lib/libclangARCMigrate.a
@@ -496,7 +496,7 @@ llvm-devel/lib/libclangFrontendTool.a
 llvm-devel/lib/libclangIndex.a
 llvm-devel/lib/libclangLex.a
 llvm-devel/lib/libclangParse.a
-llvm-devel/lib/libclangRewriteCore.a
+llvm-devel/lib/libclangRewrite.a
 llvm-devel/lib/libclangRewriteFrontend.a
 llvm-devel/lib/libclangSema.a
 llvm-devel/lib/libclangSerialization.a
@@ -508,8 +508,8 @@ man/man1/clang-devel.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/clang.html
 %%PORTDOCS%%%%DOCSDIR%%/html/clang/manpage.css
 %%PORTDOCS%%%%DOCSDIR%%/ps/clang.ps
-@dirrm llvm-devel/lib/clang/3.5.0/include
-@dirrm llvm-devel/lib/clang/3.5.0
+@dirrm llvm-devel/lib/clang/3.6.0/include
+@dirrm llvm-devel/lib/clang/3.6.0
 @dirrm llvm-devel/lib/clang
 @dirrm llvm-devel/include/clang/Tooling
 @dirrm llvm-devel/include/clang/StaticAnalyzer/Frontend