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 | e0a7c28627fecb00aad5cefca98c57d0fdc987de (patch) | |
| tree | 744f7188d365119a4e3e9467b79e28fa2a66bcf4 /clang/lib/Driver/Tools.cpp | |
| parent | a0ec8896ac235fdbd3adbb20f22bbb3e6c306f28 (diff) | |
| download | bcm5719-llvm-e0a7c28627fecb00aad5cefca98c57d0fdc987de.tar.gz bcm5719-llvm-e0a7c28627fecb00aad5cefca98c57d0fdc987de.zip | |
It turns out -fno-cxa-atexit just produces broken code, so disable it on Solaris and we'll ship a __cxa_atexit implementation...
llvm-svn: 151648
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index de27d09c384..c215724c56c 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/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")); |
