diff options
| author | Fadi Hanna <fadim@microsoft.com> | 2019-06-06 10:03:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 10:03:52 -0700 |
| commit | 9f76c18356785ac8de21388998bc0e99425c454a (patch) | |
| tree | 1c95d024bbf2e51ff27e200e92c9e4894bde767c /src/zap | |
| parent | d02b3efcd00258fa060657626dd1a960e2167391 (diff) | |
| download | coreclr-9f76c18356785ac8de21388998bc0e99425c454a.tar.gz coreclr-9f76c18356785ac8de21388998bc0e99425c454a.tar.bz2 coreclr-9f76c18356785ac8de21388998bc0e99425c454a.zip | |
PInvoke stubs for Unix platforms (#24834)
Enable pinvoke stub inlining on Unix
Exclude x86 Unix platforms from inlining pinvoke stubs (limited support)
Diffstat (limited to 'src/zap')
| -rw-r--r-- | src/zap/zapinfo.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/zap/zapinfo.cpp b/src/zap/zapinfo.cpp index 23fb3362c8..f57556b830 100644 --- a/src/zap/zapinfo.cpp +++ b/src/zap/zapinfo.cpp @@ -207,10 +207,7 @@ CORJIT_FLAGS ZapInfo::ComputeJitFlags(CORINFO_METHOD_HANDLE handle) if (IsReadyToRunCompilation()) { jitFlags.Set(CORJIT_FLAGS::CORJIT_FLAG_READYTORUN); -#ifndef PLATFORM_UNIX - // PInvoke Helpers are not yet implemented on non-Windows platforms jitFlags.Set(CORJIT_FLAGS::CORJIT_FLAG_USE_PINVOKE_HELPERS); -#endif } #endif // FEATURE_READYTORUN_COMPILER @@ -3867,8 +3864,8 @@ CorInfoUnmanagedCallConv ZapInfo::getUnmanagedCallConv(CORINFO_METHOD_HANDLE met BOOL ZapInfo::pInvokeMarshalingRequired(CORINFO_METHOD_HANDLE method, CORINFO_SIG_INFO* sig) { -#ifdef PLATFORM_UNIX - // TODO: Support for pinvoke helpers on non-Windows platforms +#if defined(_TARGET_X86_) && defined(PLATFORM_UNIX) + // FUTURE ReadyToRun: x86 pinvoke stubs on Unix platforms if (IsReadyToRunCompilation()) return TRUE; #endif |