summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Sonnenberger <joerg@bec.de>2016-09-30 20:17:23 +0000
committerJoerg Sonnenberger <joerg@bec.de>2016-09-30 20:17:23 +0000
commit10c45e226bca96b2601b538afda75cc94b9350a0 (patch)
tree37ecabe410e8907eafaa69a7429aadb0b6a7cebd
parent18a2fb2d2810328e008e9d89978fa55465a92118 (diff)
downloadbcm5719-llvm-10c45e226bca96b2601b538afda75cc94b9350a0.tar.gz
bcm5719-llvm-10c45e226bca96b2601b538afda75cc94b9350a0.zip
Deal with the (historic) MAP_ANONYMOUS vs MAP_ANON directly by using CPP
to check for the former, don't depend on (dangling) HAVE_MMAP_ANONYMOUS. llvm-svn: 282925
-rw-r--r--llvm/include/llvm/Config/config.h.cmake4
-rw-r--r--llvm/lib/Support/Unix/Memory.inc4
2 files changed, 2 insertions, 6 deletions
diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake
index e0f68afa38c..239a0b38e58 100644
--- a/llvm/include/llvm/Config/config.h.cmake
+++ b/llvm/include/llvm/Config/config.h.cmake
@@ -160,10 +160,6 @@
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
-/* Define if mmap() uses MAP_ANONYMOUS to map anonymous pages, or undefine if
- it uses MAP_ANON */
-#undef HAVE_MMAP_ANONYMOUS
-
/* Define if mmap() can map files into memory */
#undef HAVE_MMAP_FILE
diff --git a/llvm/lib/Support/Unix/Memory.inc b/llvm/lib/Support/Unix/Memory.inc
index 88b2a28c3a1..6bbaf509d81 100644
--- a/llvm/lib/Support/Unix/Memory.inc
+++ b/llvm/lib/Support/Unix/Memory.inc
@@ -93,7 +93,7 @@ Memory::allocateMappedMemory(size_t NumBytes,
int fd = -1;
int MMFlags = MAP_PRIVATE |
-#ifdef HAVE_MMAP_ANONYMOUS
+#ifdef MAP_ANONYMOUS
MAP_ANONYMOUS
#else
MAP_ANON
@@ -179,7 +179,7 @@ Memory::AllocateRWX(size_t NumBytes, const MemoryBlock* NearBlock,
int fd = -1;
int flags = MAP_PRIVATE |
-#ifdef HAVE_MMAP_ANONYMOUS
+#ifdef MAP_ANONYMOUS
MAP_ANONYMOUS
#else
MAP_ANON
OpenPOWER on IntegriCloud