summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lokesh Gidra <lokeshgidra@google.com> 2025-01-22 05:55:33 +0000
committer Lokesh Gidra <lokeshgidra@google.com> 2025-01-23 10:36:41 -0800
commit7ed44baf0fd51165fb4bac25f318a87b619ef490 (patch)
tree8ebf0b5e4c8471f832bb4b1061574607baa81364
parent85b7a098e7f1ae6d4b96380a374e9e89832a4364 (diff)
Stop using MAP_32BIT for mapping in <4GB on x86_64
MAP_32BIT flag limits to first 2GB address space as per manpage. However, as per the kernel source code it seems to be only 1GB, thereby limiting available address space for mapping in <4GB on x86_64. Bug: 384045833 Test: art/test/testrunner/testrunner.py --host --64 Change-Id: If5f696648a9d55bd08d4f39ee7a25dea285b89dc
-rw-r--r--libartbase/base/mem_map.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/libartbase/base/mem_map.h b/libartbase/base/mem_map.h
index 4b4a56a23f..db60c9443e 100644
--- a/libartbase/base/mem_map.h
+++ b/libartbase/base/mem_map.h
@@ -37,13 +37,9 @@
namespace art {
-#if defined(__LP64__) && !defined(__Fuchsia__) && \
- (defined(__aarch64__) || defined(__riscv) || defined(__APPLE__))
+#if defined(__LP64__) && !defined(__Fuchsia__) && !defined(_WINDOWS_)
#define USE_ART_LOW_4G_ALLOCATOR 1
#else
-#if defined(__LP64__) && !defined(__Fuchsia__) && !defined(__x86_64__)
-#error "Unrecognized 64-bit architecture."
-#endif
#define USE_ART_LOW_4G_ALLOCATOR 0
#endif