From: Joerg Sonnenberger <joerg@bec.de>
Date: Fri, 30 Sep 2016 20:17:23 +0000 (+0000)
Subject: Deal with the (historic) MAP_ANONYMOUS vs MAP_ANON directly by using CPP
X-Git-Tag: android-x86-7.1-r4~26448
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=593505d39e06e62a2b7583edc5f823b5455579ce;p=android-x86%2Fexternal-llvm.git

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.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@282925 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index e0f68afa38c..239a0b38e58 100644
--- a/include/llvm/Config/config.h.cmake
+++ b/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/lib/Support/Unix/Memory.inc b/lib/Support/Unix/Memory.inc
index 88b2a28c3a1..6bbaf509d81 100644
--- a/lib/Support/Unix/Memory.inc
+++ b/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