diff options
| author | JMadgwick <james.madgwick@outlook.com> | 2020-03-05 21:03:44 +0000 |
|---|---|---|
| committer | JMadgwick <james.madgwick@outlook.com> | 2020-03-09 20:55:13 +0000 |
| commit | f7c9359b2ac431ac99fb4e8a1ebd799e6e8fb21c (patch) | |
| tree | 8af67b167fb752ce55ec4a15c46162d8c069b5c7 /js/src/gc/Memory.cpp | |
| parent | 88da01c294175f81091e1499374415404e27a57a (diff) | |
| download | UXP-f7c9359b2ac431ac99fb4e8a1ebd799e6e8fb21c.tar UXP-f7c9359b2ac431ac99fb4e8a1ebd799e6e8fb21c.tar.gz UXP-f7c9359b2ac431ac99fb4e8a1ebd799e6e8fb21c.tar.lz UXP-f7c9359b2ac431ac99fb4e8a1ebd799e6e8fb21c.tar.xz UXP-f7c9359b2ac431ac99fb4e8a1ebd799e6e8fb21c.zip | |
Issue #1471 - Fix building on sparc64 Linux
Correct various pre-processor defines for sparc64 and in mozjemalloc use the JS arm64 allocator on Linux/sparc64.
This corrects build problems opn Linux sparc64 and is in line with bugzilla bug #1275204.
Diffstat (limited to 'js/src/gc/Memory.cpp')
| -rw-r--r-- | js/src/gc/Memory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp index 418984057..17c964da0 100644 --- a/js/src/gc/Memory.cpp +++ b/js/src/gc/Memory.cpp @@ -423,7 +423,7 @@ MapMemoryAt(void* desired, size_t length, int prot = PROT_READ | PROT_WRITE, // possibly be correct on AMD64, but for Solaris/illumos it is. { -#if defined(__ia64__) || (defined(__sparc64__) && defined(__NetBSD__)) || defined(__aarch64__) || (defined(__sun) && defined(__x86_64__)) +#if defined(__ia64__) || defined(__aarch64__) || (defined(__sun) && defined(__x86_64__)) || (defined(__sparc__) && defined(__arch64__) && (defined(__NetBSD__) || defined(__linux__))) MOZ_ASSERT((0xffff800000000000ULL & (uintptr_t(desired) + length - 1)) == 0); #endif void* region = mmap(desired, length, prot, flags, fd, offset); @@ -446,7 +446,7 @@ static inline void* MapMemory(size_t length, int prot = PROT_READ | PROT_WRITE, int flags = MAP_PRIVATE | MAP_ANON, int fd = -1, off_t offset = 0) { -#if defined(__ia64__) || (defined(__sparc64__) && defined(__NetBSD__)) +#if defined(__ia64__) || (defined(__sparc__) && defined(__arch64__) && defined(__NetBSD__)) /* * The JS engine assumes that all allocated pointers have their high 17 bits clear, * which ia64's mmap doesn't support directly. However, we can emulate it by passing @@ -473,7 +473,7 @@ MapMemory(size_t length, int prot = PROT_READ | PROT_WRITE, return nullptr; } return region; -#elif defined(__aarch64__) || (defined(__sun) && defined(__x86_64__)) +#elif defined(__aarch64__) || (defined(__sun) && defined(__x86_64__)) || (defined(__sparc__) && defined(__arch64__) && defined(__linux__)) /* * There might be similar virtual address issue on arm64 which depends on * hardware and kernel configurations. But the work around is slightly |