[MERGE chakra-core#182] Fix ARM nojit build.

curtisman · curtisman · commit 59b31e5821b7 · 2016-01-22T15:45:30.000-08:00
Merge pull request chakra-core#182 from curtisman:arm_nojit Need to disable interpreter dynamic thunks Fixes chakra-core#169
diff --git a/Build/armasm.targets b/Build/armasm.targets
@@ -110,7 +110,7 @@
        ToolArchitecture                   ="$(CLToolArchitecture)"
        TrackerFrameworkPath               ="$(CLTrackerFrameworkPath)"
        TrackerSdkPath                     ="$(CLTrackerSdkPath)"
-       TrackedInputFilesToIgnore             ="@(ClNoDependencies)"
+       TrackedInputFilesToIgnore          ="@(ClNoDependencies)"
 
        AcceptableNonZeroExitCodes         ="%(ClCompile.AcceptableNonZeroExitCodes)"
        YieldDuringToolExecution           ="$(ClYieldDuringToolExecution)"
diff --git a/lib/Runtime/Language/arm/arm_Thunks.asm b/lib/Runtime/Language/arm/arm_Thunks.asm
@@ -4,28 +4,36 @@
 ;-------------------------------------------------------------------------------------------------------
     OPT 2   ; disable listing
 #include "ksarm.h"
+#if !DISABLE_JIT
+#define _ENABLE_DYNAMIC_THUNKS
+#endif
     OPT 1   ; re-enable listing
 
     TTL Lib\Runtime\Language\arm\arm_DelayDynamicInterpreterThunk.asm
 
+#ifdef _ENABLE_DYNAMIC_THUNKS
     ;Var InterpreterStackFrame::DelayDynamicInterpreterThunk(RecyclableObject* function, CallInfo callInfo, ...)
     EXPORT  |?DelayDynamicInterpreterThunk@InterpreterStackFrame@Js@@SAPAXPAVRecyclableObject@2@UCallInfo@2@ZZ|
     ;Var DynamicProfileInfo::EnsureDynamicProfileInfoThunk(RecyclableObject* function, CallInfo callInfo, ...)
     EXPORT  |?EnsureDynamicProfileInfoThunk@DynamicProfileInfo@Js@@SAPAXPAVRecyclableObject@2@UCallInfo@2@ZZ|
+#endif
     ; Var ScriptContext::ProfileModeDeferredParsingThunk(RecyclableObject* function, CallInfo callInfo, ...)
     EXPORT  |?ProfileModeDeferredParsingThunk@ScriptContext@Js@@SAPAXPAVRecyclableObject@2@UCallInfo@2@ZZ|
 
+#ifdef _ENABLE_DYNAMIC_THUNKS
     ;JavascriptMethod InterpreterStackFrame::EnsureDynamicInterpreterThunk(Js::ScriptFunction * function)
     IMPORT  |?EnsureDynamicInterpreterThunk@InterpreterStackFrame@Js@@CAP6APAXPAVRecyclableObject@2@UCallInfo@2@ZZPAVScriptFunction@2@@Z|
     ;JavascriptMethod DynamicProfileInfo::EnsureDynamicProfileInfoThunk(Js::ScriptFunction * function)
     IMPORT  |?EnsureDynamicProfileInfo@DynamicProfileInfo@Js@@CAP6APAXPAVRecyclableObject@2@UCallInfo@2@ZZPAVScriptFunction@2@@Z|
+#endif
     ;JavascriptMethod ScriptContext::ProfileModeDeferredParse(ScriptFunction **function)
     IMPORT  |?ProfileModeDeferredParse@ScriptContext@Js@@SAP6APAXPAVRecyclableObject@2@UCallInfo@2@ZZPAPAVScriptFunction@2@@Z|
     ;JavascriptMethod ScriptContext::ProfileModeDeferredDeserialize(ScriptFunction *function)
     IMPORT  |?ProfileModeDeferredDeserialize@ScriptContext@Js@@SAP6APAXPAVRecyclableObject@2@UCallInfo@2@ZZPAVScriptFunction@2@@Z|
 
     TEXTAREA
 
+#ifdef _ENABLE_DYNAMIC_THUNKS
 ;;============================================================================================================
 ;; InterpreterStackFrame::DelayDynamicInterpreterThunk
 ;;============================================================================================================
@@ -71,6 +79,8 @@
 
     NESTED_END
 
+#endif ;; _ENABLE_DYNAMIC_THUNKS
+
 ;;============================================================================================================
 ;; ScriptContext::ProfileModeDeferredParsingThunk
 ;;============================================================================================================
