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

llvm-netbsd: Upgrade to SVN r. 316591

Browse source 
This revision contains merged code for sanitizers/NetBSD.

https://reviews.llvm.org/D39124

Rediff local patches for upstream changes.

Sponsored by <The NetBSD Foundation>
This commit is contained in:
Kamil Rytarowski 2017-10-25 19:45:49 +02:00
parent 0f5020c75a
commit 4aef5cc892
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
llvm-netbsd/Makefile.common
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= 315927
SVN_REVISION.llvm= 316591
WRKSRC= ${WRKDIR}/llvm

4
llvm-netbsd/distinfo
View file

@ -1,6 +1,6 @@
$NetBSD$
SHA1 (patch-cmake_config-ix.cmake) = ba413c9c566cdc0aee351d6ec53f566de425799a
SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = ad230c1f0091f28451a29a11050588f412824e53
SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = 7dc1016433e88c397e066512f1909a0beae4d22e
SHA1 (patch-lib_Transforms_Instrumentation_InstrProfiling.cpp) = 871b474f415d9dc468cc07477101f88d7a20868b
SHA1 (patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp) = 64fdbb55c77d5f5f73152d2f8daa28adfc428e40
SHA1 (patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp) = c6487f23df920a2d049ba80e7224b32af55b5545

8
llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
View file

@ -1,16 +1,16 @@
$NetBSD$
--- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig 2017-08-28 22:11:31.000000000 +0000
--- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig 2017-10-25 17:03:37.916518801 +0000
+++ lib/Transforms/Instrumentation/AddressSanitizer.cpp
@@ -84,6 +84,7 @@ static const uint64_t kAArch64_ShadowOff
@@ -107,6 +107,7 @@ static const uint64_t kAArch64_ShadowOff
static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30;
static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46;
static const uint64_t kNetBSD_ShadowOffset64 = 1ULL << 46;
+static const uint64_t kNetBSDKasan_ShadowOffset64 = 0xdffffc0000000000;
static const uint64_t kPS4CPU_ShadowOffset64 = 1ULL << 40;
static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;
// The shadow memory space is dynamically allocated.
@@ -448,9 +449,12 @@ static ShadowMapping getShadowMapping(Tr
@@ -505,9 +506,12 @@ static ShadowMapping getShadowMapping(Tr
Mapping.Offset = kSystemZ_ShadowOffset64;
else if (IsFreeBSD)
Mapping.Offset = kFreeBSD_ShadowOffset64;

12
llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
View file

@ -1,8 +1,8 @@
$NetBSD$
--- lib/Transforms/Instrumentation/MemorySanitizer.cpp.orig 2017-06-12 00:24:36.000000000 +0000
--- lib/Transforms/Instrumentation/MemorySanitizer.cpp.orig 2017-10-25 17:03:32.656232584 +0000
+++ lib/Transforms/Instrumentation/MemorySanitizer.cpp
@@ -280,6 +280,14 @@ static const MemoryMapParams FreeBSD_X86
@@ -320,6 +320,14 @@ static const MemoryMapParams FreeBSD_X86
0x380000000000, // OriginBase
};
@ -17,7 +17,7 @@ $NetBSD$
static const PlatformMemoryMapParams Linux_X86_MemoryMapParams = {
&Linux_I386_MemoryMapParams,
&Linux_X86_64_MemoryMapParams,
@@ -305,6 +313,11 @@ static const PlatformMemoryMapParams Fre
@@ -345,6 +353,11 @@ static const PlatformMemoryMapParams Fre
&FreeBSD_X86_64_MemoryMapParams,
};
@ -26,10 +26,10 @@ $NetBSD$
+ &NetBSD_X86_64_MemoryMapParams,
+};
+
namespace {
/// \brief An instrumentation pass implementing detection of uninitialized
/// reads.
///
@@ -515,6 +528,15 @@ bool MemorySanitizer::doInitialization(M
@@ -577,6 +590,15 @@ bool MemorySanitizer::doInitialization(M
report_fatal_error("unsupported architecture");
}
break;