Skip to content

Commit b821aae

Browse files
authored
Remove references to MipsAndroid as it is unsupported (llvm#123810)
1 parent d33e33f commit b821aae

File tree

1 file changed

+0
-51
lines changed

1 file changed

+0
-51
lines changed

clang/lib/Driver/ToolChains/Gnu.cpp

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,53 +1146,6 @@ static bool findMipsCsMultilibs(const Driver &D,
11461146
return false;
11471147
}
11481148

1149-
static bool findMipsAndroidMultilibs(const Driver &D,
1150-
llvm::vfs::FileSystem &VFS, StringRef Path,
1151-
const Multilib::flags_list &Flags,
1152-
FilterNonExistent &NonExistent,
1153-
DetectedMultilibs &Result) {
1154-
1155-
MultilibSet AndroidMipsMultilibs =
1156-
MultilibSetBuilder()
1157-
.Maybe(MultilibBuilder("/mips-r2", {}, {}).flag("-march=mips32r2"))
1158-
.Maybe(MultilibBuilder("/mips-r6", {}, {}).flag("-march=mips32r6"))
1159-
.makeMultilibSet()
1160-
.FilterOut(NonExistent);
1161-
1162-
MultilibSet AndroidMipselMultilibs =
1163-
MultilibSetBuilder()
1164-
.Either(MultilibBuilder().flag("-march=mips32"),
1165-
MultilibBuilder("/mips-r2", "", "/mips-r2")
1166-
.flag("-march=mips32r2"),
1167-
MultilibBuilder("/mips-r6", "", "/mips-r6")
1168-
.flag("-march=mips32r6"))
1169-
.makeMultilibSet()
1170-
.FilterOut(NonExistent);
1171-
1172-
MultilibSet AndroidMips64elMultilibs =
1173-
MultilibSetBuilder()
1174-
.Either(MultilibBuilder().flag("-march=mips64r6"),
1175-
MultilibBuilder("/32/mips-r1", "", "/mips-r1")
1176-
.flag("-march=mips32"),
1177-
MultilibBuilder("/32/mips-r2", "", "/mips-r2")
1178-
.flag("-march=mips32r2"),
1179-
MultilibBuilder("/32/mips-r6", "", "/mips-r6")
1180-
.flag("-march=mips32r6"))
1181-
.makeMultilibSet()
1182-
.FilterOut(NonExistent);
1183-
1184-
MultilibSet *MS = &AndroidMipsMultilibs;
1185-
if (VFS.exists(Path + "/mips-r6"))
1186-
MS = &AndroidMipselMultilibs;
1187-
else if (VFS.exists(Path + "/32"))
1188-
MS = &AndroidMips64elMultilibs;
1189-
if (MS->select(D, Flags, Result.SelectedMultilibs)) {
1190-
Result.Multilibs = *MS;
1191-
return true;
1192-
}
1193-
return false;
1194-
}
1195-
11961149
static bool findMipsMuslMultilibs(const Driver &D,
11971150
const Multilib::flags_list &Flags,
11981151
FilterNonExistent &NonExistent,
@@ -1560,10 +1513,6 @@ bool clang::driver::findMIPSMultilibs(const Driver &D,
15601513
addMultilibFlag(isMipsEL(TargetArch), "-EL", Flags);
15611514
addMultilibFlag(!isMipsEL(TargetArch), "-EB", Flags);
15621515

1563-
if (TargetTriple.isAndroid())
1564-
return findMipsAndroidMultilibs(D, D.getVFS(), Path, Flags, NonExistent,
1565-
Result);
1566-
15671516
if (TargetTriple.getVendor() == llvm::Triple::MipsTechnologies &&
15681517
TargetTriple.getOS() == llvm::Triple::Linux &&
15691518
TargetTriple.getEnvironment() == llvm::Triple::UnknownEnvironment)

0 commit comments

Comments
 (0)