Skip to content

Commit eab409a

Browse files
authored
aot loader: Call os_mmap with MMAP_MAP_32BIT only when target is x86-64 or riscv64 (#3755)
Mac on aarch64 uses posix_memmap.c os_mmap which doesn't do anything with the flag MMAP_MAP_32BIT for that build so this condition ends up asserting unless the mapping ends up in the first 4 gigs worth of addressable space. Thsi PR changes to call os_mmap with MMAP_MAP_32BIT flag only when the target is x86-64 or riscv64, and the macro __APPLE__ isn't enabled. The behavior is similar to what the posix os_mmap does.
1 parent d1141f6 commit eab409a

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

core/iwasm/aot/aot_loader.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,10 @@ loader_mmap(uint32 size, bool prot_exec, char *error_buf, uint32 error_buf_size)
302302
int map_flags;
303303
void *mem;
304304

305-
#if UINTPTR_MAX == UINT64_MAX
305+
#if defined(BUILD_TARGET_X86_64) || defined(BUILD_TARGET_AMD_64) \
306+
|| defined(BUILD_TARGET_RISCV64_LP64D) \
307+
|| defined(BUILD_TARGET_RISCV64_LP64)
308+
#ifndef __APPLE__
306309
/* The mmapped AOT data and code in 64-bit targets had better be in
307310
range 0 to 2G, or aot loader may fail to apply some relocations,
308311
e.g., R_X86_64_32/R_X86_64_32S/R_X86_64_PC32/R_RISCV_32.
@@ -316,6 +319,7 @@ loader_mmap(uint32 size, bool prot_exec, char *error_buf, uint32 error_buf_size)
316319
bh_assert((uintptr_t)mem < INT32_MAX);
317320
return mem;
318321
}
322+
#endif
319323
#endif
320324

321325
map_flags = MMAP_MAP_NONE;

0 commit comments

Comments
 (0)