clang-netbsd: Update to SVN r. 308868

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Jul 24 15:58:40 2017 +0200
Changeset:	e907dac144afbdce0742623edee78fc0dcf0cab8

Modified Files:
	clang-netbsd/Makefile
	clang-netbsd/Makefile.common
	clang-netbsd/PLIST
	clang-netbsd/distinfo
	clang-netbsd/patches/patch-lib_Basic_Targets.cpp
Added Files:
	clang-netbsd/patches/patch-lib_Basic_Targets_OSTargets.h

Log Message:
clang-netbsd: Update to SVN r. 308868

Rebase patches to clang6.0.0

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e907dac144afbdce0742623edee78fc0dcf0cab8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 clang-netbsd/Makefile                              |  2 +-
 clang-netbsd/Makefile.common                       |  2 +-
 clang-netbsd/PLIST                                 |  6 ++++-
 clang-netbsd/distinfo                              |  3 ++-
 clang-netbsd/patches/patch-lib_Basic_Targets.cpp   | 27 --------------------
 .../patches/patch-lib_Basic_Targets_OSTargets.h    | 29 ++++++++++++++++++++++
 6 files changed, 38 insertions(+), 31 deletions(-)

diffs:
diff --git a/clang-netbsd/Makefile b/clang-netbsd/Makefile
index 78d38ca973..62584aa98f 100644
--- a/clang-netbsd/Makefile
+++ b/clang-netbsd/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKGNAME=	clang-5.0.0
+PKGNAME=	clang-6.0.0
 PYTHON_FOR_BUILD_ONLY=	yes
 
 CMAKE_ARGS+=	-DCLANG_ENABLE_STATIC_ANALYZER=OFF
diff --git a/clang-netbsd/Makefile.common b/clang-netbsd/Makefile.common
index 317b42e5f1..0c6dd454a5 100644
--- a/clang-netbsd/Makefile.common
+++ b/clang-netbsd/Makefile.common
@@ -6,7 +6,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=	clang
 SVN_REPO.clang=		http://llvm.org/svn/llvm-project/cfe/trunk
-SVN_REVISION.clang=	308147
+SVN_REVISION.clang=	308868
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://clang.llvm.org/
diff --git a/clang-netbsd/PLIST b/clang-netbsd/PLIST
index bc752b95d6..009ad8563e 100644
--- a/clang-netbsd/PLIST
+++ b/clang-netbsd/PLIST
@@ -157,6 +157,7 @@ include/clang/Analysis/ProgramPoint.h
 include/clang/Analysis/Support/BumpVector.h
 include/clang/Basic/ABI.h
 include/clang/Basic/AddressSpaces.h
+include/clang/Basic/AlignedAllocation.h
 include/clang/Basic/AllDiagnostics.h
 include/clang/Basic/AttrHasAttributeImpl.inc
 include/clang/Basic/AttrKinds.h
@@ -476,6 +477,8 @@ include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h
 include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
 include/clang/StaticAnalyzer/Frontend/FrontendActions.h
 include/clang/StaticAnalyzer/Frontend/ModelConsumer.h
+include/clang/Tooling/ASTDiff/ASTDiff.h
+include/clang/Tooling/ASTDiff/ASTDiffInternal.h
 include/clang/Tooling/ArgumentsAdjusters.h
 include/clang/Tooling/CommonOptionsParser.h
 include/clang/Tooling/CompilationDatabase.h
@@ -599,7 +602,7 @@ lib/cmake/clang/ClangTargets-release.cmake
 lib/cmake/clang/ClangTargets.cmake
 lib/libclang.${SOEXT}
 ${PLIST.notdylib}lib/libclang.${SOEXT}.${LLVM_MAJOR}
-lib/libclang.${SOEXT}.5
+lib/libclang.${SOEXT}.6
 lib/libclangAST.a
 lib/libclangASTMatchers.a
 lib/libclangAnalysis.a
@@ -619,6 +622,7 @@ lib/libclangRewriteFrontend.a
 lib/libclangSema.a
 lib/libclangSerialization.a
 lib/libclangTooling.a
+lib/libclangToolingASTDiff.a
 lib/libclangToolingCore.a
 lib/libclangToolingRefactor.a
 share/clang/bash-autocomplete.sh
diff --git a/clang-netbsd/distinfo b/clang-netbsd/distinfo
index edbf0e4002..2bd68b104f 100644
--- a/clang-netbsd/distinfo
+++ b/clang-netbsd/distinfo
@@ -12,7 +12,8 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
 SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
 RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
-SHA1 (patch-lib_Basic_Targets.cpp) = 7b2e13a71f2b09c3f7336f21371637d3e39e4043
+SHA1 (patch-lib_Basic_Targets.cpp) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
+SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 6af7531d9cdc39037d8b0fb0c734cfba75922fc7
 SHA1 (patch-lib_Driver_ToolChains_CommonArgs.cpp) = 0319867c1a10db204d9ad6aa2a9d495503ee9395
 SHA1 (patch-lib_Driver_ToolChains_Gnu.cpp) = 241c603172fffe6bc8ef3a3733bd3f42c19abbf1
 SHA1 (patch-test_Sema_128bitfloat.cpp) = cc11582dd9495b603a22ef73609ab04f65324da2
diff --git a/clang-netbsd/patches/patch-lib_Basic_Targets.cpp b/clang-netbsd/patches/patch-lib_Basic_Targets.cpp
index 481e9133a9..afc76512f4 100644
--- a/clang-netbsd/patches/patch-lib_Basic_Targets.cpp
+++ b/clang-netbsd/patches/patch-lib_Basic_Targets.cpp
@@ -1,29 +1,2 @@
 $NetBSD$
 
---- lib/Basic/Targets.cpp.orig	2017-05-31 16:58:37.000000000 +0000
-+++ lib/Basic/Targets.cpp
-@@ -514,6 +514,8 @@ protected:
-     Builder.defineMacro("__ELF__");
-     if (Opts.POSIXThreads)
-       Builder.defineMacro("_REENTRANT");
-+    if (this->HasFloat128)
-+      Builder.defineMacro("__FLOAT128__");
- 
-     switch (Triple.getArch()) {
-     default:
-@@ -530,6 +532,15 @@ public:
-   NetBSDTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
-       : OSTargetInfo<Target>(Triple, Opts) {
-     this->MCountName = "_mcount";
-+
-+    switch (Triple.getArch()) {
-+    default:
-+      break;
-+    case llvm::Triple::x86:
-+    case llvm::Triple::x86_64:
-+      this->HasFloat128 = true;
-+      break;
-+    }
-   }
- };
- 
diff --git a/clang-netbsd/patches/patch-lib_Basic_Targets_OSTargets.h b/clang-netbsd/patches/patch-lib_Basic_Targets_OSTargets.h
new file mode 100644
index 0000000000..b4cdf8adf1
--- /dev/null
+++ b/clang-netbsd/patches/patch-lib_Basic_Targets_OSTargets.h
@@ -0,0 +1,29 @@
+$NetBSD$
+
+--- lib/Basic/Targets/OSTargets.h.orig	2017-07-24 13:42:56.662132868 +0000
++++ lib/Basic/Targets/OSTargets.h
+@@ -365,6 +365,8 @@ protected:
+     Builder.defineMacro("__ELF__");
+     if (Opts.POSIXThreads)
+       Builder.defineMacro("_REENTRANT");
++    if (this->HasFloat128)
++      Builder.defineMacro("__FLOAT128__");
+ 
+     switch (Triple.getArch()) {
+     default:
+@@ -382,6 +384,15 @@ public:
+   NetBSDTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts)
+       : OSTargetInfo<Target>(Triple, Opts) {
+     this->MCountName = "_mcount";
++
++    switch (Triple.getArch()) {
++    default:
++      break;
++    case llvm::Triple::x86:
++    case llvm::Triple::x86_64:
++      this->HasFloat128 = true;
++      break;
++    }
+   }
+ };
+