diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-03-31 06:20:01 +0900 |
|---|---|---|
| committer | Bruce Forstall <brucefo@microsoft.com> | 2017-03-30 14:20:01 -0700 |
| commit | 5e03cb09e3754e4a3430ba424a1352b9c01ff098 (patch) | |
| tree | 49bf1aa9faf93f4168dcfdf18c3886152f556617 /src/vm/comdelegate.cpp | |
| parent | 4763f1121e62f45fec56cef6234446cd1ad7b8ab (diff) | |
| download | coreclr-5e03cb09e3754e4a3430ba424a1352b9c01ff098.tar.gz coreclr-5e03cb09e3754e4a3430ba424a1352b9c01ff098.tar.bz2 coreclr-5e03cb09e3754e4a3430ba424a1352b9c01ff098.zip | |
[x86/Linux] Use CDECL instead of STDCALL (#10410)
[x86/Linux] Use CDECL instead of STDCALL
Use STDCALL/THISCALL/FASTCALL if callconv is explicitly specified
Merge two adjustment (argument/alignment) into one
Diffstat (limited to 'src/vm/comdelegate.cpp')
| -rw-r--r-- | src/vm/comdelegate.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/vm/comdelegate.cpp b/src/vm/comdelegate.cpp index 20ae6953b8..2682c2d32a 100644 --- a/src/vm/comdelegate.cpp +++ b/src/vm/comdelegate.cpp @@ -277,7 +277,14 @@ VOID GenerateShuffleArray(MethodDesc* pInvoke, MethodDesc *pTargetMeth, SArray<S COMPlusThrow(kVerificationException); } - UINT stackSizeDelta = stackSizeSrc - stackSizeDst; + UINT stackSizeDelta; + +#ifdef UNIX_X86_ABI + // Stack does not shrink as UNIX_X86_ABI uses CDECL (instead of STDCALL). + stackSizeDelta = 0; +#else + stackSizeDelta = stackSizeSrc - stackSizeDst; +#endif INT ofsSrc, ofsDst; |