Skip to content

Remove references to MipsAndroid as it is unsupported #123810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2025
Merged

Remove references to MipsAndroid as it is unsupported #123810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 0 additions & 51 deletions clang/lib/Driver/ToolChains/Gnu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,53 +1146,6 @@ static bool findMipsCsMultilibs(const Driver &D,
return false;
}

static bool findMipsAndroidMultilibs(const Driver &D,
llvm::vfs::FileSystem &VFS, StringRef Path,
const Multilib::flags_list &Flags,
FilterNonExistent &NonExistent,
DetectedMultilibs &Result) {

MultilibSet AndroidMipsMultilibs =
MultilibSetBuilder()
.Maybe(MultilibBuilder("/mips-r2", {}, {}).flag("-march=mips32r2"))
.Maybe(MultilibBuilder("/mips-r6", {}, {}).flag("-march=mips32r6"))
.makeMultilibSet()
.FilterOut(NonExistent);

MultilibSet AndroidMipselMultilibs =
MultilibSetBuilder()
.Either(MultilibBuilder().flag("-march=mips32"),
MultilibBuilder("/mips-r2", "", "/mips-r2")
.flag("-march=mips32r2"),
MultilibBuilder("/mips-r6", "", "/mips-r6")
.flag("-march=mips32r6"))
.makeMultilibSet()
.FilterOut(NonExistent);

MultilibSet AndroidMips64elMultilibs =
MultilibSetBuilder()
.Either(MultilibBuilder().flag("-march=mips64r6"),
MultilibBuilder("/32/mips-r1", "", "/mips-r1")
.flag("-march=mips32"),
MultilibBuilder("/32/mips-r2", "", "/mips-r2")
.flag("-march=mips32r2"),
MultilibBuilder("/32/mips-r6", "", "/mips-r6")
.flag("-march=mips32r6"))
.makeMultilibSet()
.FilterOut(NonExistent);

MultilibSet *MS = &AndroidMipsMultilibs;
if (VFS.exists(Path + "/mips-r6"))
MS = &AndroidMipselMultilibs;
else if (VFS.exists(Path + "/32"))
MS = &AndroidMips64elMultilibs;
if (MS->select(D, Flags, Result.SelectedMultilibs)) {
Result.Multilibs = *MS;
return true;
}
return false;
}

static bool findMipsMuslMultilibs(const Driver &D,
const Multilib::flags_list &Flags,
FilterNonExistent &NonExistent,
Expand Down Expand Up @@ -1560,10 +1513,6 @@ bool clang::driver::findMIPSMultilibs(const Driver &D,
addMultilibFlag(isMipsEL(TargetArch), "-EL", Flags);
addMultilibFlag(!isMipsEL(TargetArch), "-EB", Flags);

if (TargetTriple.isAndroid())
return findMipsAndroidMultilibs(D, D.getVFS(), Path, Flags, NonExistent,
Result);

if (TargetTriple.getVendor() == llvm::Triple::MipsTechnologies &&
TargetTriple.getOS() == llvm::Triple::Linux &&
TargetTriple.getEnvironment() == llvm::Triple::UnknownEnvironment)
Expand Down
Loading