clang-netbsd: update to newer snapshot.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: clang-netbsd: update to newer snapshot.
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Sun, 16 Jul 2017 21:25:26 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Jul 16 23:25:26 2017 +0200
Changeset:	e74f85241592842c89ed9810139bcde6acb01fd9

Modified Files:
	clang-netbsd/Makefile.common
	clang-netbsd/PLIST
	clang-netbsd/distinfo
	clang-netbsd/patches/patch-lib_Driver_ToolChains_CommonArgs.cpp
Removed Files:
	clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
	clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.h

Log Message:
clang-netbsd: update to newer snapshot.

Fixes build on NetBSD. Integrates some patches.

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

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

diffstat:
 clang-netbsd/Makefile.common                       |  2 +-
 clang-netbsd/PLIST                                 |  7 ++++
 clang-netbsd/distinfo                              |  4 +-
 .../patch-lib_Driver_ToolChains_CommonArgs.cpp     |  6 +--
 .../patches/patch-lib_Driver_ToolChains_NetBSD.cpp | 47 ----------------------
 .../patches/patch-lib_Driver_ToolChains_NetBSD.h   | 12 ------
 6 files changed, 12 insertions(+), 66 deletions(-)

diffs:
diff --git a/clang-netbsd/Makefile.common b/clang-netbsd/Makefile.common
index fcc3445534..516b329528 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=	306751
+SVN_REVISION.clang=	307789
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://clang.llvm.org/
diff --git a/clang-netbsd/PLIST b/clang-netbsd/PLIST
index 6d382aa45b..163228c633 100644
--- a/clang-netbsd/PLIST
+++ b/clang-netbsd/PLIST
@@ -8,6 +8,7 @@ bin/clang-cpp
 bin/clang-format
 bin/clang-import-test
 bin/clang-offload-bundler
+bin/clang-rename
 include/clang-c/BuildSystem.h
 include/clang-c/CXCompilationDatabase.h
 include/clang-c/CXErrorCode.h
@@ -489,6 +490,10 @@ include/clang/Tooling/FixIt.h
 include/clang/Tooling/JSONCompilationDatabase.h
 include/clang/Tooling/Refactoring.h
 include/clang/Tooling/Refactoring/AtomicChange.h
+include/clang/Tooling/Refactoring/Rename/RenamingAction.h
+include/clang/Tooling/Refactoring/Rename/USRFinder.h
+include/clang/Tooling/Refactoring/Rename/USRFindingAction.h
+include/clang/Tooling/Refactoring/Rename/USRLocFinder.h
 include/clang/Tooling/RefactoringCallbacks.h
 include/clang/Tooling/ReplacementsYaml.h
 include/clang/Tooling/Tooling.h
@@ -621,4 +626,6 @@ share/clang/clang-format-diff.py
 share/clang/clang-format-sublime.py
 share/clang/clang-format.el
 share/clang/clang-format.py
+share/clang/clang-rename.el
+share/clang/clang-rename.py
 share/clang/git-clang-format
diff --git a/clang-netbsd/distinfo b/clang-netbsd/distinfo
index fa2f2576c3..edbf0e4002 100644
--- a/clang-netbsd/distinfo
+++ b/clang-netbsd/distinfo
@@ -13,10 +13,8 @@ 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_Driver_ToolChains_CommonArgs.cpp) = 9454e8f55ae3445bceabb4f33f80c86a616aeb60
+SHA1 (patch-lib_Driver_ToolChains_CommonArgs.cpp) = 0319867c1a10db204d9ad6aa2a9d495503ee9395
 SHA1 (patch-lib_Driver_ToolChains_Gnu.cpp) = 241c603172fffe6bc8ef3a3733bd3f42c19abbf1
-SHA1 (patch-lib_Driver_ToolChains_NetBSD.cpp) = b126befb17c6c9c4794cf124adffcb2d069f4498
-SHA1 (patch-lib_Driver_ToolChains_NetBSD.h) = 965f5c1a64461bbd3ea446148796e2dbddc2c9ca
 SHA1 (patch-test_Sema_128bitfloat.cpp) = cc11582dd9495b603a22ef73609ab04f65324da2
 SHA1 (patch-tools_clang-format_CMakeLists.txt) = f119d2a94cbfb8c00a285d1aa7789ed26f8309cf
 SHA1 (patch-unittests_ASTMatchers_Dynamic_RegistryTest.cpp) = 27a198a0efe237497f97e1903df5e8303e02745d
diff --git a/clang-netbsd/patches/patch-lib_Driver_ToolChains_CommonArgs.cpp b/clang-netbsd/patches/patch-lib_Driver_ToolChains_CommonArgs.cpp
index ca0499493a..42aa6aa0c8 100644
--- a/clang-netbsd/patches/patch-lib_Driver_ToolChains_CommonArgs.cpp
+++ b/clang-netbsd/patches/patch-lib_Driver_ToolChains_CommonArgs.cpp
@@ -1,11 +1,11 @@
 $NetBSD$
 
---- lib/Driver/ToolChains/CommonArgs.cpp.orig	2017-06-12 12:55:07.000000000 +0000
+--- lib/Driver/ToolChains/CommonArgs.cpp.orig	2017-07-16 20:46:13.000000000 +0000
 +++ lib/Driver/ToolChains/CommonArgs.cpp
-@@ -505,7 +505,8 @@ void tools::linkSanitizerRuntimeDeps(con
-   CmdArgs.push_back("-lm");
+@@ -525,7 +525,8 @@ void tools::linkSanitizerRuntimeDeps(con
    // There's no libdl on FreeBSD or RTEMS.
    if (TC.getTriple().getOS() != llvm::Triple::FreeBSD &&
+       TC.getTriple().getOS() != llvm::Triple::NetBSD &&
 -      TC.getTriple().getOS() != llvm::Triple::RTEMS)
 +      TC.getTriple().getOS() != llvm::Triple::RTEMS &&
 +      TC.getTriple().getOS() != llvm::Triple::NetBSD)
diff --git a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp b/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
deleted file mode 100644
index 532d10a5de..0000000000
--- a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD$
-
---- lib/Driver/ToolChains/NetBSD.cpp.orig	2017-03-18 00:58:03.000000000 +0000
-+++ lib/Driver/ToolChains/NetBSD.cpp
-@@ -15,6 +15,7 @@
- #include "clang/Driver/Compilation.h"
- #include "clang/Driver/Driver.h"
- #include "clang/Driver/Options.h"
-+#include "clang/Driver/SanitizerArgs.h"
- #include "llvm/Option/ArgList.h"
- 
- using namespace clang::driver;
-@@ -246,6 +247,7 @@ void netbsd::Linker::ConstructJob(Compil
-   Args.AddAllArgs(CmdArgs, options::OPT_Z_Flag);
-   Args.AddAllArgs(CmdArgs, options::OPT_r);
- 
-+  bool NeedsSanitizerDeps = addSanitizerRuntimes(getToolChain(), Args, CmdArgs);
-   AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
- 
-   unsigned Major, Minor, Micro;
-@@ -279,6 +281,8 @@ void netbsd::Linker::ConstructJob(Compil
-       getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
-       CmdArgs.push_back("-lm");
-     }
-+    if (NeedsSanitizerDeps)
-+      linkSanitizerRuntimeDeps(getToolChain(), CmdArgs);
-     if (Args.hasArg(options::OPT_pthread))
-       CmdArgs.push_back("-lpthread");
-     CmdArgs.push_back("-lc");
-@@ -410,3 +414,17 @@ void NetBSD::addLibStdCxxIncludePaths(co
-   addLibStdCXXIncludePaths(getDriver().SysRoot, "/usr/include/g++", "", "", "",
-                            "", DriverArgs, CC1Args);
- }
-+
-+SanitizerMask NetBSD::getSupportedSanitizers() const {
-+  const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64;
-+  SanitizerMask Res = ToolChain::getSupportedSanitizers();
-+  if (IsX86_64) {
-+    Res |= SanitizerKind::Address;
-+    Res |= SanitizerKind::Vptr;
-+    Res |= SanitizerKind::Leak;
-+    Res |= SanitizerKind::Thread;
-+    Res |= SanitizerKind::SafeStack;
-+    Res |= SanitizerKind::Memory;
-+  }
-+  return Res;
-+}
diff --git a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.h b/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.h
deleted file mode 100644
index 3083e99916..0000000000
--- a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- lib/Driver/ToolChains/NetBSD.h.orig	2017-03-18 00:58:03.000000000 +0000
-+++ lib/Driver/ToolChains/NetBSD.h
-@@ -66,6 +66,7 @@ public:
-       llvm::opt::ArgStringList &CC1Args) const override;
- 
-   bool IsUnwindTablesDefault() const override { return true; }
-+  SanitizerMask getSupportedSanitizers() const override;
- 
- protected:
-   Tool *buildAssembler() const override;
Prev by Date: py-hangups: adjust py-aiohttp dependency (moved to www/)
Next by Date: libretro-mednafen-saturn: Update to 20170716 - Added AutoRTC BIOS clock and language settings.
Previous by Thread: py-hangups: adjust py-aiohttp dependency (moved to www/)
Next by Thread: libretro-mednafen-saturn: Update to 20170716 - Added AutoRTC BIOS clock and language settings.
Indexes:
Home | Main Index | Thread Index | Old Index