diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-09-04 18:35:47 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-09-04 18:35:47 +0000 |
| commit | 037f389f4df6ce9695db45131f5d140ab362f8a0 (patch) | |
| tree | de41320517069fe7105e445b3a869d6dd21fa526 | |
| parent | 2b5f6817e019c690592a12d29082770c3af3df5f (diff) | |
| download | bcm5719-llvm-037f389f4df6ce9695db45131f5d140ab362f8a0.tar.gz bcm5719-llvm-037f389f4df6ce9695db45131f5d140ab362f8a0.zip | |
Merge libgcc spec changes for darwin::Link::ConstructJob.
llvm-svn: 81022
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index d9fea2e98db..a35d745cf13 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -1700,7 +1700,9 @@ void darwin::Link::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-lcrt0.o"); } else { // Derived from darwin_crt1 spec. - if (isMacosxVersionLT(MacosxVersion, 10, 5)) + if (getDarwinToolChain().isIPhone()) { + CmdArgs.push_back("-lcrt1.o"); + } else if (isMacosxVersionLT(MacosxVersion, 10, 5)) CmdArgs.push_back("-lcrt1.o"); else if (isMacosxVersionLT(MacosxVersion, 10, 6)) CmdArgs.push_back("-lcrt1.10.5.o"); @@ -1789,7 +1791,11 @@ void darwin::Link::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-lgcc_eh"); } else if (Args.hasArg(options::OPT_miphoneos_version_min_EQ)) { // Derived from darwin_iphoneos_libgcc spec. - CmdArgs.push_back("-lgcc_s.10.5"); + if (getDarwinToolChain().isIPhone()) { + CmdArgs.push_back("-lgcc_s.1"); + } else { + CmdArgs.push_back("-lgcc_s.10.5"); + } } else if (Args.hasArg(options::OPT_shared_libgcc) || // FIXME: -fexceptions -fno-exceptions means no exceptions Args.hasArg(options::OPT_fexceptions) || @@ -1808,7 +1814,8 @@ void darwin::Link::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-lgcc_s.10.5"); } - if (isMacosxVersionLT(MacosxVersion, 10, 6)) { + if (getDarwinToolChain().isIPhone() || + isMacosxVersionLT(MacosxVersion, 10, 6)) { CmdArgs.push_back("-lgcc"); CmdArgs.push_back("-lSystem"); } else { |
