kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

clang-git: Rebase to current and drop merged patches

Browse source 
Sponsored by <The NetBSD Foundation>
This commit is contained in:
Kamil Rytarowski 2017-08-05 16:47:31 +02:00
parent 77a5a614d2
commit a213f8f9cc
5 changed files with 0 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clang-git/Makefile.common
View file

@ -6,7 +6,6 @@ CATEGORIES= lang devel
GIT_REPOSITORIES= clang
GIT_REPO.clang= git://github.com/llvm-mirror/clang.git
GIT_REVISION.clang= 58123a81df74bcd2051b11f77a6a38277764a0d7
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://clang.llvm.org/

3
clang-git/distinfo
View file

@ -12,7 +12,4 @@ 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_Driver_ToolChains_CommonArgs.cpp) = 285bbfc2cdc058e53e8160bd6aff1ce5298b76e5
SHA1 (patch-lib_Driver_ToolChains_NetBSD.cpp) = 6ddeadc54bed840bd7654ec602dfbd20b071f2d9
SHA1 (patch-lib_Driver_ToolChains_NetBSD.h) = 4891098cce9cab17e01924fa7ea3a9b7cff69b26
SHA1 (patch-tools_clang-format_CMakeLists.txt) = f119d2a94cbfb8c00a285d1aa7789ed26f8309cf

12
clang-git/patches/patch-lib_Driver_ToolChains_CommonArgs.cpp
View file

@ -1,12 +0,0 @@
$NetBSD$
--- lib/Driver/ToolChains/CommonArgs.cpp.orig 2017-07-02 16:11:01.135157051 +0000
+++ lib/Driver/ToolChains/CommonArgs.cpp
@@ -524,6 +524,7 @@ void tools::linkSanitizerRuntimeDeps(con
CmdArgs.push_back("-lm");
// 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)
CmdArgs.push_back("-ldl");
}

42
clang-git/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
View file

@ -1,42 +0,0 @@
$NetBSD$
--- lib/Driver/ToolChains/NetBSD.cpp.orig 2017-07-02 16:11:01.139600632 +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,12 @@ 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;
+ }
+ return Res;
+}

12
clang-git/patches/patch-lib_Driver_ToolChains_NetBSD.h
View file

@ -1,12 +0,0 @@
$NetBSD$
--- lib/Driver/ToolChains/NetBSD.h.orig 2017-07-02 16:11:01.139650639 +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;