Skip to content

Commit e55e636

Browse files
committed
[MERGE #6041 @wyrichte] Fixing ARM64 build issues
Merge pull request #6041 from wyrichte:build/wyrichte/ARM64_cleanup
2 parents 1c5ab56 + 9b6c91d commit e55e636

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

lib/Backend/Func.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1324,7 +1324,7 @@ Func::EndPhase(Js::Phase tag, bool dump)
13241324
{
13251325
Assert(!this->isPostLower);
13261326
this->isPostLower = true;
1327-
#ifndef _M_ARM // Need to verify ARM is clean.
1327+
#if !defined(_M_ARM) && !defined(_M_ARM64) // Need to verify ARM is clean.
13281328
DbCheckPostLower dbCheck(this);
13291329
dbCheck.CheckNestedHelperCalls();
13301330
#endif

lib/Runtime/Base/ThreadContextInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ ThreadContextInfo::SetValidCallTargetInternal(
507507
#endif
508508
)
509509
{
510-
_guard_check_icall((uintptr_t)callTargetAddress);
510+
_GUARD_CHECK_ICALL((uintptr_t)callTargetAddress);
511511
}
512512

513513
if (PHASE_TRACE1(Js::CFGPhase))

lib/Runtime/Base/ThreadContextInfo.h

+3
Original file line numberDiff line numberDiff line change
@@ -179,3 +179,6 @@ uintptr_t ShiftAddr(const ThreadContextInfo*const context, T* address)
179179

180180
uintptr_t ShiftAddr(const ThreadContextInfo*const context, uintptr_t address);
181181

182+
#ifndef _GUARD_CHECK_ICALL
183+
#define _GUARD_CHECK_ICALL _guard_check_icall
184+
#endif

0 commit comments

Comments
 (0)