[MERGE #6359 @pleath] Fixing ARM64 build issue

Merge pull request #6359 from pleath:arm64build
chakra-core · Dec 20, 2019 · 9741bdf · 9741bdf
2 parents cd96553 + 048418e
commit 9741bdf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/Runtime/Base/ThreadContextInfo.cpp b/lib/Runtime/Base/ThreadContextInfo.cpp
@@ -493,7 +493,7 @@ ThreadContextInfo::SetValidCallTargetInternal(
 #endif
             )
         {
-            _guard_check_icall((uintptr_t)callTargetAddress);
+            _GUARD_CHECK_ICALL((uintptr_t)callTargetAddress);
         }
 
         if (PHASE_TRACE1(Js::CFGPhase))

diff --git a/lib/Runtime/Base/ThreadContextInfo.h b/lib/Runtime/Base/ThreadContextInfo.h
@@ -174,3 +174,6 @@ uintptr_t ShiftAddr(const ThreadContextInfo*const context, T* address)
 
 uintptr_t ShiftAddr(const ThreadContextInfo*const context, uintptr_t address);
 
+#ifndef _GUARD_CHECK_ICALL
+#define _GUARD_CHECK_ICALL _guard_check_icall
+#endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -493,7 +493,7 @@ ThreadContextInfo::SetValidCallTargetInternal( @@
     #endif
                 )
             {
-                _guard_check_icall((uintptr_t)callTargetAddress);
+                _GUARD_CHECK_ICALL((uintptr_t)callTargetAddress);
             }
             if (PHASE_TRACE1(Js::CFGPhase))
@@ Expand Down @@