diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2017-07-14 17:49:52 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2017-07-14 17:49:52 +0000 |
| commit | 4a6d7d45cc1dd9989c18799fe55a4cb4a06862c3 (patch) | |
| tree | 9c0f8c8105531113d5259d6639fb691811c6a430 /clang | |
| parent | 1e898d911cbd6f464ac6d4c2a9f63bd6c4abdb80 (diff) | |
| download | bcm5719-llvm-4a6d7d45cc1dd9989c18799fe55a4cb4a06862c3.tar.gz bcm5719-llvm-4a6d7d45cc1dd9989c18799fe55a4cb4a06862c3.zip | |
Unconditionally use .init_array instead of .ctors on Solaris.
Patch by Fedor Sergeev
llvm-svn: 308038
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Driver/ToolChains/Gnu.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/Solaris.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/Solaris.h | 2 | ||||
| -rw-r--r-- | clang/test/Driver/constructors.c | 8 |
4 files changed, 12 insertions, 3 deletions
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index ad5f7df50d2..bc26ee1de46 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -2471,7 +2471,8 @@ void Generic_ELF::addClangTargetOptions(const ArgList &DriverArgs, (!V.isOlderThan(4, 7, 0) || getTriple().isAndroid())) || getTriple().getOS() == llvm::Triple::NaCl || (getTriple().getVendor() == llvm::Triple::MipsTechnologies && - !getTriple().hasEnvironment()); + !getTriple().hasEnvironment()) || + getTriple().getOS() == llvm::Triple::Solaris; if (DriverArgs.hasFlag(options::OPT_fuse_init_array, options::OPT_fno_use_init_array, UseInitArrayDefault)) diff --git a/clang/lib/Driver/ToolChains/Solaris.cpp b/clang/lib/Driver/ToolChains/Solaris.cpp index 78797c49d7b..de98d11b2dc 100644 --- a/clang/lib/Driver/ToolChains/Solaris.cpp +++ b/clang/lib/Driver/ToolChains/Solaris.cpp @@ -126,7 +126,7 @@ void solaris::Linker::ConstructJob(Compilation &C, const JobAction &JA, Solaris::Solaris(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) - : Generic_GCC(D, Triple, Args) { + : Generic_ELF(D, Triple, Args) { GCCInstallation.init(Triple, Args); diff --git a/clang/lib/Driver/ToolChains/Solaris.h b/clang/lib/Driver/ToolChains/Solaris.h index edb44373b31..787917afab6 100644 --- a/clang/lib/Driver/ToolChains/Solaris.h +++ b/clang/lib/Driver/ToolChains/Solaris.h @@ -50,7 +50,7 @@ public: namespace toolchains { -class LLVM_LIBRARY_VISIBILITY Solaris : public Generic_GCC { +class LLVM_LIBRARY_VISIBILITY Solaris : public Generic_ELF { public: Solaris(const Driver &D, const llvm::Triple &Triple, const llvm::opt::ArgList &Args); diff --git a/clang/test/Driver/constructors.c b/clang/test/Driver/constructors.c index cd14ed736a2..39a199a3c6a 100644 --- a/clang/test/Driver/constructors.c +++ b/clang/test/Driver/constructors.c @@ -74,3 +74,11 @@ // RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ // RUN: -target arm64-none-none-eabi \ // RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s +// +// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +// RUN: -target sparc-sun-solaris2.11 \ +// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s +// +// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ +// RUN: -target i386-pc-solaris2.11 \ +// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s |
