diff options
author | Hyeongseok Oh <hseok82.oh@samsung.com> | 2017-02-07 13:06:36 +0900 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2017-02-06 20:06:36 -0800 |
commit | 3108cc7e12e004e6c6bab2daf7826dd97957101f (patch) | |
tree | 6f7a99358478e310cb9101762df7ba56b6457529 /src/zap | |
parent | ff1e4f3c2a9737f87608b735f6cd197523a2026b (diff) | |
download | coreclr-3108cc7e12e004e6c6bab2daf7826dd97957101f.tar.gz coreclr-3108cc7e12e004e6c6bab2daf7826dd97957101f.tar.bz2 coreclr-3108cc7e12e004e6c6bab2daf7826dd97957101f.zip |
[ARM32/Linux] Fix calling convention - stdcall in crossgen (#9364)
* [ARM32/Linux] Fix calling convention - sdcall in crossgen
- Fix calling convention:
not use stdcall for ENCODEMODULE_CALLBACK & DEFINETOKEN_CALLBACK in linux/x86
x86-host/arm32-target crossgen & x86 crossgen
build error in clang 3.9: not allowed calling convention casting
Diffstat (limited to 'src/zap')
-rw-r--r-- | src/zap/zapimport.cpp | 2 | ||||
-rw-r--r-- | src/zap/zapimport.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/zap/zapimport.cpp b/src/zap/zapimport.cpp index 47d0def2c1..3e4e45d0c7 100644 --- a/src/zap/zapimport.cpp +++ b/src/zap/zapimport.cpp @@ -351,7 +351,7 @@ ZapGenericSignature * ZapImportTable::GetGenericSignature(PVOID signature, BOOL // At ngen time Zapper::CompileModule PlaceFixups called from // code:ZapSig.GetSignatureForTypeHandle // -/*static*/ DWORD __stdcall ZapImportTable::EncodeModuleHelper( LPVOID compileContext, +/*static*/ DWORD ZapImportTable::EncodeModuleHelper( LPVOID compileContext, CORINFO_MODULE_HANDLE referencedModule) { ZapImportTable * pTable = (ZapImportTable *)compileContext; diff --git a/src/zap/zapimport.h b/src/zap/zapimport.h index 34a673ecf5..3ab9a2734e 100644 --- a/src/zap/zapimport.h +++ b/src/zap/zapimport.h @@ -301,7 +301,7 @@ class ZapImportTable : public ZapNode ModuleReferenceEntry * GetModuleReference(CORINFO_MODULE_HANDLE handle); - static DWORD __stdcall EncodeModuleHelper(LPVOID referencingModule, CORINFO_MODULE_HANDLE referencedModule); + static DWORD EncodeModuleHelper(LPVOID referencingModule, CORINFO_MODULE_HANDLE referencedModule); ImportTable m_imports; // Interned ZapImport * SHash< NoRemoveSHashTraits < ZapBlob::SHashTraits > > m_blobs; // Interned ZapBlos for signatures and fixups |