Fix call conventions and build for clang 5

Signed-off-by: Petr Bred <p.bred@samsung.com>

diff --git a/src/arch/i386/asmhelpers.S b/src/arch/i386/asmhelpers.S
index f34a312894f6a1fabf6a7f2848f7324da72df002..f8248eddba1283cf4002a30e486128b0e88bd1b8 100644 (file)
--- a/src/arch/i386/asmhelpers.S
+++ b/src/arch/i386/asmhelpers.S
@@ -22,7 +22,7 @@ NESTED_ENTRY EnterNaked3, _TEXT, NoHandler
     EPILOG_POP ebx
     EPILOG_POP eax
     EPILOG_END
-    ret
+    ret 4
 NESTED_END EnterNaked3, _TEXT
 
 //
@@ -46,7 +46,7 @@ NESTED_ENTRY LeaveNaked3, _TEXT, NoHandler
     EPILOG_POP ebx
     EPILOG_POP eax
     EPILOG_END
-    ret
+    ret 4
 NESTED_END LeaveNaked3, _TEXT
 
 //
@@ -70,5 +70,5 @@ NESTED_ENTRY TailcallNaked3, _TEXT, NoHandler
     EPILOG_POP ebx
     EPILOG_POP eax
     EPILOG_END
-    ret
+    ret 4
 NESTED_END TailcallNaked3, _TEXT

diff --git a/src/trace/executiontrace.cpp b/src/trace/executiontrace.cpp
index 9aac73835d680e4ddbfbda8585f49ce178682206..8d3ad9a91049509ca0dbccd3c9a31af1d4a0ab64 100644 (file)
--- a/src/trace/executiontrace.cpp
+++ b/src/trace/executiontrace.cpp
@@ -30,9 +30,9 @@ EXTERN_C UINT_PTR __stdcall FunctionIDMapStub(
         FunctionIDMap(funcId, pbHookFunction);
 }
 
-EXTERN_C void EnterNaked3(FunctionIDOrClientID functionIDOrClientID);
-EXTERN_C void LeaveNaked3(FunctionIDOrClientID functionIDOrClientID);
-EXTERN_C void TailcallNaked3(FunctionIDOrClientID functionIDOrClientID);
+EXTERN_C void __stdcall EnterNaked3(FunctionIDOrClientID functionIDOrClientID);
+EXTERN_C void __stdcall LeaveNaked3(FunctionIDOrClientID functionIDOrClientID);
+EXTERN_C void __stdcall TailcallNaked3(FunctionIDOrClientID functionIDOrClientID);
 
 #ifdef _TARGET_ARM_
 EXTERN_C UINT_PTR getPrevPC();