diff options
| author | Piotr Zierhoffer <pzierhoffer@antmicro.com> | 2019-10-04 09:46:58 +0300 |
|---|---|---|
| committer | Bernhard Urban-Forster <lewurm@gmail.com> | 2019-10-04 09:46:58 +0300 |
| commit | 4e8c496082b25be00953d3dc60812ecc92f3f4e4 (patch) | |
| tree | 6491cd9dee5ee3ee706b5f19e5364da007ccf147 /mcs/tools | |
| parent | ea2a460cf68b6d16a3b379842e91c0bdf942ca16 (diff) | |
mkbundle: fix 17139 mono aot register module fix definitions (#17152)
* [mkbundle] Fix mono_aot_register_module declaration (#17139)
This change reflects the declaration introduced in jit.h in #15132.
* [mkbundle] Remove spurious function declaration (#17139)
The comment is clearly outdated after the introduction of #15132.
Diffstat (limited to 'mcs/tools')
| -rw-r--r-- | mcs/tools/mkbundle/bundle-mono-api.inc | 2 | ||||
| -rw-r--r-- | mcs/tools/mkbundle/template_common.inc | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/mcs/tools/mkbundle/bundle-mono-api.inc b/mcs/tools/mkbundle/bundle-mono-api.inc index 6af254ff098..013e8901eda 100644 --- a/mcs/tools/mkbundle/bundle-mono-api.inc +++ b/mcs/tools/mkbundle/bundle-mono-api.inc @@ -19,7 +19,7 @@ typedef struct BundleMonoAPI void (*mono_register_bundled_assemblies) (const MonoBundledAssembly **assemblies); void (*mono_register_config_for_assembly) (const char* assembly_name, const char* config_xml); void (*mono_jit_set_aot_mode) (MonoAotMode mode); - void (*mono_aot_register_module) (void* aot_info); + void (*mono_aot_register_module) (void** aot_info); void (*mono_config_parse_memory) (const char *buffer); void (*mono_register_machine_config) (const char *config_xml); } BundleMonoAPI; diff --git a/mcs/tools/mkbundle/template_common.inc b/mcs/tools/mkbundle/template_common.inc index ab0a9a77e40..2f2385b0de1 100644 --- a/mcs/tools/mkbundle/template_common.inc +++ b/mcs/tools/mkbundle/template_common.inc @@ -49,12 +49,6 @@ validate_api_struct () exit (1); } -#ifdef USE_DEFAULT_MONO_API_STRUCT -// We don't export in jit.h -// So declare here, and get it from mono -void mono_aot_register_module (void *aot_info); -#endif // USE_DEFAULT_MONO_API_STRUCT - static void init_default_mono_api_struct () { |