diff options
57 files changed, 225 insertions, 13 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 99bde6c38b2..aba6d38e23d 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -1353,18 +1353,22 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const { static const char *const MIPSLibDirs[] = { "/lib" }; static const char *const MIPSTriples[] = { "mips-linux-gnu", - "mips-mti-linux-gnu" }; + "mips-mti-linux-gnu", + "mips-img-linux-gnu" }; static const char *const MIPSELLibDirs[] = { "/lib" }; static const char *const MIPSELTriples[] = { "mipsel-linux-gnu", - "mipsel-linux-android" }; + "mipsel-linux-android", + "mips-img-linux-gnu" }; static const char *const MIPS64LibDirs[] = { "/lib64", "/lib" }; static const char *const MIPS64Triples[] = { "mips64-linux-gnu", "mips-mti-linux-gnu", + "mips-img-linux-gnu", "mips64-linux-gnuabi64" }; static const char *const MIPS64ELLibDirs[] = { "/lib64", "/lib" }; static const char *const MIPS64ELTriples[] = { "mips64el-linux-gnu", "mips-mti-linux-gnu", + "mips-img-linux-gnu", "mips64el-linux-android", "mips64el-linux-gnuabi64" }; @@ -1869,6 +1873,33 @@ static bool findMIPSMultilibs(const llvm::Triple &TargetTriple, StringRef Path, .FilterOut(NonExistent); } + MultilibSet ImgMultilibs; + { + Multilib Mips64r6 = Multilib() + .gccSuffix("/mips64r6") + .osSuffix("/mips64r6") + .includeSuffix("/mips64r6") + .flag("+m64").flag("-m32"); + + Multilib LittleEndian = Multilib() + .gccSuffix("/el") + .osSuffix("/el") + .includeSuffix("/el") + .flag("+EL").flag("-EB"); + + Multilib MAbi64 = Multilib() + .gccSuffix("/64") + .osSuffix("/64") + .includeSuffix("/64") + .flag("+mabi=64").flag("-mabi=n32").flag("-m32"); + + ImgMultilibs = MultilibSet() + .Maybe(Mips64r6) + .Maybe(MAbi64) + .Maybe(LittleEndian) + .FilterOut(NonExistent); + } + llvm::Triple::ArchType TargetArch = TargetTriple.getArch(); Multilib::flags_list Flags; @@ -1903,6 +1934,17 @@ static bool findMIPSMultilibs(const llvm::Triple &TargetTriple, StringRef Path, return false; } + if (TargetTriple.getVendor() == llvm::Triple::ImaginationTechnologies && + TargetTriple.getOS() == llvm::Triple::Linux && + TargetTriple.getEnvironment() == llvm::Triple::GNU) { + // Select mips-img-linux-gnu toolchain. + if (ImgMultilibs.select(Flags, Result.SelectedMultilib)) { + Result.Multilibs = ImgMultilibs; + return true; + } + return false; + } + // Sort candidates. Toolchain that best meets the directories goes first. // Then select the first toolchains matches command line flags. MultilibSet *candidates[] = { &DebianMipsMultilibs, &FSFMipsMultilibs, diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 588399dadb0..4c5b3ea627f 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -916,6 +916,14 @@ static void getMipsCPUAndABI(const ArgList &Args, const char *DefMips32CPU = "mips32r2"; const char *DefMips64CPU = "mips64r2"; + // MIPS32r6 is the default for mips(el)?-img-linux-gnu and MIPS64r6 is the + // default for mips64(el)?-img-linux-gnu. + if (Triple.getVendor() == llvm::Triple::ImaginationTechnologies && + Triple.getEnvironment() == llvm::Triple::GNU) { + DefMips32CPU = "mips32r6"; + DefMips64CPU = "mips64r6"; + } + if (Arg *A = Args.getLastArg(options::OPT_march_EQ, options::OPT_mcpu_EQ)) CPUName = A->getValue(); @@ -5186,7 +5194,7 @@ bool mips::hasMipsAbiArg(const ArgList &Args, const char *Value) { return A && (A->getValue() == StringRef(Value)); } -bool mips::isNaN2008(const ArgList &Args) { +bool mips::isNaN2008(const ArgList &Args, const llvm::Triple &Triple) { if (Arg *NaNArg = Args.getLastArg(options::OPT_mnan_EQ)) return llvm::StringSwitch<bool>(NaNArg->getValue()) .Case("2008", true) @@ -5194,10 +5202,9 @@ bool mips::isNaN2008(const ArgList &Args) { .Default(false); // NaN2008 is the default for MIPS32r6/MIPS64r6. - if (Arg *CPUArg = Args.getLastArg(options::OPT_mcpu_EQ)) - return llvm::StringSwitch<bool>(CPUArg->getValue()) - .Cases("mips32r6", "mips64r6", true) - .Default(false); + return llvm::StringSwitch<bool>(getCPUName(Args, Triple)) + .Cases("mips32r6", "mips64r6", true) + .Default(false); return false; } @@ -7022,16 +7029,16 @@ static StringRef getLinuxDynamicLinker(const ArgList &Args, return "/lib/ld-linux.so.3"; /* TODO: check which dynamic linker name. */ } else if (ToolChain.getArch() == llvm::Triple::mips || ToolChain.getArch() == llvm::Triple::mipsel) { - if (mips::isNaN2008(Args)) + if (mips::isNaN2008(Args, ToolChain.getTriple())) return "/lib/ld-linux-mipsn8.so.1"; return "/lib/ld.so.1"; } else if (ToolChain.getArch() == llvm::Triple::mips64 || ToolChain.getArch() == llvm::Triple::mips64el) { if (mips::hasMipsAbiArg(Args, "n32")) - return mips::isNaN2008(Args) ? "/lib32/ld-linux-mipsn8.so.1" - : "/lib32/ld.so.1"; - return mips::isNaN2008(Args) ? "/lib64/ld-linux-mipsn8.so.1" - : "/lib64/ld.so.1"; + return mips::isNaN2008(Args, ToolChain.getTriple()) + ? "/lib32/ld-linux-mipsn8.so.1" : "/lib32/ld.so.1"; + return mips::isNaN2008(Args, ToolChain.getTriple()) + ? "/lib64/ld-linux-mipsn8.so.1" : "/lib64/ld.so.1"; } else if (ToolChain.getArch() == llvm::Triple::ppc) return "/lib/ld.so.1"; else if (ToolChain.getArch() == llvm::Triple::ppc64 || diff --git a/clang/lib/Driver/Tools.h b/clang/lib/Driver/Tools.h index c4e6d6c8298..bc7f58bfbe9 100644 --- a/clang/lib/Driver/Tools.h +++ b/clang/lib/Driver/Tools.h @@ -218,7 +218,7 @@ namespace arm { namespace mips { bool hasMipsAbiArg(const llvm::opt::ArgList &Args, const char *Value); - bool isNaN2008(const llvm::opt::ArgList &Args); + bool isNaN2008(const llvm::opt::ArgList &Args, const llvm::Triple &Triple); } namespace darwin { diff --git a/clang/test/Driver/Inputs/mips_img_tree/bin/.keep b/clang/test/Driver/Inputs/mips_img_tree/bin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/bin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/crtbegin.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/crtbegin.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/crtbegin.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/crtend.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/crtend.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/crtend.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/el/crtbegin.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/el/crtbegin.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/el/crtbegin.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/el/crtend.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/el/crtend.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/el/crtend.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include-fixed/el/.keep b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include-fixed/el/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include-fixed/el/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include-fixed/mips64r6/64/el/.keep b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include-fixed/mips64r6/64/el/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include-fixed/mips64r6/64/el/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include-fixed/mips64r6/el/.keep b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include-fixed/mips64r6/el/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include-fixed/mips64r6/el/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include/.keep b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/include/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/crtbegin.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/crtbegin.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/crtbegin.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/crtend.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/crtend.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/crtend.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/el/crtbegin.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/el/crtbegin.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/el/crtbegin.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/el/crtend.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/el/crtend.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/64/el/crtend.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/crtbegin.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/crtbegin.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/crtbegin.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/crtend.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/crtend.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/crtend.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/el/crtbegin.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/el/crtbegin.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/el/crtbegin.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/el/crtend.o b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/el/crtend.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/lib/gcc/mips-img-linux-gnu/4.9.0/mips64r6/el/crtend.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/bin/.keep b/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/bin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/bin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/include/c++/4.9.0/.keep b/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/include/c++/4.9.0/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/include/c++/4.9.0/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/lib/el/.keep b/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/lib/el/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/lib/el/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/lib/mips64r6/64/el/.keep b/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/lib/mips64r6/64/el/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/lib/mips64r6/64/el/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/lib/mips64r6/el/.keep b/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/lib/mips64r6/el/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/mips-img-linux-gnu/lib/mips64r6/el/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/bin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/bin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/bin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/lib/crt1.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/lib/crt1.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/lib/crt1.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/lib/crti.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/lib/crti.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/lib/crti.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/lib/crtn.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/lib/crtn.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/lib/crtn.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/sbin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/sbin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/el/usr/sbin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/bin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/bin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/bin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/lib/crt1.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/lib/crt1.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/lib/crt1.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/lib/crti.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/lib/crti.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/lib/crti.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/lib/crtn.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/lib/crtn.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/lib/crtn.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/sbin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/sbin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/el/usr/sbin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/bin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/bin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/bin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/lib/crt1.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/lib/crt1.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/lib/crt1.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/lib/crti.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/lib/crti.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/lib/crti.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/lib/crtn.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/lib/crtn.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/lib/crtn.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/sbin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/sbin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/64/usr/sbin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/bin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/bin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/bin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/lib/crt1.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/lib/crt1.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/lib/crt1.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/lib/crti.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/lib/crti.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/lib/crti.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/lib/crtn.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/lib/crtn.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/lib/crtn.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/sbin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/sbin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/el/usr/sbin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/bin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/bin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/bin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/lib/crt1.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/lib/crt1.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/lib/crt1.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/lib/crti.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/lib/crti.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/lib/crti.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/lib/crtn.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/lib/crtn.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/lib/crtn.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/sbin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/sbin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/mips64r6/usr/sbin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/bin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/bin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/bin/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/include/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/include/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/include/.keep diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/lib/crt1.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/lib/crt1.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/lib/crt1.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/lib/crti.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/lib/crti.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/lib/crti.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/lib/crtn.o b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/lib/crtn.o new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/lib/crtn.o diff --git a/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/sbin/.keep b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/sbin/.keep new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/clang/test/Driver/Inputs/mips_img_tree/sysroot/usr/sbin/.keep diff --git a/clang/test/Driver/mips-img.cpp b/clang/test/Driver/mips-img.cpp new file mode 100644 index 00000000000..389e0f74108 --- /dev/null +++ b/clang/test/Driver/mips-img.cpp @@ -0,0 +1,163 @@ +// Check frontend and linker invocations on the IMG MIPS toolchain. +// +// = Big-endian, mips32r6 +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +// RUN: --target=mips-img-linux-gnu -mips32r6 \ +// RUN: --gcc-toolchain=%S/Inputs/mips_img_tree \ +// RUN: | FileCheck --check-prefix=CHECK-BE-32R6 %s +// CHECK-BE-32R6: "-internal-isystem" +// CHECK-BE-32R6: "[[TC:[^"]+/lib/gcc/mips-img-linux-gnu/4.9.0]]/../../../../mips-img-linux-gnu/include/c++/4.9.0" +// CHECK-BE-32R6: "-internal-isystem" +// CHECK-BE-32R6: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/mips-img-linux-gnu" +// CHECK-BE-32R6: "-internal-isystem" +// CHECK-BE-32R6: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/backward" +// CHECK-BE-32R6: "-internal-externc-isystem" +// CHECK-BE-32R6: "[[TC]]/include" +// CHECK-BE-32R6: "-internal-externc-isystem" +// CHECK-BE-32R6: "[[TC]]/../../../../sysroot/usr/include" +// CHECK-BE-32R6: "{{.*}}ld{{(.exe)?}}" +// CHECK-BE-32R6: "--sysroot=[[TC]]/../../../../sysroot" +// CHECK-BE-32R6: "-dynamic-linker" "/lib/ld-linux-mipsn8.so.1" +// CHECK-BE-32R6: "[[TC]]/../../../../sysroot/usr/lib/../lib{{/|\\\\}}crt1.o" +// CHECK-BE-32R6: "[[TC]]/../../../../sysroot/usr/lib/../lib{{/|\\\\}}crti.o" +// CHECK-BE-32R6: "[[TC]]{{/|\\\\}}crtbegin.o" +// CHECK-BE-32R6: "-L[[TC]]" +// CHECK-BE-32R6: "-L[[TC]]/../../../../mips-img-linux-gnu/lib/../lib" +// CHECK-BE-32R6: "-L[[TC]]/../../../../sysroot/usr/lib/../lib" +// CHECK-BE-32R6: "[[TC]]{{/|\\\\}}crtend.o" +// CHECK-BE-32R6: "[[TC]]/../../../../sysroot/usr/lib/../lib{{/|\\\\}}crtn.o" +// +// = Little-endian, mips32r6 +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +// RUN: --target=mips-img-linux-gnu -mips32r6 -EL \ +// RUN: --gcc-toolchain=%S/Inputs/mips_img_tree \ +// RUN: | FileCheck --check-prefix=CHECK-LE-32R6 %s +// CHECK-LE-32R6: "-internal-isystem" +// CHECK-LE-32R6: "[[TC:[^"]+/lib/gcc/mips-img-linux-gnu/4.9.0]]/../../../../mips-img-linux-gnu/include/c++/4.9.0" +// CHECK-LE-32R6: "-internal-isystem" +// CHECK-LE-32R6: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/mips-img-linux-gnu/el" +// CHECK-LE-32R6: "-internal-isystem" +// CHECK-LE-32R6: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/backward" +// CHECK-LE-32R6: "-internal-externc-isystem" +// CHECK-LE-32R6: "[[TC]]/include" +// CHECK-LE-32R6: "-internal-externc-isystem" +// CHECK-LE-32R6: "[[TC]]/../../../../sysroot/usr/include" +// CHECK-LE-32R6: "{{.*}}ld{{(.exe)?}}" +// CHECK-LE-32R6: "--sysroot=[[TC]]/../../../../sysroot/el" +// CHECK-LE-32R6: "-dynamic-linker" "/lib/ld-linux-mipsn8.so.1" +// CHECK-LE-32R6: "[[TC]]/../../../../sysroot/el/usr/lib/../lib{{/|\\\\}}crt1.o" +// CHECK-LE-32R6: "[[TC]]/../../../../sysroot/el/usr/lib/../lib{{/|\\\\}}crti.o" +// CHECK-LE-32R6: "[[TC]]/el{{/|\\\\}}crtbegin.o" +// CHECK-LE-32R6: "-L[[TC]]/el" +// CHECK-LE-32R6: "-L[[TC]]/../../../../mips-img-linux-gnu/lib/../lib/el" +// CHECK-LE-32R6: "-L[[TC]]/../../../../sysroot/el/usr/lib/../lib" +// CHECK-LE-32R6: "[[TC]]/el{{/|\\\\}}crtend.o" +// CHECK-LE-32R6: "[[TC]]/../../../../sysroot/el/usr/lib/../lib{{/|\\\\}}crtn.o" +// +// = Big-endian, mips64r6, N32 +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +// RUN: --target=mips64-img-linux-gnu -mips64r6 -mabi=n32 \ +// RUN: --gcc-toolchain=%S/Inputs/mips_img_tree \ +// RUN: | FileCheck --check-prefix=CHECK-BE-64R6-N32 %s +// CHECK-BE-64R6-N32: "-internal-isystem" +// CHECK-BE-64R6-N32: "[[TC:[^"]+/lib/gcc/mips-img-linux-gnu/4.9.0]]/../../../../mips-img-linux-gnu/include/c++/4.9.0" +// CHECK-BE-64R6-N32: "-internal-isystem" +// CHECK-BE-64R6-N32: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/mips-img-linux-gnu/mips64r6" +// CHECK-BE-64R6-N32: "-internal-isystem" +// CHECK-BE-64R6-N32: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/backward" +// CHECK-BE-64R6-N32: "-internal-externc-isystem" +// CHECK-BE-64R6-N32: "[[TC]]/include" +// CHECK-BE-64R6-N32: "-internal-externc-isystem" +// CHECK-BE-64R6-N32: "[[TC]]/../../../../sysroot/usr/include" +// CHECK-BE-64R6-N32: "{{.*}}ld{{(.exe)?}}" +// CHECK-BE-64R6-N32: "--sysroot=[[TC]]/../../../../sysroot/mips64r6" +// CHECK-BE-64R6-N32: "-dynamic-linker" "/lib32/ld-linux-mipsn8.so.1" +// CHECK-BE-64R6-N32: "[[TC]]/../../../../sysroot/mips64r6/usr/lib{{/|\\\\}}crt1.o" +// CHECK-BE-64R6-N32: "[[TC]]/../../../../sysroot/mips64r6/usr/lib{{/|\\\\}}crti.o" +// CHECK-BE-64R6-N32: "[[TC]]/mips64r6{{/|\\\\}}crtbegin.o" +// CHECK-BE-64R6-N32: "-L[[TC]]/mips64r6" +// CHECK-BE-64R6-N32: "-L[[TC]]/../../../../mips-img-linux-gnu/lib/mips64r6" +// CHECK-BE-64R6-N32: "-L[[TC]]/../../../../sysroot/mips64r6/usr/lib" +// CHECK-BE-64R6-N32: "[[TC]]/mips64r6{{/|\\\\}}crtend.o" +// CHECK-BE-64R6-N32: "[[TC]]/../../../../sysroot/mips64r6/usr/lib{{/|\\\\}}crtn.o" +// +// = Little-endian, mips64r6, N32 +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +// RUN: --target=mips64-img-linux-gnu -mips64r6 -EL -mabi=n32 \ +// RUN: --gcc-toolchain=%S/Inputs/mips_img_tree \ +// RUN: | FileCheck --check-prefix=CHECK-LE-64R6-N32 %s +// CHECK-LE-64R6-N32: "-internal-isystem" +// CHECK-LE-64R6-N32: "[[TC:[^"]+/lib/gcc/mips-img-linux-gnu/4.9.0]]/../../../../mips-img-linux-gnu/include/c++/4.9.0" +// CHECK-LE-64R6-N32: "-internal-isystem" +// CHECK-LE-64R6-N32: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/mips-img-linux-gnu/mips64r6/el" +// CHECK-LE-64R6-N32: "-internal-isystem" +// CHECK-LE-64R6-N32: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/backward" +// CHECK-LE-64R6-N32: "-internal-externc-isystem" +// CHECK-LE-64R6-N32: "[[TC]]/include" +// CHECK-LE-64R6-N32: "-internal-externc-isystem" +// CHECK-LE-64R6-N32: "[[TC]]/../../../../sysroot/usr/include" +// CHECK-LE-64R6-N32: "{{.*}}ld{{(.exe)?}}" +// CHECK-LE-64R6-N32: "--sysroot=[[TC]]/../../../../sysroot/mips64r6/el" +// CHECK-LE-64R6-N32: "-dynamic-linker" "/lib32/ld-linux-mipsn8.so.1" +// CHECK-LE-64R6-N32: "[[TC]]/../../../../sysroot/mips64r6/el/usr/lib{{/|\\\\}}crt1.o" +// CHECK-LE-64R6-N32: "[[TC]]/../../../../sysroot/mips64r6/el/usr/lib{{/|\\\\}}crti.o" +// CHECK-LE-64R6-N32: "[[TC]]/mips64r6/el{{/|\\\\}}crtbegin.o" +// CHECK-LE-64R6-N32: "-L[[TC]]/mips64r6/el" +// CHECK-LE-64R6-N32: "-L[[TC]]/../../../../mips-img-linux-gnu/lib/mips64r6/el" +// CHECK-LE-64R6-N32: "-L[[TC]]/../../../../sysroot/mips64r6/el/usr/lib" +// CHECK-LE-64R6-N32: "[[TC]]/mips64r6/el{{/|\\\\}}crtend.o" +// CHECK-LE-64R6-N32: "[[TC]]/../../../../sysroot/mips64r6/el/usr/lib{{/|\\\\}}crtn.o" +// +// = Big-endian, mips64r6, N64 +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +// RUN: --target=mips64-img-linux-gnu -mips64r6 -mabi=64 \ +// RUN: --gcc-toolchain=%S/Inputs/mips_img_tree \ +// RUN: | FileCheck --check-prefix=CHECK-BE-64R6-N64 %s +// CHECK-BE-64R6-N64: "-internal-isystem" +// CHECK-BE-64R6-N64: "[[TC:[^"]+/lib/gcc/mips-img-linux-gnu/4.9.0]]/../../../../mips-img-linux-gnu/include/c++/4.9.0" +// CHECK-BE-64R6-N64: "-internal-isystem" +// CHECK-BE-64R6-N64: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/mips-img-linux-gnu/mips64r6/64" +// CHECK-BE-64R6-N64: "-internal-isystem" +// CHECK-BE-64R6-N64: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/backward" +// CHECK-BE-64R6-N64: "-internal-externc-isystem" +// CHECK-BE-64R6-N64: "[[TC]]/include" +// CHECK-BE-64R6-N64: "-internal-externc-isystem" +// CHECK-BE-64R6-N64: "[[TC]]/../../../../sysroot/usr/include" +// CHECK-BE-64R6-N64: "{{.*}}ld{{(.exe)?}}" +// CHECK-BE-64R6-N64: "--sysroot=[[TC]]/../../../../sysroot/mips64r6/64" +// CHECK-BE-64R6-N64: "-dynamic-linker" "/lib64/ld-linux-mipsn8.so.1" +// CHECK-BE-64R6-N64: "[[TC]]/../../../../sysroot/mips64r6/64/usr/lib{{/|\\\\}}crt1.o" +// CHECK-BE-64R6-N64: "[[TC]]/../../../../sysroot/mips64r6/64/usr/lib{{/|\\\\}}crti.o" +// CHECK-BE-64R6-N64: "[[TC]]/mips64r6/64{{/|\\\\}}crtbegin.o" +// CHECK-BE-64R6-N64: "-L[[TC]]/mips64r6/64" +// CHECK-BE-64R6-N64: "-L[[TC]]/../../../../mips-img-linux-gnu/lib/mips64r6/64" +// CHECK-BE-64R6-N64: "-L[[TC]]/../../../../sysroot/mips64r6/64/usr/lib" +// CHECK-BE-64R6-N64: "[[TC]]/mips64r6/64{{/|\\\\}}crtend.o" +// CHECK-BE-64R6-N64: "[[TC]]/../../../../sysroot/mips64r6/64/usr/lib{{/|\\\\}}crtn.o" +// +// = Little-endian, mips64r6, N64 +// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ +// RUN: --target=mips64-img-linux-gnu -mips64r6 -EL -mabi=64 \ +// RUN: --gcc-toolchain=%S/Inputs/mips_img_tree \ +// RUN: | FileCheck --check-prefix=CHECK-LE-64R6-N64 %s +// CHECK-LE-64R6-N64: "-internal-isystem" +// CHECK-LE-64R6-N64: "[[TC:[^"]+/lib/gcc/mips-img-linux-gnu/4.9.0]]/../../../../mips-img-linux-gnu/include/c++/4.9.0" +// CHECK-LE-64R6-N64: "-internal-isystem" +// CHECK-LE-64R6-N64: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/mips-img-linux-gnu/mips64r6/64/el" +// CHECK-LE-64R6-N64: "-internal-isystem" +// CHECK-LE-64R6-N64: "[[TC]]/../../../../mips-img-linux-gnu/include/c++/4.9.0/backward" +// CHECK-LE-64R6-N64: "-internal-externc-isystem" +// CHECK-LE-64R6-N64: "[[TC]]/include" +// CHECK-LE-64R6-N64: "-internal-externc-isystem" +// CHECK-LE-64R6-N64: "[[TC]]/../../../../sysroot/usr/include" +// CHECK-LE-64R6-N64: "{{.*}}ld{{(.exe)?}}" +// CHECK-LE-64R6-N64: "--sysroot=[[TC]]/../../../../sysroot/mips64r6/64/el" +// CHECK-LE-64R6-N64: "-dynamic-linker" "/lib64/ld-linux-mipsn8.so.1" +// CHECK-LE-64R6-N64: "[[TC]]/../../../../sysroot/mips64r6/64/el/usr/lib{{/|\\\\}}crt1.o" +// CHECK-LE-64R6-N64: "[[TC]]/../../../../sysroot/mips64r6/64/el/usr/lib{{/|\\\\}}crti.o" +// CHECK-LE-64R6-N64: "[[TC]]/mips64r6/64/el{{/|\\\\}}crtbegin.o" +// CHECK-LE-64R6-N64: "-L[[TC]]/mips64r6/64/el" +// CHECK-LE-64R6-N64: "-L[[TC]]/../../../../mips-img-linux-gnu/lib/mips64r6/64/el" +// CHECK-LE-64R6-N64: "-L[[TC]]/../../../../sysroot/mips64r6/64/el/usr/lib" +// CHECK-LE-64R6-N64: "[[TC]]/mips64r6/64/el{{/|\\\\}}crtend.o" +// CHECK-LE-64R6-N64: "[[TC]]/../../../../sysroot/mips64r6/64/el/usr/lib{{/|\\\\}}crtn.o" |
