Title: [220834] trunk/Source/_javascript_Core
- Revision
- 220834
- Author
- [email protected]
- Date
- 2017-08-17 00:04:19 -0700 (Thu, 17 Aug 2017)
Log Message
Gardening: build fix for ARM_TRADITIONAL after r220807.
https://bugs.webkit.org/show_bug.cgi?id=175617
Not reviewed.
* assembler/MacroAssemblerARM.cpp:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (220833 => 220834)
--- trunk/Source/_javascript_Core/ChangeLog 2017-08-17 07:02:31 UTC (rev 220833)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-08-17 07:04:19 UTC (rev 220834)
@@ -1,3 +1,12 @@
+2017-08-17 Mark Lam <[email protected]>
+
+ 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 <[email protected]>
Add back the ability to disable MASM_PROBE from the build.
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp (220833 => 220834)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp 2017-08-17 07:02:31 UTC (rev 220833)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp 2017-08-17 07:04:19 UTC (rev 220834)
@@ -336,7 +336,8 @@
// 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).
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
