Gardening: build fix for ARM_TRADITIONAL after r220807.
authormark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Aug 2017 07:04:19 +0000 (07:04 +0000)
committermark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Aug 2017 07:04:19 +0000 (07:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=175617

Not reviewed.

* assembler/MacroAssemblerARM.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@220834 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp

index b102b61..55c2b7e 100644 (file)
@@ -1,3 +1,12 @@
+2017-08-17  Mark Lam  <mark.lam@apple.com>
+
+        Gardening: build fix for ARM_TRADITIONAL after r220807.
+        https://bugs.webkit.org/show_bug.cgi?id=175617
+
+        Not reviewed.
+
+        * assembler/MacroAssemblerARM.cpp:
+
 2017-08-16  Mark Lam  <mark.lam@apple.com>
 
         Add back the ability to disable MASM_PROBE from the build.
index a4374f8..d228ec0 100644 (file)
@@ -336,7 +336,8 @@ asm (
     // Call initializeStackFunction if present.
     LOCAL_LABEL_STRING(ctiMasmProbeTrampolineProbeContextIsSafe) ":" "\n"
     "ldr       r2, [fp, #" STRINGIZE_VALUE_OF(PROBE_INIT_STACK_FUNCTION_OFFSET) "]" "\n"
-    "cbz       r2, " LOCAL_LABEL_STRING(ctiMasmProbeTrampolineRestoreRegisters) "\n"
+    "cmp       r2, #0" "\n"
+    "beq       r2, " LOCAL_LABEL_STRING(ctiMasmProbeTrampolineRestoreRegisters) "\n"
 
     "mov       r0, fp" "\n" // Set the ProbeContext* arg.
     "blx       r2" "\n" // Call the initializeStackFunction (loaded into r2 above).