diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2012-02-28 19:15:06 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2012-02-28 19:15:06 +0000 |
| commit | d706a8d118727ace6c12051037f1b0e2bd2aed60 (patch) | |
| tree | acd77cf29e29f825bcb1f7417d36e0000dab85a0 /lib/Driver/Tools.cpp | |
| parent | bf359c9683fd56260d6860c7d1a8abc26a190a2b (diff) | |
It turns out -fno-cxa-atexit just produces broken code, so disable it on Solaris and we'll ship a __cxa_atexit implementation...
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151648 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Tools.cpp')
| -rw-r--r-- | lib/Driver/Tools.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index de27d09c38..c215724c56 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -2079,7 +2079,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, !Args.hasFlag(options::OPT_fuse_cxa_atexit, options::OPT_fno_use_cxa_atexit, getToolChain().getTriple().getOS() != llvm::Triple::Cygwin && getToolChain().getTriple().getOS() != llvm::Triple::MinGW32 && - getToolChain().getTriple().getOS() != llvm::Triple::Solaris && getToolChain().getTriple().getArch() != llvm::Triple::hexagon)) CmdArgs.push_back("-fno-use-cxa-atexit"); @@ -4252,6 +4251,7 @@ void solaris::Link::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back(Args.MakeArgString(LibPath + "values-Xa.o")); CmdArgs.push_back(Args.MakeArgString(GCCLibPath + "crtbegin.o")); } else { + CmdArgs.push_back(Args.MakeArgString(LibPath + "cxa_finalize.o")); CmdArgs.push_back(Args.MakeArgString(LibPath + "crti.o")); CmdArgs.push_back(Args.MakeArgString(LibPath + "values-Xa.o")); CmdArgs.push_back(Args.MakeArgString(GCCLibPath + "crtbegin.o")); |