Skip to content

Commit 03a2af5

Browse files
authored
Fix compilation error on iOS due to macOS-specific API (#2995)
`pthread_jit_write_protect_np` is only available on macOS, and `sys_icache_invalidate` is available on both iOS and macOS and has no restrictions on ARM architecture.
1 parent ff25110 commit 03a2af5

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

core/shared/platform/common/posix/posix_memmap.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include "platform_api_vmcore.h"
77

8-
#if (defined(__APPLE__) || defined(__MACH__)) && defined(__arm64__)
8+
#if defined(__APPLE__) || defined(__MACH__)
99
#include <libkern/OSCacheControl.h>
1010
#endif
1111

@@ -40,7 +40,8 @@ void *
4040
os_mmap(void *hint, size_t size, int prot, int flags, os_file_handle file)
4141
{
4242
int map_prot = PROT_NONE;
43-
#if (defined(__APPLE__) || defined(__MACH__)) && defined(__arm64__)
43+
#if (defined(__APPLE__) || defined(__MACH__)) && defined(__arm64__) \
44+
&& defined(TARGET_OS_OSX) && TARGET_OS_OSX != 0
4445
int map_flags = MAP_ANONYMOUS | MAP_PRIVATE | MAP_JIT;
4546
#else
4647
int map_flags = MAP_ANONYMOUS | MAP_PRIVATE;
@@ -275,7 +276,7 @@ os_dcache_flush(void)
275276
void
276277
os_icache_flush(void *start, size_t len)
277278
{
278-
#if (defined(__APPLE__) || defined(__MACH__)) && defined(__arm64__)
279+
#if defined(__APPLE__) || defined(__MACH__)
279280
sys_icache_invalidate(start, len);
280281
#endif
281282
}

core/shared/platform/common/posix/posix_thread.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,8 @@ os_thread_get_stack_boundary()
476476
void
477477
os_thread_jit_write_protect_np(bool enabled)
478478
{
479-
#if (defined(__APPLE__) || defined(__MACH__)) && defined(__arm64__)
479+
#if (defined(__APPLE__) || defined(__MACH__)) && defined(__arm64__) \
480+
&& defined(TARGET_OS_OSX) && TARGET_OS_OSX != 0
480481
pthread_jit_write_protect_np(enabled);
481482
#endif
482483
}

0 commit comments

Comments
 (0)