diff -wpruN '--exclude=*.orig' a~/lib/Driver/ToolChains/Solaris.cpp a/lib/Driver/ToolChains/Solaris.cpp --- a~/tools/clang/lib/Driver/ToolChains/Solaris.cpp 1970-01-01 00:00:00 +++ a/tools/clang/lib/Driver/ToolChains/Solaris.cpp 1970-01-01 00:00:00 @@ -125,13 +125,6 @@ void solaris::Linker::ConstructJob(Compi if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) { if (getToolChain().ShouldLinkCXXStdlib(Args)) getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs); - if (Args.hasArg(options::OPT_fstack_protector) || - Args.hasArg(options::OPT_fstack_protector_strong) || - Args.hasArg(options::OPT_fstack_protector_all)) { - // Explicitly link ssp libraries, not folded into Solaris libc. - CmdArgs.push_back("-lssp_nonshared"); - CmdArgs.push_back("-lssp"); - } CmdArgs.push_back("-lgcc_s"); CmdArgs.push_back("-lc"); if (!Args.hasArg(options::OPT_shared)) {