pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

llvm-netbsd: Update to SVN r. 320228



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Dec 9 01:49:32 2017 +0100
Changeset:	c15225297c0ee8edb3b18d1390e8a5fdbb6d25ff

Modified Files:
	llvm-netbsd/Makefile.common
	llvm-netbsd/distinfo
Removed Files:
	llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp

Log Message:
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>

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

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

diffstat:
 llvm-netbsd/Makefile.common                        |  2 +-
 llvm-netbsd/distinfo                               |  1 -
 ..._Transforms_Instrumentation_MemorySanitizer.cpp | 47 ----------------------
 3 files changed, 1 insertion(+), 49 deletions(-)

diffs:
diff --git a/llvm-netbsd/Makefile.common b/llvm-netbsd/Makefile.common
index b123e61313..67affdf34c 100644
--- a/llvm-netbsd/Makefile.common
+++ b/llvm-netbsd/Makefile.common
@@ -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
 
diff --git a/llvm-netbsd/distinfo b/llvm-netbsd/distinfo
index e6048201f5..48315cf744 100644
--- a/llvm-netbsd/distinfo
+++ b/llvm-netbsd/distinfo
@@ -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
diff --git a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
deleted file mode 100644
index ff10704e5f..0000000000
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
+++ /dev/null
@@ -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:


Home | Main Index | Thread Index | Old Index