versioner: don't require mips headers.
If we remove the mips uapi headers, versioner fails because it assumes
they're available. We'll need a new versioner prebuilt beforre we can
remove the libc/versioner-dependencies/mips* symlinks.
Test: treehugger
Change-Id: Ife6df0cb57938f806a31ec334d648df9694c3d17
diff --git a/tools/versioner/src/Preprocessor.cpp b/tools/versioner/src/Preprocessor.cpp
index 9eac2ab..4ee3446 100644
--- a/tools/versioner/src/Preprocessor.cpp
+++ b/tools/versioner/src/Preprocessor.cpp
@@ -140,15 +140,12 @@
std::vector<std::string> expressions;
static const std::vector<std::pair<std::string, std::set<Arch>>> arch_sets = {
{ "", supported_archs },
- { "!defined(__LP64__)", { Arch::arm, Arch::mips, Arch::x86 } },
- { "defined(__LP64__)", { Arch::arm64, Arch::mips64, Arch::x86_64 } },
- { "defined(__mips__)", { Arch::mips, Arch::mips64 } },
+ { "!defined(__LP64__)", { Arch::arm, Arch::x86 } },
+ { "defined(__LP64__)", { Arch::arm64, Arch::x86_64 } },
};
std::map<Arch, std::string> individual_archs = {
{ Arch::arm, "defined(__arm__)" },
{ Arch::arm64, "defined(__aarch64__)" },
- { Arch::mips, "defined(__mips__) && !defined(__LP64__)" },
- { Arch::mips64, "defined(__mips__) && defined(__LP64__)" },
{ Arch::x86, "defined(__i386__)" },
{ Arch::x86_64, "defined(__x86_64__)" },
};