diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index e04300df2f6..6542b5f15f1 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -98,22 +98,16 @@ namespace { const QLatin1String ArmToolchainPrefix("arm-linux-androideabi"); const QLatin1String X86ToolchainPrefix("x86"); - const QLatin1String MipsToolchainPrefix("mipsel-linux-android"); - const QLatin1String Mips64ToolchainPrefix("mips64el-linux-android"); const QLatin1String AArch64ToolchainPrefix("aarch64-linux-android"); const QLatin1String X86_64ToolchainPrefix("x86_64"); const QLatin1String ArmToolsPrefix("arm-linux-androideabi"); const QLatin1String X86ToolsPrefix("i686-linux-android"); - const QLatin1String MipsToolsPrefix("mipsel-linux-android"); - const QLatin1String Mips64ToolsPrefix("mips64el-linux-android"); const QLatin1String AArch64ToolsPrefix("aarch64-linux-android"); const QLatin1String X86_64ToolsPrefix("x86_64-linux-android"); const QLatin1String ArmToolsDisplayName("arm"); const QLatin1String X86ToolsDisplayName("i686"); - const QLatin1String MipsToolsDisplayName("mipsel"); - const QLatin1String Mips64ToolsDisplayName("mips64el"); const QLatin1String AArch64ToolsDisplayName("aarch64"); const QLatin1String X86_64ToolsDisplayName("x86_64"); @@ -168,17 +162,12 @@ Abi AndroidConfig::abiForToolChainPrefix(const QString &toolchainPrefix) arch = Abi::ArmArchitecture; } else if (toolchainPrefix == X86ToolchainPrefix) { arch = Abi::X86Architecture; - } else if (toolchainPrefix == MipsToolchainPrefix) { - arch = Abi::MipsArchitecture; } else if (toolchainPrefix == AArch64ToolchainPrefix) { arch = Abi::ArmArchitecture; wordWidth = 64; } else if (toolchainPrefix == X86_64ToolchainPrefix) { arch = Abi::X86Architecture; wordWidth = 64; - } else if (toolchainPrefix == Mips64ToolchainPrefix) { - arch = Abi::MipsArchitecture; - wordWidth = 64; } return Abi(arch, Abi::LinuxOS, Abi::AndroidLinuxFlavor, Abi::ElfFormat, wordWidth); @@ -195,10 +184,6 @@ QLatin1String AndroidConfig::toolchainPrefix(const Abi &abi) if (abi.wordWidth() == 64) return X86_64ToolchainPrefix; return X86ToolchainPrefix; - case Abi::MipsArchitecture: - if (abi.wordWidth() == 64) - return Mips64ToolchainPrefix; - return MipsToolchainPrefix; default: return Unknown; } @@ -215,10 +200,6 @@ QLatin1String AndroidConfig::toolsPrefix(const Abi &abi) if (abi.wordWidth() == 64) return X86_64ToolsPrefix; return X86ToolsPrefix; - case Abi::MipsArchitecture: - if (abi.wordWidth() == 64) - return Mips64ToolsPrefix; - return MipsToolsPrefix; default: return Unknown; } @@ -235,10 +216,6 @@ QLatin1String AndroidConfig::displayName(const Abi &abi) if (abi.wordWidth() == 64) return X86_64ToolsDisplayName; return X86ToolsDisplayName; - case Abi::MipsArchitecture: - if (abi.wordWidth() == 64) - return Mips64ToolsDisplayName; - return MipsToolsDisplayName; default: return Unknown; } diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index c593f258dd0..c0f692734cb 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -51,8 +51,8 @@ AvdDialog::AvdDialog(int minApiLevel, AndroidSdkManager *sdkManager, const QStri m_hideTipTimer.setSingleShot(true); if (targetArch.isEmpty()) { - m_avdDialog.abiComboBox->addItems(QStringList({"armeabi-v7a", "armeabi", "x86", "mips", - "arm64-v8a", "x86_64", "mips64"})); + m_avdDialog.abiComboBox->addItems(QStringList({"armeabi-v7a", "armeabi", "x86", + "arm64-v8a", "x86_64"})); } else { m_avdDialog.abiComboBox->addItems(QStringList(targetArch)); } diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index dade2e436e2..07647bdbda9 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -1315,26 +1315,10 @@ void ProjectExplorer::ProjectExplorerPlugin::testAbiFromTargetTriplet_data() << int(Abi::LinuxOS) << int(Abi::GenericFlavor) << int(Abi::ElfFormat) << 32; - QTest::newRow("mipsel-linux-android") << int(Abi::MipsArchitecture) - << int(Abi::LinuxOS) << int(Abi::AndroidLinuxFlavor) - << int(Abi::ElfFormat) << 32; - - QTest::newRow("mipsel-unknown-linux-android") << int(Abi::MipsArchitecture) - << int(Abi::LinuxOS) << int(Abi::AndroidLinuxFlavor) - << int(Abi::ElfFormat) << 32; - QTest::newRow("mips-linux-gnu") << int(Abi::MipsArchitecture) << int(Abi::LinuxOS) << int(Abi::GenericFlavor) << int(Abi::ElfFormat) << 32; - QTest::newRow("mips64el-linux-android") << int(Abi::MipsArchitecture) - << int(Abi::LinuxOS) << int(Abi::AndroidLinuxFlavor) - << int(Abi::ElfFormat) << 64; - - QTest::newRow("mips64el-unknown-linux-android") << int(Abi::MipsArchitecture) - << int(Abi::LinuxOS) << int(Abi::AndroidLinuxFlavor) - << int(Abi::ElfFormat) << 64; - QTest::newRow("mips64-linux-octeon-gnu") << int(Abi::MipsArchitecture) << int(Abi::LinuxOS) << int(Abi::GenericFlavor) << int(Abi::ElfFormat) << 64;