Skip to content

Commit e4fce65

Browse files
committed
[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
1 parent 8035bb4 commit e4fce65

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

clang/docs/ReleaseNotes.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ Non-comprehensive list of changes in this release
8989
to run at a lower frequency which can impact performance. This behavior can be
9090
changed by passing -mprefer-vector-width=512 on the command line.
9191

92+
* clang now defaults to ``.init_array`` on Linux. It used to use ``.ctors`` if
93+
the found gcc installation is older than 4.7.0. Add ``-fno-use-init-array`` to
94+
get the old behavior (``.ctors``).
95+
9296
New Compiler Flags
9397
------------------
9498

clang/lib/Driver/ToolChains/FreeBSD.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,3 +467,12 @@ SanitizerMask FreeBSD::getSupportedSanitizers() const {
467467
Res |= SanitizerKind::Memory;
468468
return Res;
469469
}
470+
471+
void FreeBSD::addClangTargetOptions(const ArgList &DriverArgs,
472+
ArgStringList &CC1Args,
473+
Action::OffloadKind) const {
474+
if (!DriverArgs.hasFlag(options::OPT_fuse_init_array,
475+
options::OPT_fno_use_init_array,
476+
getTriple().getOSMajorVersion() >= 12))
477+
CC1Args.push_back("-fno-use-init-array");
478+
}

clang/lib/Driver/ToolChains/FreeBSD.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ class LLVM_LIBRARY_VISIBILITY FreeBSD : public Generic_ELF {
7676
// Until dtrace (via CTF) and LLDB can deal with distributed debug info,
7777
// FreeBSD defaults to standalone/full debug info.
7878
bool GetDefaultStandaloneDebug() const override { return true; }
79+
void
80+
addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
81+
llvm::opt::ArgStringList &CC1Args,
82+
Action::OffloadKind DeviceOffloadKind) const override;
7983

8084
protected:
8185
Tool *buildAssembler() const override;

clang/lib/Driver/ToolChains/Gnu.cpp

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2782,23 +2782,7 @@ void Generic_ELF::anchor() {}
27822782
void Generic_ELF::addClangTargetOptions(const ArgList &DriverArgs,
27832783
ArgStringList &CC1Args,
27842784
Action::OffloadKind) const {
2785-
const Generic_GCC::GCCVersion &V = GCCInstallation.getVersion();
2786-
bool UseInitArrayDefault =
2787-
getTriple().getArch() == llvm::Triple::aarch64 ||
2788-
getTriple().getArch() == llvm::Triple::aarch64_be ||
2789-
(getTriple().isOSFreeBSD() &&
2790-
getTriple().getOSMajorVersion() >= 12) ||
2791-
(getTriple().getOS() == llvm::Triple::Linux &&
2792-
((!GCCInstallation.isValid() || !V.isOlderThan(4, 7, 0)) ||
2793-
getTriple().isAndroid())) ||
2794-
getTriple().getOS() == llvm::Triple::NaCl ||
2795-
(getTriple().getVendor() == llvm::Triple::MipsTechnologies &&
2796-
!getTriple().hasEnvironment()) ||
2797-
getTriple().getOS() == llvm::Triple::Solaris ||
2798-
getTriple().getArch() == llvm::Triple::riscv32 ||
2799-
getTriple().getArch() == llvm::Triple::riscv64;
2800-
28012785
if (!DriverArgs.hasFlag(options::OPT_fuse_init_array,
2802-
options::OPT_fno_use_init_array, UseInitArrayDefault))
2786+
options::OPT_fno_use_init_array, true))
28032787
CC1Args.push_back("-fno-use-init-array");
28042788
}

clang/test/Driver/constructors.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
// RUN: -target i386-unknown-linux \
3535
// RUN: --sysroot=%S/Inputs/basic_linux_tree \
3636
// RUN: --gcc-toolchain="" \
37-
// RUN: | FileCheck --check-prefix=CHECK-NO-INIT-ARRAY %s
37+
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
3838
//
3939
// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
4040
// RUN: -fuse-init-array \

0 commit comments

Comments
 (0)