Skip to content

Make sure pal_icushim_static.c is linked in even if no symbols are used from it, so the EMSCRIPTEN_KEEPALIVE functions in it are actually kept. #48550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
radical merged 1 commit into from
Feb 22, 2021
Merged

Make sure pal_icushim_static.c is linked in even if no symbols are used from it, so the EMSCRIPTEN_KEEPALIVE functions in it are actually kept. #48550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_static.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,16 @@ EMSCRIPTEN_KEEPALIVE int32_t mono_wasm_load_icu_data(void * pData)
return 1;
}
}

/*
* driver.c calls this to make sure this file is linked, otherwise
* its not, meaning the EMSCRIPTEN_KEEPALIVE functions above
* are not kept.
*/
void mono_wasm_link_icu_shim(void)
{
}

#endif

int32_t GlobalizationNative_LoadICU(void)
Expand Down
4 changes: 4 additions & 0 deletions src/mono/wasm/runtime/driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,11 +466,15 @@ mono_wasm_register_bundled_satellite_assemblies ()
}
}

void mono_wasm_link_icu_shim (void);

EMSCRIPTEN_KEEPALIVE void
mono_wasm_load_runtime (const char *unused, int debug_level)
{
const char *interp_opts = "";

mono_wasm_link_icu_shim ();

#ifdef DEBUG
monoeg_g_setenv ("MONO_LOG_LEVEL", "debug", 0);
monoeg_g_setenv ("MONO_LOG_MASK", "gc", 0);
Expand Down