From cc6f803f98fa6ba9a9c366400210448516d01b3c Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 9 Sep 2009 18:36:27 +0000 Subject: [PATCH] Use AddDarwinArch for passing arch name to assembler. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@81368 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 697940829b..ce99aa203b 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1284,10 +1284,12 @@ void darwin::Assemble::ConstructJob(Compilation &C, const JobAction &JA, } // Derived from asm spec. - CmdArgs.push_back("-arch"); - CmdArgs.push_back(Args.MakeArgString(getToolChain().getArchName().c_str())); + AddDarwinArch(Args, CmdArgs); + + if (!getDarwinToolChain().isIPhone() || + Args.hasArg(options::OPT_force__cpusubtype__ALL)) + CmdArgs.push_back("-force_cpusubtype_ALL"); - CmdArgs.push_back("-force_cpusubtype_ALL"); if (getToolChain().getTriple().getArch() != llvm::Triple::x86_64 && (Args.hasArg(options::OPT_mkernel) || Args.hasArg(options::OPT_static) || @@ -1409,9 +1411,6 @@ void darwin::DarwinTool::AddDarwinArch(const ArgList &Args, break; case llvm::Triple::arm: { - // FIXME: gcc isn't actually following this, it looks like the arch is - // getting forced somewhere else (translation?). - if (const Arg *A = Args.getLastArg(options::OPT_march_EQ)) { if (const char *Arch = GetArmArchForMArch(A->getValue(Args))) { CmdArgs.push_back(Arch); -- 2.40.0