Fix for missing symbol OnHijackTripThread

PR #6522 changed from OnHijackScalarTripThread to OnHijackTripThread; however, missed changing this definition for arm windows.
dotnet · Aug 8, 2016 · 49b8766 · 49b8766
1 parent deb00ad
commit 49b8766
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/src/vm/amd64/unixasmhelpers.S b/src/vm/amd64/unixasmhelpers.S
@@ -174,7 +174,7 @@ NESTED_END JIT_RareDisableHelper, _TEXT
 #ifdef FEATURE_HIJACK
 
 //------------------------------------------------
-// OnHijackScalarTripThread
+// OnHijackTripThread
 //
 NESTED_ENTRY OnHijackTripThread, _TEXT, NoHandler
 

diff --git a/src/vm/arm/asmhelpers.asm b/src/vm/arm/asmhelpers.asm
@@ -1690,22 +1690,9 @@ Done
 
 #ifdef FEATURE_HIJACK
 
-; ------------------------------------------------------------------
-; Hijack function for functions which return a reference type
-        NESTED_ENTRY OnHijackGCTripThread
-        PROLOG_PUSH {r0,r4-r11,lr}
-
-        CHECK_STACK_ALIGNMENT
-
-        mov r0, sp
-        bl OnHijackWorker
-
-        EPILOG_POP {r0,r4-r11,pc}
-        NESTED_END
-
 ; ------------------------------------------------------------------
 ; Hijack function for functions which return a value type
-        NESTED_ENTRY OnHijackScalarTripThread
+        NESTED_ENTRY OnHijackTripThread
         PROLOG_PUSH {r0,r4-r11,lr}
 
         PROLOG_VPUSH {d0-d3}    ; saving as d0-d3 can have the floating point return value