llvm-netbsd: Simplify patch for upstream

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Jun 7 15:28:12 2017 +0200
Changeset:	327aac3ed38f80c7baf4271a1110267b65be3180

Modified Files:
	llvm-netbsd/distinfo
	llvm-netbsd/patches/patch-lib_Support_Unix_Memory.inc

Log Message:
llvm-netbsd: Simplify patch for upstream

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=327aac3ed38f80c7baf4271a1110267b65be3180

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

diffstat:
 llvm-netbsd/distinfo                                  |  2 +-
 llvm-netbsd/patches/patch-lib_Support_Unix_Memory.inc | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs:
diff --git a/llvm-netbsd/distinfo b/llvm-netbsd/distinfo
index bd1d620645..67d32912dc 100644
--- a/llvm-netbsd/distinfo
+++ b/llvm-netbsd/distinfo
@@ -14,4 +14,4 @@ RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
 Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
 SHA1 (patch-include_llvm_ADT_Triple.h) = be08dde07a038259a3314ec7791d2ccf8a682c0c
 SHA1 (patch-include_llvm_Support_Memory.h) = 8828c30722635d2db04f886383d3ce910adb88a0
-SHA1 (patch-lib_Support_Unix_Memory.inc) = 2c9a1359c8af2b0a7c329dddf64f7feef465919c
+SHA1 (patch-lib_Support_Unix_Memory.inc) = f6e3d81caa1d9575cd5868472808713fc2434e0f
diff --git a/llvm-netbsd/patches/patch-lib_Support_Unix_Memory.inc b/llvm-netbsd/patches/patch-lib_Support_Unix_Memory.inc
index 2e9b9add54..bb4c8fd62f 100644
--- a/llvm-netbsd/patches/patch-lib_Support_Unix_Memory.inc
+++ b/llvm-netbsd/patches/patch-lib_Support_Unix_Memory.inc
@@ -2,7 +2,7 @@ $NetBSD$
 
 --- lib/Support/Unix/Memory.inc.orig	2016-12-16 22:52:53.000000000 +0000
 +++ lib/Support/Unix/Memory.inc
-@@ -195,14 +195,14 @@ Memory::AllocateRWX(size_t NumBytes, con
+@@ -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);
@@ -16,12 +16,7 @@ $NetBSD$
  #endif
    if (pa == MAP_FAILED) {
      if (NearBlock) //Try again without a near hint
-       return AllocateRWX(NumBytes, nullptr);
--
-     MakeErrMsg(ErrMsg, "Can't allocate RWX Memory");
-     return MemoryBlock();
-   }
-@@ -223,10 +223,35 @@ Memory::AllocateRWX(size_t NumBytes, con
+@@ -223,10 +224,35 @@ Memory::AllocateRWX(size_t NumBytes, con
      MakeErrMsg(ErrMsg, "vm_protect RW failed");
      return MemoryBlock();
    }
@@ -57,7 +52,7 @@ $NetBSD$
    result.Size = NumPages*PageSize;
  
    return result;
-@@ -236,6 +261,9 @@ bool Memory::ReleaseRWX(MemoryBlock &M, 
+@@ -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");