From d5748d814005ab2f0b564cc717642493e67db6f4 Mon Sep 17 00:00:00 2001 From: Petr Bred Date: Fri, 3 Aug 2018 11:50:50 +0300 Subject: [Tizen] Fix call convension for profiler wrappers with clang 5 support Signed-off-by: Petr Bred --- src/pal/prebuilt/inc/corprof.h | 6 +++--- src/vm/eetoprofinterfaceimpl.cpp | 6 +++--- src/vm/i386/unixstubs.cpp | 6 +++--- src/vm/profilinghelper.cpp | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pal/prebuilt/inc/corprof.h b/src/pal/prebuilt/inc/corprof.h index 6e56677c31..e90efb9e23 100644 --- a/src/pal/prebuilt/inc/corprof.h +++ b/src/pal/prebuilt/inc/corprof.h @@ -442,13 +442,13 @@ typedef void __stdcall __stdcall FunctionTailcall2( UINT_PTR clientData, COR_PRF_FRAME_INFO func); -typedef void FunctionEnter3( +typedef void __stdcall __stdcall FunctionEnter3( FunctionIDOrClientID functionIDOrClientID); -typedef void FunctionLeave3( +typedef void __stdcall __stdcall FunctionLeave3( FunctionIDOrClientID functionIDOrClientID); -typedef void FunctionTailcall3( +typedef void __stdcall __stdcall FunctionTailcall3( FunctionIDOrClientID functionIDOrClientID); typedef void __stdcall __stdcall FunctionEnter3WithInfo( diff --git a/src/vm/eetoprofinterfaceimpl.cpp b/src/vm/eetoprofinterfaceimpl.cpp index cd5fb75cde..3f32b5a39d 100644 --- a/src/vm/eetoprofinterfaceimpl.cpp +++ b/src/vm/eetoprofinterfaceimpl.cpp @@ -2053,9 +2053,9 @@ HRESULT EEToProfInterfaceImpl::EnsureProfilerDetachable() } // Declarations for asm wrappers of profiler callbacks -EXTERN_C void ProfileEnterNaked(FunctionIDOrClientID functionIDOrClientID); -EXTERN_C void ProfileLeaveNaked(FunctionIDOrClientID functionIDOrClientID); -EXTERN_C void ProfileTailcallNaked(FunctionIDOrClientID functionIDOrClientID); +EXTERN_C void __stdcall ProfileEnterNaked(FunctionIDOrClientID functionIDOrClientID); +EXTERN_C void __stdcall ProfileLeaveNaked(FunctionIDOrClientID functionIDOrClientID); +EXTERN_C void __stdcall ProfileTailcallNaked(FunctionIDOrClientID functionIDOrClientID); #define PROFILECALLBACK(name) name##Naked //--------------------------------------------------------------------------------------- diff --git a/src/vm/i386/unixstubs.cpp b/src/vm/i386/unixstubs.cpp index 29f67a9c48..71cbceabb2 100644 --- a/src/vm/i386/unixstubs.cpp +++ b/src/vm/i386/unixstubs.cpp @@ -6,17 +6,17 @@ extern "C" { - void ProfileEnterNaked(FunctionIDOrClientID functionIDOrClientID) + void __stdcall ProfileEnterNaked(FunctionIDOrClientID functionIDOrClientID) { PORTABILITY_ASSERT("Implement for PAL"); } - void ProfileLeaveNaked(FunctionIDOrClientID functionIDOrClientID) + void __stdcall ProfileLeaveNaked(FunctionIDOrClientID functionIDOrClientID) { PORTABILITY_ASSERT("Implement for PAL"); } - void ProfileTailcallNaked(FunctionIDOrClientID functionIDOrClientID) + void __stdcall ProfileTailcallNaked(FunctionIDOrClientID functionIDOrClientID) { PORTABILITY_ASSERT("Implement for PAL"); } diff --git a/src/vm/profilinghelper.cpp b/src/vm/profilinghelper.cpp index 9f9de490cf..6082cba488 100644 --- a/src/vm/profilinghelper.cpp +++ b/src/vm/profilinghelper.cpp @@ -460,9 +460,9 @@ void ProfilingAPIUtility::LogProfInfo(int iStringResourceID, ...) // InitializeProfiling() below solely for the debug-only, test-only code to allow // enter/leave/tailcall to be turned on at startup without a profiler. See // code:ProfControlBlock#TestOnlyELT -EXTERN_C void ProfileEnterNaked(UINT_PTR clientData); -EXTERN_C void ProfileLeaveNaked(UINT_PTR clientData); -EXTERN_C void ProfileTailcallNaked(UINT_PTR clientData); +EXTERN_C __stdcall void ProfileEnterNaked(UINT_PTR clientData); +EXTERN_C __stdcall void ProfileLeaveNaked(UINT_PTR clientData); +EXTERN_C __stdcall void ProfileTailcallNaked(UINT_PTR clientData); #endif //PROF_TEST_ONLY_FORCE_ELT // ---------------------------------------------------------------------------- -- cgit v1.2.3