Skip to content

Commit 796848a

Browse files
monojenkinsvargaz
andauthored
fix merp arm64 (#47331)
<!-- Thank you for your Pull Request! If you are new to contributing to Mono, please try to do your best at conforming to our coding guidelines http://www.mono-project.com/community/contributing/coding-guidelines/ but don't worry if you get something wrong. One of the project members will help you to get things landed. Does your pull request fix any of the existing issues? Please use the following format: Fixes #issue-number --> Co-authored-by: vargaz <vargaz@users.noreply.github.com>
1 parent 01116d4 commit 796848a

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

src/mono/configure.ac

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,6 @@ case "$host" in
408408
host_sunos=yes
409409
;;
410410
*-*-darwin*)
411-
# Temporary workaround for Apple Silicon
412-
# config.guess returns arm-apple-darwin20.0.0
413-
if test $ac_cv_host = arm-apple-darwin20.0.0 -o $ac_cv_target = arm-apple-darwin20.0.0; then
414-
echo "You are running on Apple Silicon, but using an old config.guess, invoke configure like this:"
415-
echo "Run configure using ./configure --host=aarch64-apple-darwin20.0.0 --target=aarch64-apple-darwin20.0.0"
416-
exit 1
417-
fi
418411
parallel_mark="Disabled_Currently_Hangs_On_MacOSX"
419412
host_darwin=yes
420413
target_mach=yes

src/mono/mono/utils/mono-merp.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ typedef enum {
129129
MerpArchx86_64 = 1,
130130
MerpArchx86 = 2,
131131
MerpArchPPC = 3,
132-
MerpArchPPC64 = 4
132+
MerpArchPPC64 = 4,
133+
MerpArchARM64 = 5
133134
} MerpArch;
134135

135136
typedef enum
@@ -218,6 +219,8 @@ get_merp_bitness (MerpArch arch)
218219
return "x64";
219220
case MerpArchx86:
220221
return "x32";
222+
case MerpArchARM64:
223+
return "arm64";
221224
default:
222225
g_assert_not_reached ();
223226
}
@@ -234,6 +237,8 @@ get_merp_arch (void)
234237
return MerpArchPPC;
235238
#elif defined(TARGET_POWERPC64)
236239
return MerpArchPPC64;
240+
#elif defined(TARGET_ARM64)
241+
return MerpArchARM64;
237242
#else
238243
g_assert_not_reached ();
239244
#endif

0 commit comments

Comments
 (0)