diff options
author | David Chisnall <csdavec@swan.ac.uk> | 2012-02-28 17:10:04 +0000 |
---|---|---|
committer | David Chisnall <csdavec@swan.ac.uk> | 2012-02-28 17:10:04 +0000 |
commit | 165329c1d134d000904d6e08b1d166bf34e05517 (patch) | |
tree | 61aabdd1f4406c346ce008e9ba7ece314ce252f3 /lib | |
parent | 85fdea03687e45dfde025867fe98ea24ac74c501 (diff) | |
download | clang-165329c1d134d000904d6e08b1d166bf34e05517.tar.gz clang-165329c1d134d000904d6e08b1d166bf34e05517.tar.bz2 clang-165329c1d134d000904d6e08b1d166bf34e05517.tar.xz |
Some more Solaris fixes. Now successfully building libc++ on Solaris with clang (and linking clang against it).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151632 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Basic/Targets.cpp | 12 | ||||
-rw-r--r-- | lib/Driver/Tools.cpp | 15 | ||||
-rw-r--r-- | lib/Frontend/InitHeaderSearch.cpp | 7 |
3 files changed, 21 insertions, 13 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 92dd54b9bb..b6ccce310e 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -490,10 +490,20 @@ protected: Builder.defineMacro("__ELF__"); Builder.defineMacro("__svr4__"); Builder.defineMacro("__SVR4"); - Builder.defineMacro("_XOPEN_SOURCE", "500"); + // Solaris headers require _XOPEN_SOURCE to be set to 600 for C99 and + // newer, but to 500 for everything else. feature_test.h has a check to + // ensure that you are not using C99 with an old version of X/Open or C89 + // with a new version. + if (Opts.C99 || Opts.C11) + Builder.defineMacro("_XOPEN_SOURCE", "600"); + else + Builder.defineMacro("_XOPEN_SOURCE", "500"); + if (Opts.CPlusPlus0x) + Builder.defineMacro("__C99FEATURES__"); Builder.defineMacro("_LARGEFILE_SOURCE"); Builder.defineMacro("_LARGEFILE64_SOURCE"); Builder.defineMacro("__EXTENSIONS__"); + Builder.defineMacro("_REENTRANT"); } public: SolarisTargetInfo(const std::string& triple) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 9fd55762b1..de27d09c38 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -4249,9 +4249,12 @@ void solaris::Link::ConstructJob(Compilation &C, const JobAction &JA, if (!Args.hasArg(options::OPT_shared)) { CmdArgs.push_back(Args.MakeArgString(LibPath + "crt1.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")); } else { 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")); } } @@ -4260,22 +4263,24 @@ void solaris::Link::ConstructJob(Compilation &C, const JobAction &JA, Args.AddAllArgs(CmdArgs, options::OPT_L); Args.AddAllArgs(CmdArgs, options::OPT_T_Group); Args.AddAllArgs(CmdArgs, options::OPT_e); + Args.AddAllArgs(CmdArgs, options::OPT_r); AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs); + if (getToolChain().getDriver().CCCIsCXX) + getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs); if (!Args.hasArg(options::OPT_nostdlib) && !Args.hasArg(options::OPT_nodefaultlibs)) { - CmdArgs.push_back("-lgcc"); CmdArgs.push_back("-lgcc_s"); - if (!Args.hasArg(options::OPT_shared)) + if (!Args.hasArg(options::OPT_shared)) { + CmdArgs.push_back("-lgcc"); CmdArgs.push_back("-lc"); - + } } if (!Args.hasArg(options::OPT_nostdlib) && !Args.hasArg(options::OPT_nostartfiles)) { - if (!Args.hasArg(options::OPT_shared)) - CmdArgs.push_back(Args.MakeArgString(GCCLibPath + "crtend.o")); + CmdArgs.push_back(Args.MakeArgString(GCCLibPath + "crtend.o")); } CmdArgs.push_back(Args.MakeArgString(LibPath + "crtn.o")); diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index 7c5f47bc40..4b734c97d9 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -417,13 +417,6 @@ AddDefaultCPlusPlusIncludePaths(const llvm::Triple &triple, const HeaderSearchOp case llvm::Triple::Solaris: AddGnuCPlusPlusIncludePaths("/usr/gcc/4.5/include/c++/4.5.2/", "i386-pc-solaris2.11", "", "", triple); - AddGnuCPlusPlusIncludePaths( - "/usr/gcc/4.5/lib/gcc/i386-pc-solaris2.11/4.5.2/include", - "", "", "", triple); - AddGnuCPlusPlusIncludePaths( - "/usr/gcc/4.5/lib/gcc/i386-pc-solaris2.11/4.5.2/include-fixed", - "", "", "", triple); - // Solaris - Fall though.. case llvm::Triple::AuroraUX: // AuroraUX |