From: Dmitri Botcharnikov <dmitry.b@samsung.com>
Date: Tue, 31 Jul 2018 13:40:47 +0000 (+0300)
Subject: Fix build for clang 5.0
X-Git-Tag: submit/tizen/20180731.144118^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea3fa28dcbd44869b56b350b1758359b5d51a533;p=sdk%2Ftools%2Fcoreprofiler.git

Fix build for clang 5.0

Change-Id: Id81058b737055bea678d9dc9bba84d0e1df2af5a
---

diff --git a/src/arch/i386/asmhelpers.S b/src/arch/i386/asmhelpers.S
index f8248ed..f34a312 100644
--- 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 4
+    ret
 NESTED_END EnterNaked3, _TEXT
 
 //
@@ -46,7 +46,7 @@ NESTED_ENTRY LeaveNaked3, _TEXT, NoHandler
     EPILOG_POP ebx
     EPILOG_POP eax
     EPILOG_END
-    ret 4
+    ret
 NESTED_END LeaveNaked3, _TEXT
 
 //
@@ -70,5 +70,5 @@ NESTED_ENTRY TailcallNaked3, _TEXT, NoHandler
     EPILOG_POP ebx
     EPILOG_POP eax
     EPILOG_END
-    ret 4
+    ret
 NESTED_END TailcallNaked3, _TEXT
diff --git a/src/trace/executiontrace.cpp b/src/trace/executiontrace.cpp
index 85187c5..9aac738 100644
--- 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 __stdcall void EnterNaked3(FunctionIDOrClientID functionIDOrClientID);
-EXTERN_C __stdcall void LeaveNaked3(FunctionIDOrClientID functionIDOrClientID);
-EXTERN_C __stdcall void TailcallNaked3(FunctionIDOrClientID functionIDOrClientID);
+EXTERN_C void EnterNaked3(FunctionIDOrClientID functionIDOrClientID);
+EXTERN_C void LeaveNaked3(FunctionIDOrClientID functionIDOrClientID);
+EXTERN_C void TailcallNaked3(FunctionIDOrClientID functionIDOrClientID);
 
 #ifdef _TARGET_ARM_
 EXTERN_C UINT_PTR getPrevPC();
@@ -343,7 +343,7 @@ void ExecutionTrace::UpdateCallStackPush(
     state.stackWillBeChanged = true;
     m_profiler.GetCommonTrace().InterruptSampling(
         state,
-        [&funcInfo, prevIP](ThreadInfo &thrInfo, SamplingSharedState &state)
+        [prevIP](ThreadInfo &thrInfo, SamplingSharedState &state)
         {
             EventChannel &channel = thrInfo.eventChannel;
             if (channel.GetStackSize() > 0)