*-netbsd: Update LLVM projects to SVN r.305692

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: *-netbsd: Update LLVM projects to SVN r.305692
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Mon, 19 Jun 2017 17:54:19 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Jun 19 19:54:19 2017 +0200
Changeset:	cca4440df90d7f3bc5a4483c0b0755ebd46b917a

Modified Files:
	clang-netbsd/Makefile.common
	compiler-rt-netbsd/Makefile
	lldb-netbsd/Makefile
	llvm-netbsd/Makefile.common
	llvm-netbsd/PLIST
	llvm-netbsd/distinfo
Removed Files:
	llvm-netbsd/patches/patch-include_llvm_Support_Memory.h
	llvm-netbsd/patches/patch-lib_Support_Unix_Memory.inc

Log Message:
*-netbsd: Update LLVM projects to SVN r.305692

This revision incorporates LLVM upstream patch merged for RWX allocations
on NetBSD.

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=cca4440df90d7f3bc5a4483c0b0755ebd46b917a

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 +-
 compiler-rt-netbsd/Makefile                        |  2 +-
 lldb-netbsd/Makefile                               |  2 +-
 llvm-netbsd/Makefile.common                        |  2 +-
 llvm-netbsd/PLIST                                  |  3 +-
 llvm-netbsd/distinfo                               |  2 -
 .../patches/patch-include_llvm_Support_Memory.h    | 25 ---------
 .../patches/patch-lib_Support_Unix_Memory.inc      | 64 ----------------------
 8 files changed, 5 insertions(+), 97 deletions(-)

diffs:
diff --git a/clang-netbsd/Makefile.common b/clang-netbsd/Makefile.common
index d9604f8cd2..b856a9a11f 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=	305636
+SVN_REVISION.clang=	305692
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://clang.llvm.org/
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 415953df25..cda921db6c 100644
--- a/compiler-rt-netbsd/Makefile
+++ b/compiler-rt-netbsd/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=	compiler-rt
 SVN_REPO.compiler-rt=	http://llvm.org/svn/llvm-project/compiler-rt/trunk
-SVN_REVISION.compiler-rt=	305636
+SVN_REVISION.compiler-rt=	305692
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://compiler-rt.llvm.org/
diff --git a/lldb-netbsd/Makefile b/lldb-netbsd/Makefile
index 824f9b4bff..b2cb4719ea 100644
--- a/lldb-netbsd/Makefile
+++ b/lldb-netbsd/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=	lldb
 SVN_REPO.lldb=		http://llvm.org/svn/llvm-project/lldb/trunk
-SVN_REVISION.lldb=	305636
+SVN_REVISION.lldb=	305692
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://lldb.org/
diff --git a/llvm-netbsd/Makefile.common b/llvm-netbsd/Makefile.common
index 746091f939..89464ad3a3 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=	305636
+SVN_REVISION.llvm=	305692
 
 WRKSRC=			${WRKDIR}/llvm
 
diff --git a/llvm-netbsd/PLIST b/llvm-netbsd/PLIST
index 9be24ac7c7..056145dd6a 100644
--- a/llvm-netbsd/PLIST
+++ b/llvm-netbsd/PLIST
@@ -358,6 +358,7 @@ include/llvm/CodeGen/MachineSSAUpdater.h
 include/llvm/CodeGen/MachineScheduler.h
 include/llvm/CodeGen/MachineTraceMetrics.h
 include/llvm/CodeGen/MachineValueType.h
+include/llvm/CodeGen/MacroFusion.h
 include/llvm/CodeGen/PBQP/CostAllocator.h
 include/llvm/CodeGen/PBQP/Graph.h
 include/llvm/CodeGen/PBQP/Math.h
@@ -444,8 +445,6 @@ include/llvm/DebugInfo/CodeView/SymbolVisitorCallbackPipeline.h
 include/llvm/DebugInfo/CodeView/SymbolVisitorCallbacks.h
 include/llvm/DebugInfo/CodeView/SymbolVisitorDelegate.h
 include/llvm/DebugInfo/CodeView/TypeCollection.h
-include/llvm/DebugInfo/CodeView/TypeDatabase.h
-include/llvm/DebugInfo/CodeView/TypeDatabaseVisitor.h
 include/llvm/DebugInfo/CodeView/TypeDeserializer.h
 include/llvm/DebugInfo/CodeView/TypeDumpVisitor.h
 include/llvm/DebugInfo/CodeView/TypeIndex.h
diff --git a/llvm-netbsd/distinfo b/llvm-netbsd/distinfo
index b61f7fa83c..7931384fd5 100644
--- a/llvm-netbsd/distinfo
+++ b/llvm-netbsd/distinfo
@@ -12,5 +12,3 @@ 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-include_llvm_Support_Memory.h) = 8828c30722635d2db04f886383d3ce910adb88a0
-SHA1 (patch-lib_Support_Unix_Memory.inc) = f6e3d81caa1d9575cd5868472808713fc2434e0f
diff --git a/llvm-netbsd/patches/patch-include_llvm_Support_Memory.h b/llvm-netbsd/patches/patch-include_llvm_Support_Memory.h
deleted file mode 100644
index e9229e52ef..0000000000
--- a/llvm-netbsd/patches/patch-include_llvm_Support_Memory.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- include/llvm/Support/Memory.h.orig	2016-12-16 22:50:53.000000000 +0000
-+++ include/llvm/Support/Memory.h
-@@ -28,14 +28,16 @@ namespace sys {
-   /// @brief Memory block abstraction.
-   class MemoryBlock {
-   public:
--    MemoryBlock() : Address(nullptr), Size(0) { }
--    MemoryBlock(void *addr, size_t size) : Address(addr), Size(size) { }
-+    MemoryBlock() : Address(nullptr), SecondaryAddress(nullptr), Size(0) { }
-+    MemoryBlock(void *addr, size_t size)
-+        : Address(addr), SecondaryAddress(nullptr), Size(size) {}
-     void *base() const { return Address; }
-     size_t size() const { return Size; }
- 
-   private:
--    void *Address;    ///< Address of first byte of memory area
--    size_t Size;      ///< Size, in bytes of the memory area
-+    void *Address;          ///< Address of first byte of memory area
-+    void *SecondaryAddress; ///< Secondary address of first byte of memory area
-+    size_t Size;            ///< Size, in bytes of the memory area
-     friend class Memory;
-   };
- 
diff --git a/llvm-netbsd/patches/patch-lib_Support_Unix_Memory.inc b/llvm-netbsd/patches/patch-lib_Support_Unix_Memory.inc
deleted file mode 100644
index bb4c8fd62f..0000000000
--- a/llvm-netbsd/patches/patch-lib_Support_Unix_Memory.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD$
-
---- lib/Support/Unix/Memory.inc.orig	2016-12-16 22:52:53.000000000 +0000
-+++ lib/Support/Unix/Memory.inc
-@@ -195,9 +195,10 @@ Memory::AllocateRWX(size_t NumBytes, con
- #if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
-   void *pa = ::mmap(start, PageSize*NumPages, PROT_READ|PROT_EXEC,
-                     flags, fd, 0);
--#else
--  void *pa = ::mmap(start, PageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC,
--                    flags, fd, 0);
-+#elif defined(__NetBSD__) && defined(PROT_MPROTECT)
-+  void *pa =
-+      ::mmap(start, PageSize * NumPages,
-+             PROT_READ | PROT_WRITE | PROT_MPROTECT(PROT_EXEC), flags, fd, 0);
- #endif
-   if (pa == MAP_FAILED) {
-     if (NearBlock) //Try again without a near hint
-@@ -223,10 +224,35 @@ Memory::AllocateRWX(size_t NumBytes, con
-     MakeErrMsg(ErrMsg, "vm_protect RW failed");
-     return MemoryBlock();
-   }
-+#elif defined(__NetBSD__) && defined(PROT_MPROTECT)
-+  void *codeseg =
-+      ::mremap(pa, PageSize * NumPages, NULL, PageSize * NumPages,
-+               MAP_REMAPDUP);
-+  if (codeseg == MAP_FAILED) {
-+    ::munmap(pa, PageSize * NumPages);
-+
-+    if (NearBlock) // Try again without a near hint
-+      return AllocateRWX(NumBytes, nullptr);
-+
-+    MakeErrMsg(ErrMsg, "Can't allocate RWX Memory");
-+    return MemoryBlock();
-+  }
-+  if (::mprotect(codeseg, PageSize * NumPages, PROT_READ | PROT_EXEC) == -1) {
-+    ::munmap(pa, PageSize * NumPages);
-+    ::munmap(codeseg, PageSize * NumPages);
-+    if (NearBlock) // Try again without a near hint
-+      return AllocateRWX(NumBytes, nullptr);
-+
-+    MakeErrMsg(ErrMsg, "Can't allocate RWX Memory");
-+    return MemoryBlock();
-+  }
- #endif
- 
-   MemoryBlock result;
-   result.Address = pa;
-+#if defined(__NetBSD__) && defined(PROT_MPROTECT)
-+  result.SecondaryAddress = codeseg;
-+#endif
-   result.Size = NumPages*PageSize;
- 
-   return result;
-@@ -236,6 +262,9 @@ bool Memory::ReleaseRWX(MemoryBlock &M, 
-   if (M.Address == nullptr || M.Size == 0) return false;
-   if (0 != ::munmap(M.Address, M.Size))
-     return MakeErrMsg(ErrMsg, "Can't release RWX Memory");
-+  if (M.SecondaryAddress)
-+    if (0 != ::munmap(M.SecondaryAddress, M.Size))
-+      return MakeErrMsg(ErrMsg, "Can't release RWX Memory");
-   return false;
- }
-
Prev by Date: Makefile: +fuse-encfs
Next by Date: py-llvm-lit-netbsd: Set dedicated EGG_NAME to improve PLIST
Previous by Thread: Makefile: +fuse-encfs
Next by Thread: py-llvm-lit-netbsd: Set dedicated EGG_NAME to improve PLIST
Indexes:
Home | Main Index | Thread Index | Old Index