summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFangrui Song <maskray@google.com>2019-12-12 10:49:46 -0800
committerFangrui Song <maskray@google.com>2019-12-13 14:06:51 -0800
commite4fce659a759ecdd59ceee750f1ff9b44f9de3f3 (patch)
tree15ad038aa1ad8ce430a82d65edba1c65d424dc0a
parent8035bb4a6573f7d20f17044a68a1405691000525 (diff)
downloadbcm5719-llvm-e4fce659a759ecdd59ceee750f1ff9b44f9de3f3.tar.gz
bcm5719-llvm-e4fce659a759ecdd59ceee750f1ff9b44f9de3f3.zip
[Driver] Use .init_array for all gcc installations and simplify Generic_ELF -fno-use-init-array rules
D39317 made clang use .init_array when no gcc installations is found. This change changes all gcc installations to use .init_array . GCC 4.7 by default stopped providing .ctors/.dtors compatible crt files, and stopped emitting .ctors for __attribute__((constructor)). .init_array should always work. FreeBSD rules are moved to FreeBSD.cpp to make Generic_ELF rules clean. Reviewed By: rnk Differential Revision: https://reviews.llvm.org/D71434
-rw-r--r--clang/docs/ReleaseNotes.rst4
-rw-r--r--clang/lib/Driver/ToolChains/FreeBSD.cpp9
-rw-r--r--clang/lib/Driver/ToolChains/FreeBSD.h4
-rw-r--r--clang/lib/Driver/ToolChains/Gnu.cpp18
-rw-r--r--clang/test/Driver/constructors.c2
5 files changed, 19 insertions, 18 deletions
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 37a8f30e0bc..eee63c8e923 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -89,6 +89,10 @@ Non-comprehensive list of changes in this release
to run at a lower frequency which can impact performance. This behavior can be
changed by passing -mprefer-vector-width=512 on the command line.
+* clang now defaults to ``.init_array`` on Linux. It used to use ``.ctors`` if
+ the found gcc installation is older than 4.7.0. Add ``-fno-use-init-array`` to
+ get the old behavior (``.ctors``).
+
New Compiler Flags
------------------
diff --git a/clang/lib/Driver/ToolChains/FreeBSD.cpp b/clang/lib/Driver/ToolChains/FreeBSD.cpp
index 85e94fe018e..c10d991845d 100644
--- a/clang/lib/Driver/ToolChains/FreeBSD.cpp
+++ b/clang/lib/Driver/ToolChains/FreeBSD.cpp
@@ -467,3 +467,12 @@ SanitizerMask FreeBSD::getSupportedSanitizers() const {
Res |= SanitizerKind::Memory;
return Res;
}
+
+void FreeBSD::addClangTargetOptions(const ArgList &DriverArgs,
+ ArgStringList &CC1Args,
+ Action::OffloadKind) const {
+ if (!DriverArgs.hasFlag(options::OPT_fuse_init_array,
+ options::OPT_fno_use_init_array,
+ getTriple().getOSMajorVersion() >= 12))
+ CC1Args.push_back("-fno-use-init-array");
+}
diff --git a/clang/lib/Driver/ToolChains/FreeBSD.h b/clang/lib/Driver/ToolChains/FreeBSD.h
index 53bc5265c9e..84bdbfd9a31 100644
--- a/clang/lib/Driver/ToolChains/FreeBSD.h
+++ b/clang/lib/Driver/ToolChains/FreeBSD.h
@@ -76,6 +76,10 @@ public:
// Until dtrace (via CTF) and LLDB can deal with distributed debug info,
// FreeBSD defaults to standalone/full debug info.
bool GetDefaultStandaloneDebug() const override { return true; }
+ void
+ addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
+ llvm::opt::ArgStringList &CC1Args,
+ Action::OffloadKind DeviceOffloadKind) const override;
protected:
Tool *buildAssembler() const override;
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
index 0d950852bac..250e924fb84 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -2782,23 +2782,7 @@ void Generic_ELF::anchor() {}
void Generic_ELF::addClangTargetOptions(const ArgList &DriverArgs,
ArgStringList &CC1Args,
Action::OffloadKind) const {
- const Generic_GCC::GCCVersion &V = GCCInstallation.getVersion();
- bool UseInitArrayDefault =
- getTriple().getArch() == llvm::Triple::aarch64 ||
- getTriple().getArch() == llvm::Triple::aarch64_be ||
- (getTriple().isOSFreeBSD() &&
- getTriple().getOSMajorVersion() >= 12) ||
- (getTriple().getOS() == llvm::Triple::Linux &&
- ((!GCCInstallation.isValid() || !V.isOlderThan(4, 7, 0)) ||
- getTriple().isAndroid())) ||
- getTriple().getOS() == llvm::Triple::NaCl ||
- (getTriple().getVendor() == llvm::Triple::MipsTechnologies &&
- !getTriple().hasEnvironment()) ||
- getTriple().getOS() == llvm::Triple::Solaris ||
- getTriple().getArch() == llvm::Triple::riscv32 ||
- getTriple().getArch() == llvm::Triple::riscv64;
-
if (!DriverArgs.hasFlag(options::OPT_fuse_init_array,
- options::OPT_fno_use_init_array, UseInitArrayDefault))
+ options::OPT_fno_use_init_array, true))
CC1Args.push_back("-fno-use-init-array");
}
diff --git a/clang/test/Driver/constructors.c b/clang/test/Driver/constructors.c
index bda421a8406..e5d453d1bed 100644
--- a/clang/test/Driver/constructors.c
+++ b/clang/test/Driver/constructors.c
@@ -34,7 +34,7 @@
// RUN: -target i386-unknown-linux \
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
// RUN: --gcc-toolchain="" \
-// RUN: | FileCheck --check-prefix=CHECK-NO-INIT-ARRAY %s
+// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
//
// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
// RUN: -fuse-init-array \
OpenPOWER on IntegriCloud