r200662 - Replace hasMipsN32ABIArg by hasMipsABIArg to make it easier to add
Joerg Sonnenberger
joerg at bec.de
Sun Feb 2 14:40:33 PST 2014
Author: joerg
Date: Sun Feb 2 16:40:33 2014
New Revision: 200662
URL: http://llvm.org/viewvc/llvm-project?rev=200662&view=rev
Log:
Replace hasMipsN32ABIArg by hasMipsABIArg to make it easier to add
support for o32 and n64.
Modified:
cfe/trunk/lib/Driver/Tools.cpp
Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=200662&r1=200661&r2=200662&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Sun Feb 2 16:40:33 2014
@@ -44,6 +44,11 @@ using namespace clang::driver::tools;
using namespace clang;
using namespace llvm::opt;
+static bool hasMipsABIArg(const ArgList &Args, const char *Value) {
+ Arg *A = Args.getLastArg(options::OPT_mabi_EQ);
+ return A && (A->getValue() == StringRef(Value));
+}
+
/// CheckPreprocessingOptions - Perform some validation of preprocessing
/// arguments that is shared with gcc.
static void CheckPreprocessingOptions(const Driver &D, const ArgList &Args) {
@@ -6381,11 +6386,6 @@ static void AddLibgcc(llvm::Triple Tripl
CmdArgs.push_back("-ldl");
}
-static bool hasMipsN32ABIArg(const ArgList &Args) {
- Arg *A = Args.getLastArg(options::OPT_mabi_EQ);
- return A && (A->getValue() == StringRef("n32"));
-}
-
static StringRef getLinuxDynamicLinker(const ArgList &Args,
const toolchains::Linux &ToolChain) {
if (ToolChain.getTriple().getEnvironment() == llvm::Triple::Android) {
@@ -6409,7 +6409,7 @@ static StringRef getLinuxDynamicLinker(c
return "/lib/ld.so.1";
else if (ToolChain.getArch() == llvm::Triple::mips64 ||
ToolChain.getArch() == llvm::Triple::mips64el) {
- if (hasMipsN32ABIArg(Args))
+ if (hasMipsABIArg(Args, "n32"))
return "/lib32/ld.so.1";
else
return "/lib64/ld.so.1";
@@ -6492,13 +6492,13 @@ void gnutools::Link::ConstructJob(Compil
else if (ToolChain.getArch() == llvm::Triple::mipsel)
CmdArgs.push_back("elf32ltsmip");
else if (ToolChain.getArch() == llvm::Triple::mips64) {
- if (hasMipsN32ABIArg(Args))
+ if (hasMipsABIArg(Args, "n32"))
CmdArgs.push_back("elf32btsmipn32");
else
CmdArgs.push_back("elf64btsmip");
}
else if (ToolChain.getArch() == llvm::Triple::mips64el) {
- if (hasMipsN32ABIArg(Args))
+ if (hasMipsABIArg(Args, "n32"))
CmdArgs.push_back("elf32ltsmipn32");
else
CmdArgs.push_back("elf64ltsmip");
More information about the cfe-commits
mailing list