diff options
| author | Johan Lorensson <lateralusx.github@gmail.com> | 2017-03-02 23:09:19 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2017-03-02 23:09:19 +0300 |
| commit | 5134b17082e9fbfd2e90efb3c411a6c65a11649e (patch) | |
| tree | 4b52d770d91487574cb51066209d7bd12fc89b05 /msvc | |
| parent | a19175129f4f34c53a73e26d949cf89ade683a03 (diff) | |
Fixes to build libmono with disabled JIT. (#4421)
Current mono build on (at least Windows) fails if build with disabled JIT
since the .def file used when building libmono, mono-2.0-sgen.dll, exports
a couple of symbols missing when DISABLE_JIT is defined.
Turns out that these methods have been incorrectly exported and should not
be part of the public API surface. This commit removes MONO_API for the
methods incorrectly marked:
mono_emit_native_call
mono_inst_name
mono_replace_ins
It also removes them from the .def files so they won't be exported in the
mono runtime DLL on Windows.
For mono_set_break_policy an empty stub will be added since it is considered
being a public API.
The above support is primarily used on none desktop Windows platforms
when building mono runtime module without JIT support.
This commit also fix a problem introduced in tramp-amd64.c by commit
https://github.com/mono/mono/commit/4281399ba4b7c44a30fa2c2a314a470260bb3eb1
causing it to get duplicated definitions of mono_arch_get_enter_icall_trampoline
when DISABLE_JIT has been defined.
Diffstat (limited to 'msvc')
| -rw-r--r-- | msvc/mono.def | 3 | ||||
| -rw-r--r-- | msvc/monosgen.def | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/msvc/mono.def b/msvc/mono.def index 83431ecc0e6..52e1b14888e 100644 --- a/msvc/mono.def +++ b/msvc/mono.def @@ -264,7 +264,6 @@ mono_domain_set_internal mono_domain_try_type_resolve mono_domain_try_unload mono_domain_unload -mono_emit_native_call mono_environment_exitcode_get mono_environment_exitcode_set mono_error_cleanup @@ -465,7 +464,6 @@ mono_images_init mono_init mono_init_from_assembly mono_init_version -mono_inst_name mono_install_assembly_load_hook mono_install_assembly_postload_refonly_search_hook mono_install_assembly_postload_search_hook @@ -754,7 +752,6 @@ mono_register_bundled_assemblies mono_register_config_for_assembly mono_register_machine_config mono_register_symfile_for_assembly -mono_replace_ins mono_runtime_class_init mono_runtime_cleanup mono_runtime_delegate_invoke diff --git a/msvc/monosgen.def b/msvc/monosgen.def index 9aeb6f7e10b..5c238113281 100644 --- a/msvc/monosgen.def +++ b/msvc/monosgen.def @@ -264,7 +264,6 @@ mono_domain_set_internal mono_domain_try_type_resolve mono_domain_try_unload mono_domain_unload -mono_emit_native_call mono_environment_exitcode_get mono_environment_exitcode_set mono_error_cleanup @@ -467,7 +466,6 @@ mono_images_init mono_init mono_init_from_assembly mono_init_version -mono_inst_name mono_install_assembly_load_hook mono_install_assembly_postload_refonly_search_hook mono_install_assembly_postload_search_hook @@ -756,7 +754,6 @@ mono_register_bundled_assemblies mono_register_config_for_assembly mono_register_machine_config mono_register_symfile_for_assembly -mono_replace_ins mono_runtime_class_init mono_runtime_cleanup mono_runtime_delegate_invoke |