llvm-netbsd: Update to SVN r. 320228

Eliminate local patch, merged upstream:

Register NetBSD/x86_64 in MemorySanitizer.cpp
https://reviews.llvm.org/D41022

Sponsored by <The NetBSD Foundation>
This commit is contained in:
Kamil Rytarowski 2017-12-09 01:49:32 +01:00
parent fa918d2be9
commit c15225297c
3 changed files with 1 additions and 49 deletions

View File

@ -19,7 +19,7 @@ CATEGORIES= lang devel
SVN_REPOSITORIES= llvm
SVN_REPO.llvm= http://llvm.org/svn/llvm-project/llvm/trunk
SVN_REVISION.llvm= 320165
SVN_REVISION.llvm= 320228
WRKSRC= ${WRKDIR}/llvm

View File

@ -3,4 +3,3 @@ $NetBSD$
SHA1 (patch-cmake_config-ix.cmake) = 55f484948dfb3293917ede3144d7c83f78c555b3
SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = 239ca19d58c644a3eeed3387b03b95aeceeac8ba
SHA1 (patch-lib_Transforms_Instrumentation_InstrProfiling.cpp) = 653876deaaecb4aff8fd052d45da7c6516e876fc
SHA1 (patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp) = 06d6d61b3f73ff866db8f8a31af8f038a338980f

View File

@ -1,47 +0,0 @@
$NetBSD$
--- lib/Transforms/Instrumentation/MemorySanitizer.cpp.orig 2017-12-08 18:49:42.329089043 +0000
+++ lib/Transforms/Instrumentation/MemorySanitizer.cpp
@@ -320,6 +320,14 @@ static const MemoryMapParams FreeBSD_X86
0x380000000000, // OriginBase
};
+// x86_64 NetBSD
+static const MemoryMapParams NetBSD_X86_64_MemoryMapParams = {
+ 0, // AndMask
+ 0x500000000000, // XorMask
+ 0, // ShadowBase
+ 0x100000000000, // OriginBase
+};
+
static const PlatformMemoryMapParams Linux_X86_MemoryMapParams = {
&Linux_I386_MemoryMapParams,
&Linux_X86_64_MemoryMapParams,
@@ -345,6 +353,11 @@ static const PlatformMemoryMapParams Fre
&FreeBSD_X86_64_MemoryMapParams,
};
+static const PlatformMemoryMapParams NetBSD_X86_MemoryMapParams = {
+ nullptr,
+ &NetBSD_X86_64_MemoryMapParams,
+};
+
namespace {
/// \brief An instrumentation pass implementing detection of uninitialized
@@ -577,6 +590,15 @@ bool MemorySanitizer::doInitialization(M
report_fatal_error("unsupported architecture");
}
break;
+ case Triple::NetBSD:
+ switch (TargetTriple.getArch()) {
+ case Triple::x86_64:
+ MapParams = NetBSD_X86_MemoryMapParams.bits64;
+ break;
+ default:
+ report_fatal_error("unsupported architecture");
+ }
+ break;
case Triple::Linux:
switch (TargetTriple.getArch()) {
case Triple::x86_64: