From a6d38494d18e260958e73bfe5e2b3f1dc4160459 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Fri, 22 Jan 2010 02:04:52 +0000 Subject: [PATCH] Driver/Darwin/ld: Eliminate AddDarwinSubArch, our linker invocation is going to diverge from gcc anyway. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94138 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 22 +++++----------------- lib/Driver/Tools.h | 1 - 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 5e1d2661dd..857f0d643b 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1925,13 +1925,6 @@ void darwin::DarwinTool::AddDarwinArch(const ArgList &Args, } } -void darwin::DarwinTool::AddDarwinSubArch(const ArgList &Args, - ArgStringList &CmdArgs) const { - // Derived from darwin_subarch spec, not sure what the distinction - // exists for but at least for this chain it is the same. - AddDarwinArch(Args, CmdArgs); -} - void darwin::Link::AddLinkArgs(const ArgList &Args, ArgStringList &CmdArgs) const { const Driver &D = getToolChain().getDriver(); @@ -1946,11 +1939,10 @@ void darwin::Link::AddLinkArgs(const ArgList &Args, } if (!Args.hasArg(options::OPT_dynamiclib)) { - if (Args.hasArg(options::OPT_force__cpusubtype__ALL)) { - AddDarwinArch(Args, CmdArgs); - CmdArgs.push_back("-force_cpusubtype_ALL"); - } else - AddDarwinSubArch(Args, CmdArgs); + AddDarwinArch(Args, CmdArgs); + + // FIXME: Why do this only on this path? + CmdArgs.push_back("-force_cpusubtype_ALL"); Args.AddLastArg(CmdArgs, options::OPT_bundle); Args.AddAllArgs(CmdArgs, options::OPT_bundle__loader); @@ -1984,11 +1976,7 @@ void darwin::Link::AddLinkArgs(const ArgList &Args, Args.AddAllArgsTranslated(CmdArgs, options::OPT_current__version, "-dylib_current_version"); - if (Args.hasArg(options::OPT_force__cpusubtype__ALL)) { - AddDarwinArch(Args, CmdArgs); - // NOTE: We don't add -force_cpusubtype_ALL on this path. Ok. - } else - AddDarwinSubArch(Args, CmdArgs); + AddDarwinArch(Args, CmdArgs); Args.AddAllArgsTranslated(CmdArgs, options::OPT_install__name, "-dylib_install_name"); diff --git a/lib/Driver/Tools.h b/lib/Driver/Tools.h index 8f7da52c31..abd8cfc6d4 100644 --- a/lib/Driver/Tools.h +++ b/lib/Driver/Tools.h @@ -130,7 +130,6 @@ namespace darwin { class VISIBILITY_HIDDEN DarwinTool : public Tool { protected: void AddDarwinArch(const ArgList &Args, ArgStringList &CmdArgs) const; - void AddDarwinSubArch(const ArgList &Args, ArgStringList &CmdArgs) const; const toolchains::Darwin &getDarwinToolChain() const { return reinterpret_cast(getToolChain()); -- 2.40.0