r201725 - Use a switch for the architecture specific logic in
Joerg Sonnenberger
joerg at bec.de
Wed Feb 19 14:16:19 PST 2014
Author: joerg
Date: Wed Feb 19 16:16:19 2014
New Revision: 201725
URL: http://llvm.org/viewvc/llvm-project?rev=201725&view=rev
Log:
Use a switch for the architecture specific logic in
netbsd::Assemble::ConstructJob.
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=201725&r1=201724&r2=201725&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Wed Feb 19 16:16:19 2014
@@ -6147,23 +6147,23 @@ void netbsd::Assemble::ConstructJob(Comp
const char *LinkingOutput) const {
ArgStringList CmdArgs;
- // When building 32-bit code on NetBSD/amd64, we have to explicitly
- // instruct as in the base system to assemble 32-bit code.
- if (getToolChain().getArch() == llvm::Triple::x86)
+ // GNU as needs different flags for creating the correct output format
+ // on architectures with different ABIs or optional feature sets.
+ switch (getToolChain().getArch()) {
+ case llvm::Triple::x86:
CmdArgs.push_back("--32");
-
- // Pass the target CPU to GNU as for ARM, since the source code might
- // not have the correct .cpu annotation.
- if (getToolChain().getArch() == llvm::Triple::arm ||
- getToolChain().getArch() == llvm::Triple::thumb) {
+ break;
+ case llvm::Triple::arm:
+ case llvm::Triple::thumb: {
std::string MArch(arm::getARMTargetCPU(Args, getToolChain().getTriple()));
CmdArgs.push_back(Args.MakeArgString("-mcpu=" + MArch));
+ break;
}
- if (getToolChain().getArch() == llvm::Triple::mips ||
- getToolChain().getArch() == llvm::Triple::mipsel ||
- getToolChain().getArch() == llvm::Triple::mips64 ||
- getToolChain().getArch() == llvm::Triple::mips64el) {
+ case llvm::Triple::mips:
+ case llvm::Triple::mipsel:
+ case llvm::Triple::mips64:
+ case llvm::Triple::mips64el: {
StringRef CPUName;
StringRef ABIName;
getMipsCPUAndABI(Args, getToolChain().getTriple(), CPUName, ABIName);
@@ -6181,6 +6181,10 @@ void netbsd::Assemble::ConstructJob(Comp
CmdArgs.push_back("-EL");
addAssemblerKPIC(Args, CmdArgs);
+ break;
+ }
+ default:
+ break;
}
Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA,
More information about the cfe-commits
mailing list