Failed to apply patch for src/mips/macro-assembler-mips.cc:
While running git apply --index -3 -p1;
error: patch failed: src/mips/macro-assembler-mips.cc:4021
Falling back to three-way merge...
Applied patch to 'src/mips/macro-assembler-mips.cc' with conflicts.
U src/mips/macro-assembler-mips.cc
Patch: src/mips/macro-assembler-mips.cc
Index: src/mips/macro-assembler-mips.cc
diff --git a/src/mips/macro-assembler-mips.cc
b/src/mips/macro-assembler-mips.cc
index
2a5ea1adc5314f4ff6ba421f02f8014e5134bb8e..5cc505d1679177a1054a173708457f018e7f2d10
100644
--- a/src/mips/macro-assembler-mips.cc
+++ b/src/mips/macro-assembler-mips.cc
@@ -4021,22 +4021,6 @@
}
-void MacroAssembler::CmpWeakValue(Register match, Register value,
- Handle<WeakCell> cell) {
- li(match, Operand(cell));
- lw(match, FieldMemOperand(match, WeakCell::kValueOffset));
- Subu(match, value, match);
-}
-
-
-void MacroAssembler::LoadWeakValue(Register value, Handle<WeakCell> cell,
- Label* miss) {
- li(value, Operand(cell));
- lw(value, FieldMemOperand(value, WeakCell::kValueOffset));
- JumpIfNotSmi(value, miss);
-}
-
-
void MacroAssembler::MovFromFloatResult(DoubleRegister dst) {
if (IsMipsSoftFloatABI) {
if (kArchEndian == kLittle) {
https://codereview.chromium.org/771033003/
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
