Preliminary changes to allow mips target to build.
It compiles, but it doesn't work yet.
Change-Id: I2973a03bd956d8d398b9cfd1047e66fbf3ff439c
diff --git a/src/compiler.cc b/src/compiler.cc
index e31b9b5..466e2df 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -409,12 +409,17 @@
ByteArray* Compiler::CreateResolutionStub(InstructionSet instruction_set,
Runtime::TrampolineType type) {
- if (instruction_set == kX86) {
- return x86::X86CreateResolutionTrampoline(type);
- } else {
- CHECK(instruction_set == kArm || instruction_set == kThumb2);
- // Generates resolution stub using ARM instruction set
- return arm::ArmCreateResolutionTrampoline(type);
+ switch (instruction_set) {
+ case kArm:
+ case kThumb2:
+ return arm::ArmCreateResolutionTrampoline(type);
+ case kMips:
+ return mips::MipsCreateResolutionTrampoline(type);
+ case kX86:
+ return x86::X86CreateResolutionTrampoline(type);
+ default:
+ LOG(FATAL) << "Unknown InstructionSet: " << instruction_set;
+ return NULL;
}
}
@@ -423,6 +428,8 @@
case kArm:
case kThumb2:
return arm::CreateJniDlsymLookupStub();
+ case kMips:
+ return mips::CreateJniDlsymLookupStub();
case kX86:
return x86::CreateJniDlsymLookupStub();
default:
@@ -432,12 +439,17 @@
}
ByteArray* Compiler::CreateAbstractMethodErrorStub(InstructionSet instruction_set) {
- if (instruction_set == kX86) {
- return x86::CreateAbstractMethodErrorStub();
- } else {
- CHECK(instruction_set == kArm || instruction_set == kThumb2);
- // Generates resolution stub using ARM instruction set
- return arm::CreateAbstractMethodErrorStub();
+ switch (instruction_set) {
+ case kArm:
+ case kThumb2:
+ return arm::CreateAbstractMethodErrorStub();
+ case kMips:
+ return mips::CreateAbstractMethodErrorStub();
+ case kX86:
+ return x86::CreateAbstractMethodErrorStub();
+ default:
+ LOG(FATAL) << "Unknown InstructionSet: " << instruction_set;
+ return NULL;
}
}