Skip to content

Commit

Permalink
Remove MIPS support from dex2oat.
Browse files Browse the repository at this point in the history
Test: aosp_taimen-userdebug boots.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Bug: 147346243
Change-Id: Id29631ca0344d5bd4fcc8df7605580c9ed628f72
  • Loading branch information
vmarko committed Feb 12, 2020
1 parent f0e99bd commit 8bc5991
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 732 deletions.
3 changes: 0 additions & 3 deletions build/apex/art_apex_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -772,9 +772,6 @@ def run(self):
self._checker.check_art_test_executable('verifier_deps_test')
# These tests depend on a specific code generator and are conditionally included.
self._checker.check_optional_art_test_executable('relative_patcher_arm64_test')
self._checker.check_optional_art_test_executable('relative_patcher_mips32r6_test')
self._checker.check_optional_art_test_executable('relative_patcher_mips64_test')
self._checker.check_optional_art_test_executable('relative_patcher_mips_test')
self._checker.check_optional_art_test_executable('relative_patcher_thumb2_test')
self._checker.check_optional_art_test_executable('relative_patcher_x86_64_test')
self._checker.check_optional_art_test_executable('relative_patcher_x86_test')
Expand Down
2 changes: 1 addition & 1 deletion cmdline/cmdline.h
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ struct CmdlineArgs {
" (specifies /system/framework/<arch>/boot.art as the image file)\n"
"\n";
usage += android::base::StringPrintf( // Optional.
" --instruction-set=(arm|arm64|mips|mips64|x86|x86_64): for locating the image\n"
" --instruction-set=(arm|arm64|x86|x86_64): for locating the image\n"
" file based on the image location set.\n"
" Example: --instruction-set=x86\n"
" Default: %s\n"
Expand Down
31 changes: 0 additions & 31 deletions dex2oat/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,6 @@ art_cc_defaults {
"linker/arm64/relative_patcher_arm64.cc",
],
},
mips: {
srcs: [
"linker/mips/relative_patcher_mips.cc",
],
},
mips64: {
srcs: [
"linker/mips64/relative_patcher_mips64.cc",
],
},
x86: {
srcs: [
"linker/x86/relative_patcher_x86.cc",
Expand Down Expand Up @@ -232,16 +222,6 @@ cc_defaults {
profile_file: "art/dex2oat_x86_x86_64.profdata",
},
},
android_mips64: {
pgo: {
profile_file: "art/dex2oat_mips_mips64.profdata",
},
},
android_mips: {
pgo: {
profile_file: "art/dex2oat_mips_mips64.profdata",
},
},
},
}

Expand Down Expand Up @@ -455,17 +435,6 @@ art_cc_test {
"linker/arm64/relative_patcher_arm64_test.cc",
],
},
mips: {
srcs: [
"linker/mips/relative_patcher_mips_test.cc",
"linker/mips/relative_patcher_mips32r6_test.cc",
],
},
mips64: {
srcs: [
"linker/mips64/relative_patcher_mips64_test.cc",
],
},
x86: {
srcs: [
"linker/x86/relative_patcher_x86_test.cc",
Expand Down
5 changes: 1 addition & 4 deletions dex2oat/dex2oat.cc
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#include "android-base/strings.h"

#include "arch/instruction_set_features.h"
#include "arch/mips/instruction_set_features_mips.h"
#include "art_method-inl.h"
#include "base/callee_save_type.h"
#include "base/dumpable.h"
Expand Down Expand Up @@ -310,7 +309,7 @@ NO_RETURN static void Usage(const char* fmt, ...) {
UsageError(" Example: --android-root=out/host/linux-x86");
UsageError(" Default: $ANDROID_ROOT");
UsageError("");
UsageError(" --instruction-set=(arm|arm64|mips|mips64|x86|x86_64): compile for a particular");
UsageError(" --instruction-set=(arm|arm64|x86|x86_64): compile for a particular");
UsageError(" instruction set.");
UsageError(" Example: --instruction-set=x86");
UsageError(" Default: arm");
Expand Down Expand Up @@ -1011,8 +1010,6 @@ class Dex2Oat final {
case InstructionSet::kArm64:
case InstructionSet::kX86:
case InstructionSet::kX86_64:
case InstructionSet::kMips:
case InstructionSet::kMips64:
compiler_options_->implicit_null_checks_ = true;
compiler_options_->implicit_so_checks_ = true;
break;
Expand Down
2 changes: 0 additions & 2 deletions dex2oat/driver/compiler_driver.cc
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,6 @@ static bool InstructionSetHasGenericJniStub(InstructionSet isa) {
case InstructionSet::kArm:
case InstructionSet::kArm64:
case InstructionSet::kThumb2:
case InstructionSet::kMips:
case InstructionSet::kMips64:
case InstructionSet::kX86:
case InstructionSet::kX86_64: return true;
default: return false;
Expand Down
107 changes: 0 additions & 107 deletions dex2oat/linker/mips/relative_patcher_mips.cc

This file was deleted.

61 changes: 0 additions & 61 deletions dex2oat/linker/mips/relative_patcher_mips.h

This file was deleted.

110 changes: 0 additions & 110 deletions dex2oat/linker/mips/relative_patcher_mips32r6_test.cc

This file was deleted.

Loading

0 comments on commit 8bc5991

Please sign in to comment.