diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2019-05-14 16:31:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-14 16:31:29 -0700 |
| commit | 75addddd0601ab4e57ff41fada17128df47842ef (patch) | |
| tree | e1bc85f4b1c5729872001e20e9ae530647d5ddef /src/ToolBox | |
| parent | e1e49b9d54fa333a50f7818cb7fcae10682c0e0a (diff) | |
| download | coreclr-75addddd0601ab4e57ff41fada17128df47842ef.tar.gz coreclr-75addddd0601ab4e57ff41fada17128df47842ef.tar.bz2 coreclr-75addddd0601ab4e57ff41fada17128df47842ef.zip | |
Decorate SuperPMI DllMain jitStartup getJit with DLLEXPORT (#24508)
* Decorate DllMain with DLLEXPORT in superpmi-shim-collector.cpp superpmi-shim-counter.cpp superpmi-shim-simple.cpp
* Decorate jitStartup, getJit, sxsJitStartup with DLLEXPORT in superpmi-shim-collector.cpp superpmi-shim-counter.cpp superpmi-shim-simple.cpp
Diffstat (limited to 'src/ToolBox')
3 files changed, 21 insertions, 30 deletions
diff --git a/src/ToolBox/superpmi/superpmi-shim-collector/superpmi-shim-collector.cpp b/src/ToolBox/superpmi/superpmi-shim-collector/superpmi-shim-collector.cpp index 9c2cdc3f4c..4068dac931 100644 --- a/src/ToolBox/superpmi/superpmi-shim-collector/superpmi-shim-collector.cpp +++ b/src/ToolBox/superpmi/superpmi-shim-collector/superpmi-shim-collector.cpp @@ -86,10 +86,10 @@ void SetLogFilePath() } } -extern "C" BOOL -#ifndef FEATURE_PAL - APIENTRY -#endif // !FEATURE_PAL +#ifdef FEATURE_PAL +DLLEXPORT // For Win32 PAL LoadLibrary emulation +#endif + extern "C" BOOL DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { switch (ul_reason_for_call) @@ -123,8 +123,7 @@ extern "C" BOOL return TRUE; } -// Exported via def file -extern "C" void __stdcall jitStartup(ICorJitHost* host) +extern "C" DLLEXPORT void __stdcall jitStartup(ICorJitHost* host) { SetDefaultPaths(); SetLibName(); @@ -147,8 +146,7 @@ extern "C" void __stdcall jitStartup(ICorJitHost* host) pnjitStartup(g_ourJitHost); } -// Exported via def file -extern "C" ICorJitCompiler* __stdcall getJit() +extern "C" DLLEXPORT ICorJitCompiler* __stdcall getJit() { DWORD dwRetVal = 0; PgetJit pngetJit; @@ -194,8 +192,7 @@ extern "C" ICorJitCompiler* __stdcall getJit() return pJitInstance; } -// Exported via def file -extern "C" void __stdcall sxsJitStartup(CoreClrCallbacks const& original_cccallbacks) +extern "C" DLLEXPORT void __stdcall sxsJitStartup(CoreClrCallbacks const& original_cccallbacks) { PsxsJitStartup pnsxsJitStartup; diff --git a/src/ToolBox/superpmi/superpmi-shim-counter/superpmi-shim-counter.cpp b/src/ToolBox/superpmi/superpmi-shim-counter/superpmi-shim-counter.cpp index 51d76b4df5..57a4ad67ba 100644 --- a/src/ToolBox/superpmi/superpmi-shim-counter/superpmi-shim-counter.cpp +++ b/src/ToolBox/superpmi/superpmi-shim-counter/superpmi-shim-counter.cpp @@ -68,10 +68,10 @@ void SetLogFilePath() } } -extern "C" BOOL -#ifndef FEATURE_PAL - APIENTRY -#endif // !FEATURE_PAL +#ifdef FEATURE_PAL +DLLEXPORT // For Win32 PAL LoadLibrary emulation +#endif + extern "C" BOOL DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { switch (ul_reason_for_call) @@ -110,8 +110,7 @@ extern "C" BOOL return TRUE; } -// Exported via def file -extern "C" void __stdcall jitStartup(ICorJitHost* host) +extern "C" DLLEXPORT void __stdcall jitStartup(ICorJitHost* host) { SetDefaultPaths(); SetLibName(); @@ -143,8 +142,7 @@ extern "C" void __stdcall jitStartup(ICorJitHost* host) pnjitStartup(g_ourJitHost); } -// Exported via def file -extern "C" ICorJitCompiler* __stdcall getJit() +extern "C" DLLEXPORT ICorJitCompiler* __stdcall getJit() { DWORD dwRetVal = 0; PgetJit pngetJit; @@ -186,8 +184,7 @@ extern "C" ICorJitCompiler* __stdcall getJit() return pJitInstance; } -// Exported via def file -extern "C" void __stdcall sxsJitStartup(CoreClrCallbacks const& original_cccallbacks) +extern "C" DLLEXPORT void __stdcall sxsJitStartup(CoreClrCallbacks const& original_cccallbacks) { PsxsJitStartup pnsxsJitStartup; diff --git a/src/ToolBox/superpmi/superpmi-shim-simple/superpmi-shim-simple.cpp b/src/ToolBox/superpmi/superpmi-shim-simple/superpmi-shim-simple.cpp index 1f446cadb4..01341ccada 100644 --- a/src/ToolBox/superpmi/superpmi-shim-simple/superpmi-shim-simple.cpp +++ b/src/ToolBox/superpmi/superpmi-shim-simple/superpmi-shim-simple.cpp @@ -58,10 +58,10 @@ void SetLogFilePath() } } -extern "C" BOOL -#ifndef FEATURE_PAL - APIENTRY -#endif // !FEATURE_PAL +#ifdef FEATURE_PAL +DLLEXPORT // For Win32 PAL LoadLibrary emulation +#endif + extern "C" BOOL DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { switch (ul_reason_for_call) @@ -95,8 +95,7 @@ extern "C" BOOL return TRUE; } -// Exported via def file -extern "C" void __stdcall jitStartup(ICorJitHost* host) +extern "C" DLLEXPORT void __stdcall jitStartup(ICorJitHost* host) { SetDefaultPaths(); SetLibName(); @@ -119,8 +118,7 @@ extern "C" void __stdcall jitStartup(ICorJitHost* host) pnjitStartup(g_ourJitHost); } -// Exported via def file -extern "C" ICorJitCompiler* __stdcall getJit() +extern "C" DLLEXPORT ICorJitCompiler* __stdcall getJit() { DWORD dwRetVal = 0; PgetJit pngetJit; @@ -155,8 +153,7 @@ extern "C" ICorJitCompiler* __stdcall getJit() return pJitInstance; } -// Exported via def file -extern "C" void __stdcall sxsJitStartup(CoreClrCallbacks const& original_cccallbacks) +extern "C" DLLEXPORT void __stdcall sxsJitStartup(CoreClrCallbacks const& original_cccallbacks) { PsxsJitStartup pnsxsJitStartup; |