Skip to content

Commit 399c21f

Browse files
GeoffroyAubeyTautvydasZilys
authored andcommitted
Use iOS abi on macOS arm64
Signed-off-by: Tautvydas Žilys <[email protected]>
1 parent 3f2278e commit 399c21f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

mono/mini/mini-arm64.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ mono_arch_init (void)
248248

249249
mono_arm_gsharedvt_init ();
250250

251-
#if defined(TARGET_IOS)
251+
#if defined(TARGET_IOS) || defined(TARGET_OSX)
252252
ios_abi = TRUE;
253253
#endif
254254
}
@@ -757,7 +757,7 @@ mono_arm_emit_aotconst (gpointer ji, guint8 *code, guint8 *code_start, int dreg,
757757
gboolean
758758
mono_arch_have_fast_tls (void)
759759
{
760-
#ifdef TARGET_IOS
760+
#if defined(TARGET_IOS) || defined(TARGET_OSX)
761761
return FALSE;
762762
#else
763763
return TRUE;

mono/mini/mini-arm64.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ typedef struct {
154154
#define MONO_ARCH_HAVE_OPCODE_NEEDS_EMULATION 1
155155
#define MONO_ARCH_HAVE_DECOMPOSE_LONG_OPTS 1
156156

157-
#ifdef TARGET_IOS
157+
#if defined(TARGET_IOS) || defined(TARGET_OSX)
158158

159159
#define MONO_ARCH_REDZONE_SIZE 128
160160

@@ -164,7 +164,7 @@ typedef struct {
164164

165165
#endif
166166

167-
#if defined(TARGET_APPLETVOS) || defined(TARGET_IOS)
167+
#if defined(TARGET_IOS) || defined(TARGET_APPLETV) || defined(TARGET_OSX)
168168
#define MONO_ARCH_HAVE_UNWIND_BACKTRACE 1
169169
#endif
170170

0 commit comments

Comments
 (0)