This is an archive of the discontinued LLVM Phabricator instance.

Differential D75139

[hexagon] Pickup the default crt and libs when the musl target is selected
ClosedPublic

Authored by sidneym on Feb 25 2020, 1:46 PM.

Details

Reviewers
kparzysz
bcain
adasgupt
Commits
rGd481e59863ac: [hexagon] Add default paths to support musl target
rG637767665141: Add default paths to support musl target
Summary

Pickup the default crt and libs when the musl target is selected.

Diff Detail

Event Timeline

sidneym created this revision.Feb 25 2020, 1:46 PM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 25 2020, 1:46 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
bcain accepted this revision.Feb 27 2020, 8:05 AM

LGTM

This revision is now accepted and ready to land.Feb 27 2020, 8:05 AM
Herald added a subscriber: ormris. · View Herald TranscriptFeb 27 2020, 8:05 AM
sidneym marked an inline comment as done.Feb 27 2020, 9:53 AM
sidneym added inline comments.
clang/lib/Driver/ToolChains/Hexagon.cpp
290

the default selection of the dynamic-linker needs to move above AddAllArgs.

sidneym updated this revision to Diff 247251.Feb 28 2020, 6:20 AM

Move selection of the dynamic linker before user args are added.

Harbormaster completed remote builds in B47584: Diff 247251.Feb 28 2020, 6:42 AM
Closed by commit rG637767665141: Add default paths to support musl target (authored by sidneym). · Explain WhyMar 2 2020, 11:40 AM
This revision was automatically updated to reflect the committed changes.
sidneym updated this revision to Diff 247711.Mar 2 2020, 12:35 PM

Update testcase.

sidneym reopened this revision.Mar 2 2020, 12:38 PM
This revision is now accepted and ready to land.Mar 2 2020, 12:38 PM
Harbormaster failed remote builds in B47821: Diff 247711!Mar 2 2020, 1:44 PM
sidneym updated this revision to Diff 247724.Mar 2 2020, 1:45 PM

address clang-tidy issues

Harbormaster completed remote builds in B47831: Diff 247724.Mar 2 2020, 2:10 PM
Closed by commit rGd481e59863ac: [hexagon] Add default paths to support musl target (authored by sidneym). · Explain WhyMar 3 2020, 6:56 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
29 lines
test/
Driver/
67 lines

Diff 247888

clang/lib/Driver/ToolChains/Hexagon.cpp

Show First 20 Lines • Show All 258 Lines • ▼ Show 20 LinesconstructHexagonLinkArgs(Compilation &C, const JobAction &JA,
if (IsPIE && !IsShared) if (IsPIE && !IsShared)
CmdArgs.push_back("-pie"); CmdArgs.push_back("-pie");
if (auto G = toolchains::HexagonToolChain::getSmallDataThreshold(Args)) { if (auto G = toolchains::HexagonToolChain::getSmallDataThreshold(Args)) {
CmdArgs.push_back(Args.MakeArgString("-G" + Twine(G.getValue()))); CmdArgs.push_back(Args.MakeArgString("-G" + Twine(G.getValue())));
UseG0 = G.getValue() == 0; UseG0 = G.getValue() == 0;
} }
//----------------------------------------------------------------------------
//
//----------------------------------------------------------------------------
CmdArgs.push_back("-o"); CmdArgs.push_back("-o");
CmdArgs.push_back(Output.getFilename()); CmdArgs.push_back(Output.getFilename());
if (HTC.getTriple().isMusl()) {
if (!Args.hasArg(options::OPT_shared, options::OPT_static))
CmdArgs.push_back("-dynamic-linker=/lib/ld-musl-hexagon.so.1");
if (!Args.hasArg(options::OPT_shared, options::OPT_nostartfiles,
options::OPT_nostdlib))
CmdArgs.push_back(Args.MakeArgString(D.SysRoot + "/lib/crt1.o"));
else if (Args.hasArg(options::OPT_shared) &&
!Args.hasArg(options::OPT_nostartfiles, options::OPT_nostdlib))
CmdArgs.push_back(Args.MakeArgString(D.SysRoot + "/lib/Scrt1.o"));
CmdArgs.push_back(Args.MakeArgString(StringRef("-L") + D.SysRoot + "/lib"));
Args.AddAllArgs(CmdArgs,
{options::OPT_T_Group, options::OPT_e, options::OPT_s,
options::OPT_t, options::OPT_u_Group});
AddLinkerInputs(HTC, Inputs, Args, CmdArgs, JA);
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
CmdArgs.push_back("-lclang_rt.builtins-hexagon");
CmdArgs.push_back("-lc");
}
sidneymAuthorUnsubmitted
Done
ReplyInline Actions

the default selection of the dynamic-linker needs to move above AddAllArgs.

sidneym: the default selection of the dynamic-linker needs to move above AddAllArgs.
return;
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// moslib // moslib
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::vector<std::string> OsLibs; std::vector<std::string> OsLibs;
bool HasStandalone = false; bool HasStandalone = false;
for (const Arg *A : Args.filtered(options::OPT_moslib_EQ)) { for (const Arg *A : Args.filtered(options::OPT_moslib_EQ)) {
A->claim(); A->claim();
OsLibs.emplace_back(A->getValue()); OsLibs.emplace_back(A->getValue());
HasStandalone = HasStandalone || (OsLibs.back() == "standalone"); HasStandalone = HasStandalone || (OsLibs.back() == "standalone");
} }
if (OsLibs.empty()) { if (OsLibs.empty()) {
OsLibs.push_back("standalone"); OsLibs.push_back("standalone");
HasStandalone = true; HasStandalone = true;
▲ Show 20 Lines • Show All 323 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 591 Lines • ▼ Show 20 Lines
// Passing -fno-use-init-array // Passing -fno-use-init-array
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// RUN: %clang -### -target hexagon-unknown-elf \ // RUN: %clang -### -target hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \ // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \ // RUN: -mcpu=hexagonv60 \
// RUN: %s 2>&1 \ // RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK084 %s // RUN: | FileCheck -check-prefix=CHECK084 %s
// CHECK084: "-fno-use-init-array" // CHECK084: "-fno-use-init-array"
// -----------------------------------------------------------------------------
// Passing --musl
// -----------------------------------------------------------------------------
// RUN: %clang -### -target hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
// RUN: -fuse-ld=lld \
// RUN: --sysroot=/hexagon \
// RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK085 %s
// CHECK085-NOT: /hexagon{{/|\\\\}}lib{{/|\\\\}}Scrt1.o
// CHECK085: "-dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1"
// CHECK085: "/hexagon{{/|\\\\}}lib{{/|\\\\}}crt1.o"
// CHECK085: "-lclang_rt.builtins-hexagon" "-lc"
// -----------------------------------------------------------------------------
// Passing --musl --shared
// -----------------------------------------------------------------------------
// RUN: %clang -### -target hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
// RUN: --sysroot=/hexagon -shared \
// RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK086 %s
// CHECK086-NOT: -dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1
// CHECK086: "/hexagon{{/|\\\\}}lib{{/|\\\\}}Scrt1.o"
// CHECK086: "-lclang_rt.builtins-hexagon" "-lc"
// CHECK086-NOT: /hexagon{{/|\\\\}}lib{{/|\\\\}}crt1.o
// -----------------------------------------------------------------------------
// Passing --musl -nostdlib
// -----------------------------------------------------------------------------
// RUN: %clang -### -target hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
// RUN: --sysroot=/hexagon -nostdlib \
// RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK087 %s
// CHECK087: "-dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1"
// CHECK087-NOT: /hexagon{{/|\\\\}}lib{{/|\\\\}}Scrt1.o
// CHECK087-NOT: /hexagon{{/|\\\\}}lib{{/|\\\\}}crt1.o
// CHECK087-NOT: -lclang_rt.builtins-hexagon
// CHECK087-NOT: -lc
// -----------------------------------------------------------------------------
// Passing --musl -nostartfiles
// -----------------------------------------------------------------------------
// RUN: %clang -### -target hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
// RUN: --sysroot=/hexagon -nostartfiles \
// RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK088 %s
// CHECK088: "-dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1"
// CHECK088-NOT: /hexagon{{/|\\\\}}lib{{/|\\\\}}Scrt1.o
// CHECK088-NOT: /hexagon{{/|\\\\}}lib{{/|\\\\}}crt1.o
// CHECK088: "-lclang_rt.builtins-hexagon" "-lc"
// -----------------------------------------------------------------------------
// Passing --musl -nodefaultlibs
// -----------------------------------------------------------------------------
// RUN: %clang -### -target hexagon-unknown-linux-musl \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
// RUN: --sysroot=/hexagon -nodefaultlibs \
// RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK089 %s
// CHECK089: "-dynamic-linker={{/|\\\\}}lib{{/|\\\\}}ld-musl-hexagon.so.1"
// CHECK089: "/hexagon{{/|\\\\}}lib{{/|\\\\}}crt1.o"
// CHECK089-NOT: -lclang_rt.builtins-hexagon
// CHECK089-NOT: -lc