diff options
| -rw-r--r-- | src/base/mutex.h | 2 | ||||
| -rw-r--r-- | src/compiler/codegen/mips/fp_mips.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/base/mutex.h b/src/base/mutex.h index 5cc021f245..190e7798ec 100644 --- a/src/base/mutex.h +++ b/src/base/mutex.h @@ -31,7 +31,7 @@ #if defined(__APPLE__) #define ART_USE_FUTEXES 0 #else -#define ART_USE_FUTEXES 1 +#define ART_USE_FUTEXES !defined(__mips__) #endif // Currently Darwin doesn't support locks with timeouts. diff --git a/src/compiler/codegen/mips/fp_mips.cc b/src/compiler/codegen/mips/fp_mips.cc index e718c5cfd4..6ffc5e0e3e 100644 --- a/src/compiler/codegen/mips/fp_mips.cc +++ b/src/compiler/codegen/mips/fp_mips.cc @@ -49,6 +49,8 @@ bool MipsCodegen::GenArithOpFloat(CompilationUnit *cu, Instruction::Code opcode, case Instruction::MUL_FLOAT: op = kMipsFmuls; break; + case Instruction::REM_FLOAT_2ADDR: + case Instruction::REM_FLOAT: FlushAllRegs(cu); // Send everything to home location CallRuntimeHelperRegLocationRegLocation(cu, ENTRYPOINT_OFFSET(pFmodf), rl_src1, rl_src2, false); rl_result = GetReturn(cu, true); |