projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Revert "Merge branch 'master' of https://github.com/mono/mono""
[mono.git]
/
mono
/
mini
/
helpers.c
diff --git
a/mono/mini/helpers.c
b/mono/mini/helpers.c
index d945a39b8f2e4e900c08968e3465ee390e17c6bb..43bd17e2fa499d3fe6904a97f71492646718b10b 100644
(file)
--- a/
mono/mini/helpers.c
+++ b/
mono/mini/helpers.c
@@
-66,10
+66,14
@@
opnames[] = {
#endif /* DISABLE_LOGGING */
#if defined(__i386__) || defined(__x86_64__)
#endif /* DISABLE_LOGGING */
#if defined(__i386__) || defined(__x86_64__)
+#ifndef TARGET_ARM64
#define emit_debug_info TRUE
#else
#define emit_debug_info FALSE
#endif
#define emit_debug_info TRUE
#else
#define emit_debug_info FALSE
#endif
+#else
+#define emit_debug_info FALSE
+#endif
/*This enables us to use the right tooling when building the cross compiler for iOS.*/
#if defined (__APPLE__) && defined (TARGET_ARM) && (defined(__i386__) || defined(__x86_64__))
/*This enables us to use the right tooling when building the cross compiler for iOS.*/
#if defined (__APPLE__) && defined (TARGET_ARM) && (defined(__i386__) || defined(__x86_64__))
@@
-237,6
+241,12
@@
mono_disassemble_code (MonoCompile *cfg, guint8 *code, int size, char *id)
# else
# define AS_CMD "as -gstabs"
# endif
# else
# define AS_CMD "as -gstabs"
# endif
+#elif defined (TARGET_ARM64)
+# if defined (__APPLE__)
+# define AS_CMD "clang -c -arch arm64 -g -x assembler"
+# else
+# define AS_CMD "as -gstabs"
+# endif
#elif defined(__mips__) && (_MIPS_SIM == _ABIO32)
#define AS_CMD "as -mips32"
#elif defined(__ppc64__)
#elif defined(__mips__) && (_MIPS_SIM == _ABIO32)
#define AS_CMD "as -mips32"
#elif defined(__ppc64__)
@@
-275,7
+285,7
@@
mono_disassemble_code (MonoCompile *cfg, guint8 *code, int size, char *id)
cmd = g_strdup_printf (ARCH_PREFIX DIS_CMD " %s %s", objdump_args, o_file);
unused = system (cmd);
g_free (cmd);
cmd = g_strdup_printf (ARCH_PREFIX DIS_CMD " %s %s", objdump_args, o_file);
unused = system (cmd);
g_free (cmd);
-
+
#ifndef HOST_WIN32
unlink (o_file);
unlink (as_file);
#ifndef HOST_WIN32
unlink (o_file);
unlink (as_file);