pkgsrc-WIP-changes archive

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

llvm-netbsd: Drop MemoryTest.cpp patch



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Jul 18 12:48:37 2017 +0200
Changeset:	e4b648ba097b86c03b21f22beec202f81f039174

Modified Files:
	llvm-netbsd/distinfo
Removed Files:
	llvm-netbsd/patches/patch-unittests_Support_MemoryTest.cpp

Log Message:
llvm-netbsd: Drop MemoryTest.cpp patch

This code will be redone differently in future.

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

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

diffstat:
 llvm-netbsd/distinfo                               |  1 -
 .../patches/patch-unittests_Support_MemoryTest.cpp | 49 ----------------------
 2 files changed, 50 deletions(-)

diffs:
diff --git a/llvm-netbsd/distinfo b/llvm-netbsd/distinfo
index 3dad377929..e176119211 100644
--- a/llvm-netbsd/distinfo
+++ b/llvm-netbsd/distinfo
@@ -20,4 +20,3 @@ SHA1 (patch-lib_Support_Unix_Signals.inc) = 7e3fa55c7e32171454a065c6e38d8189ffdf
 SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = 67eee29c4d8525b603e6b7c0a52278bdf3353687
 SHA1 (patch-lib_Transforms_Instrumentation_InstrProfiling.cpp) = 871b474f415d9dc468cc07477101f88d7a20868b
 SHA1 (patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp) = 64fdbb55c77d5f5f73152d2f8daa28adfc428e40
-SHA1 (patch-unittests_Support_MemoryTest.cpp) = dc33f032b0e949fd7d4c4017ee1ac4937e65da84
diff --git a/llvm-netbsd/patches/patch-unittests_Support_MemoryTest.cpp b/llvm-netbsd/patches/patch-unittests_Support_MemoryTest.cpp
deleted file mode 100644
index fb45d5a666..0000000000
--- a/llvm-netbsd/patches/patch-unittests_Support_MemoryTest.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD$
-
---- unittests/Support/MemoryTest.cpp.orig	2017-07-17 18:00:15.718300975 +0000
-+++ unittests/Support/MemoryTest.cpp
-@@ -13,7 +13,14 @@
- #include <cstdlib>
- 
- #if defined(__NetBSD__)
--#include <sys/mmap.h>
-+#  include <sys/mman.h>
-+#  if defined(PROT_MPROTECT)
-+#    define NETBSD_WITH_MPROTECT 1
-+#  else
-+#    define NETBSD_WITH_MPROTECT 0
-+#  endif
-+#else
-+#  define NETBSD_WITH_MPROTECT 0
- #endif
- 
- using namespace llvm;
-@@ -36,7 +43,7 @@ protected:
-     case Memory::MF_WRITE:
-     case Memory::MF_READ|Memory::MF_WRITE:
-       return Memory::MF_READ|Memory::MF_WRITE;
--#if !(defined(__NetBSD__) && defined(PROT_MPROTECT))
-+#if !NETBSD_WITH_MPROTECT
-     case Memory::MF_READ|Memory::MF_EXEC:
-     case Memory::MF_READ|Memory::MF_WRITE|Memory::MF_EXEC:
-     case Memory::MF_EXEC:
-@@ -204,6 +211,7 @@ TEST_P(MappedMemoryTest, EnabledWrite) {
-   EXPECT_NE((void*)nullptr, M3.base());
-   EXPECT_LE(4U * sizeof(int), M3.size());
- 
-+  {FILE *fp = fopen("/tmp/log.txt", "a");fprintf(fp, "%s() %s:%d Flags=%x getTestableEquivalent(Flags)=%x protectMappedMemory()=%s\n", __func__, __FILE__, __LINE__, Flags, getTestableEquivalent(Flags), Memory::protectMappedMemory(M1, getTestableEquivalent(Flags)) ? "TRUE" : "FALSE");fflush(fp);fclose(fp);}
-   EXPECT_FALSE(Memory::protectMappedMemory(M1, getTestableEquivalent(Flags)));
-   EXPECT_FALSE(Memory::protectMappedMemory(M2, getTestableEquivalent(Flags)));
-   EXPECT_FALSE(Memory::protectMappedMemory(M3, getTestableEquivalent(Flags)));
-@@ -359,9 +367,11 @@ unsigned MemoryFlags[] = {
- 			   Memory::MF_READ,
- 			   Memory::MF_WRITE,
- 			   Memory::MF_READ|Memory::MF_WRITE,
-+#if !NETBSD_WITH_MPROTECT
- 			   Memory::MF_EXEC,
- 			   Memory::MF_READ|Memory::MF_EXEC,
- 			   Memory::MF_READ|Memory::MF_WRITE|Memory::MF_EXEC
-+#endif
- 			 };
- 
- INSTANTIATE_TEST_CASE_P(AllocationTests,


Home | Main Index | Thread Index | Old Index