This is an archive of the discontinued LLVM Phabricator instance.

Differential D76079

[Hexagon] Enable init_arrays when target is linux-musl
ClosedPublic

Authored by sidneym on Mar 12 2020, 10:23 AM.

Details

Reviewers
kparzysz
bcain
adasgupt
Commits
rG6174fddbe3d4: [Hexagon] Enable init_arrays when target is linux-musl
Summary

linux/musl will use init arrays by default.

Diff Detail

Event Timeline

sidneym created this revision.Mar 12 2020, 10:23 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 12 2020, 10:23 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
bcain added inline comments.Mar 12 2020, 10:57 AM
clang/lib/Driver/ToolChains/Hexagon.cpp
548

The ternary is unnecessary.

bool UseInitArrayDefault = getTriple().isMusl();
Harbormaster completed remote builds in B49010: Diff 249974.Mar 12 2020, 11:23 AM
sidneym updated this revision to Diff 249999.Mar 12 2020, 11:45 AM

Drop ternary.

sidneym marked an inline comment as done.Mar 12 2020, 11:46 AM
kparzysz accepted this revision.Mar 12 2020, 11:57 AM
This revision is now accepted and ready to land.Mar 12 2020, 11:57 AM
Closed by commit rG6174fddbe3d4: [Hexagon] Enable init_arrays when target is linux-musl (authored by sidneym). · Explain WhyMar 12 2020, 1:02 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
3 lines
test/
Driver/
10 lines

Diff 249974

clang/lib/Driver/ToolChains/Hexagon.cpp

Show First 20 Lines • Show All 538 Lines • ▼ Show 20 Linesunsigned HexagonToolChain::getOptimizationLevel(
if (S.getAsInteger(10, OptLevel)) if (S.getAsInteger(10, OptLevel))
return 0; return 0;
return OptLevel; return OptLevel;
} }
void HexagonToolChain::addClangTargetOptions(const ArgList &DriverArgs, void HexagonToolChain::addClangTargetOptions(const ArgList &DriverArgs,
ArgStringList &CC1Args, ArgStringList &CC1Args,
Action::OffloadKind) const { Action::OffloadKind) const {
bool UseInitArrayDefault = false;
bool UseInitArrayDefault = (getTriple().isMusl()) ? true : false;
bcainUnsubmitted
Done
ReplyInline Actions

The ternary is unnecessary.

bool UseInitArrayDefault = getTriple().isMusl();
bcain: The ternary is unnecessary. ``` bool UseInitArrayDefault = getTriple().isMusl(); ```
if (!DriverArgs.hasFlag(options::OPT_fuse_init_array, if (!DriverArgs.hasFlag(options::OPT_fuse_init_array,
options::OPT_fno_use_init_array, options::OPT_fno_use_init_array,
UseInitArrayDefault)) UseInitArrayDefault))
CC1Args.push_back("-fno-use-init-array"); CC1Args.push_back("-fno-use-init-array");
if (DriverArgs.hasArg(options::OPT_ffixed_r19)) { if (DriverArgs.hasArg(options::OPT_ffixed_r19)) {
CC1Args.push_back("-target-feature"); CC1Args.push_back("-target-feature");
▲ Show 20 Lines • Show All 75 Lines • Show Last 20 Lines

clang/test/Driver/hexagon-toolchain-elf.c

Show First 20 Lines • Show All 658 Lines • ▼ Show 20 Lines
// RUN: -mcpu=hexagonv60 \ // RUN: -mcpu=hexagonv60 \
// RUN: --sysroot=/hexagon -nodefaultlibs \ // RUN: --sysroot=/hexagon -nodefaultlibs \
// RUN: %s 2>&1 \ // RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK089 %s // RUN: | FileCheck -check-prefix=CHECK089 %s
// CHECK089: "-dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1" // CHECK089: "-dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1"
// CHECK089: "/hexagon{{/|\\\\}}lib{{/|\\\\}}crt1.o" // CHECK089: "/hexagon{{/|\\\\}}lib{{/|\\\\}}crt1.o"
// CHECK089-NOT: -lclang_rt.builtins-hexagon // CHECK089-NOT: -lclang_rt.builtins-hexagon
// CHECK089-NOT: -lc // CHECK089-NOT: -lc
// -----------------------------------------------------------------------------
// Not Passing -fno-use-init-array when musl is selected
// -----------------------------------------------------------------------------
// RUN: %clang -### -target hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
// RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK090 %s
// CHECK090-NOT: -fno-use-init-array
// -----------------------------------------------------------------------------