Browse Source

Fix ARM nojit build.

Need to disable interpreter dynamic thunks
Curtis Man 10 năm trước cách đây
mục cha
commit
23a77d662a
2 tập tin đã thay đổi với 11 bổ sung1 xóa
  1. 1 1
      Build/armasm.targets
  2. 10 0
      lib/Runtime/Language/arm/arm_Thunks.asm

+ 1 - 1
Build/armasm.targets

@@ -110,7 +110,7 @@
        ToolArchitecture                   ="$(CLToolArchitecture)"
        TrackerFrameworkPath               ="$(CLTrackerFrameworkPath)"
        TrackerSdkPath                     ="$(CLTrackerSdkPath)"
-       TrackedInputFilesToIgnore             ="@(ClNoDependencies)"
+       TrackedInputFilesToIgnore          ="@(ClNoDependencies)"
 
        AcceptableNonZeroExitCodes         ="%(ClCompile.AcceptableNonZeroExitCodes)"
        YieldDuringToolExecution           ="$(ClYieldDuringToolExecution)"

+ 10 - 0
lib/Runtime/Language/arm/arm_Thunks.asm

@@ -4,21 +4,28 @@
 ;-------------------------------------------------------------------------------------------------------
     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)
@@ -26,6 +33,7 @@
 
     TEXTAREA
 
+#ifdef _ENABLE_DYNAMIC_THUNKS
 ;;============================================================================================================
 ;; InterpreterStackFrame::DelayDynamicInterpreterThunk
 ;;============================================================================================================
@@ -71,6 +79,8 @@
 
     NESTED_END
 
+#endif ;; _ENABLE_DYNAMIC_THUNKS
+
 ;;============================================================================================================
 ;; ScriptContext::ProfileModeDeferredParsingThunk
 ;;============================================================================================================