This is an archive of the discontinued LLVM Phabricator instance.

Differential D81970

[Clang][Driver] Remove gold linker support for PS4 toolchain
ClosedPublic

Authored by ychen on Jun 16 2020, 2:36 PM.

Details

Reviewers
probinson
Commits
rG2956cc50f340: [Clang][Driver] Remove gold linker support for PS4 toolchain

Diff Detail

Unit TestsFailed

TimeTest
80 mslinux > lld.MachO::Unknown Unit Message ("")

Event Timeline

ychen created this revision.Jun 16 2020, 2:36 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 16 2020, 2:36 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
ychen updated this revision to Diff 271218.Jun 16 2020, 3:02 PM
  • update test
Harbormaster failed remote builds in B60548: Diff 271209!Jun 16 2020, 3:56 PM
ychen updated this revision to Diff 271237.Jun 16 2020, 3:58 PM
  • clang-format
Harbormaster failed remote builds in B60553: Diff 271218!Jun 16 2020, 4:29 PM
Harbormaster failed remote builds in B60563: Diff 271237!Jun 16 2020, 5:01 PM
probinson accepted this revision.Jun 17 2020, 6:43 AM

LGTM with one inline comment.

clang/lib/Driver/ToolChains/PS4CPU.cpp
154

Seems like you shouldn't need a temp variable LdName here? The old code just passes the literal string directly:
Args.MakeArgString(ToolChain.GetProgramPath("orbis-ld"));

This revision is now accepted and ready to land.Jun 17 2020, 6:43 AM
ychen updated this revision to Diff 271394.Jun 17 2020, 9:40 AM
  • address comment
ychen marked an inline comment as done.Jun 17 2020, 9:41 AM
Closed by commit rG2956cc50f340: [Clang][Driver] Remove gold linker support for PS4 toolchain (authored by Yuanfang Chen <yuanfang.chen@sony.com>). · Explain WhyJun 17 2020, 10:13 AM
This revision was automatically updated to reflect the committed changes.
Harbormaster completed remote builds in B60656: Diff 271394.Jun 17 2020, 10:46 AM
azat mentioned this in D133092: [clang] fix generation of .debug_aranges with LTO.Sep 2 2022, 7:43 AM

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
223 lines
test/
Driver/
14 lines
24 lines

Diff 271237

clang/lib/Driver/ToolChains/PS4CPU.cpp

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Linesvoid tools::PS4cpu::addSanitizerArgs(const ToolChain &TC,
ArgStringList &CmdArgs) { ArgStringList &CmdArgs) {
const SanitizerArgs &SanArgs = TC.getSanitizerArgs(); const SanitizerArgs &SanArgs = TC.getSanitizerArgs();
if (SanArgs.needsUbsanRt()) if (SanArgs.needsUbsanRt())
CmdArgs.push_back("--dependent-lib=libSceDbgUBSanitizer_stub_weak.a"); CmdArgs.push_back("--dependent-lib=libSceDbgUBSanitizer_stub_weak.a");
if (SanArgs.needsAsanRt()) if (SanArgs.needsAsanRt())
CmdArgs.push_back("--dependent-lib=libSceDbgAddressSanitizer_stub_weak.a"); CmdArgs.push_back("--dependent-lib=libSceDbgAddressSanitizer_stub_weak.a");
} }
static void ConstructPS4LinkJob(const Tool &T, Compilation &C, void tools::PS4cpu::Link::ConstructJob(Compilation &C, const JobAction &JA,
const JobAction &JA, const InputInfo &Output, const InputInfo &Output,
const InputInfoList &Inputs, const InputInfoList &Inputs,
const ArgList &Args, const ArgList &Args,
const char *LinkingOutput) { const char *LinkingOutput) const {
const toolchains::FreeBSD &ToolChain = const toolchains::FreeBSD &ToolChain =
static_cast<const toolchains::FreeBSD &>(T.getToolChain()); static_cast<const toolchains::FreeBSD &>(getToolChain());
const Driver &D = ToolChain.getDriver(); const Driver &D = ToolChain.getDriver();
ArgStringList CmdArgs; ArgStringList CmdArgs;
// Silence warning for "clang -g foo.o -o foo" // Silence warning for "clang -g foo.o -o foo"
Args.ClaimAllArgs(options::OPT_g_Group); Args.ClaimAllArgs(options::OPT_g_Group);
// and "clang -emit-llvm foo.o -o foo" // and "clang -emit-llvm foo.o -o foo"
Args.ClaimAllArgs(options::OPT_emit_llvm); Args.ClaimAllArgs(options::OPT_emit_llvm);
// and for "clang -w foo.o -o foo". Other warning options are already // and for "clang -w foo.o -o foo". Other warning options are already
Show All 32 Lines if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle))
CmdArgs.push_back("--no-demangle"); CmdArgs.push_back("--no-demangle");
AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA); AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
if (Args.hasArg(options::OPT_pthread)) { if (Args.hasArg(options::OPT_pthread)) {
CmdArgs.push_back("-lpthread"); CmdArgs.push_back("-lpthread");
} }
const char *Exec = Args.MakeArgString(ToolChain.GetProgramPath("orbis-ld")); if (Args.hasArg(options::OPT_fuse_ld_EQ)) {
D.Diag(diag::err_drv_unsupported_opt_for_target)
C.addCommand(std::make_unique<Command>(JA, T, Exec, CmdArgs, Inputs)); << "-fuse-ld" << getToolChain().getTriple().str();
}
static void ConstructGoldLinkJob(const Tool &T, Compilation &C,
const JobAction &JA, const InputInfo &Output,
const InputInfoList &Inputs,
const ArgList &Args,
const char *LinkingOutput) {
const toolchains::FreeBSD &ToolChain =
static_cast<const toolchains::FreeBSD &>(T.getToolChain());
const Driver &D = ToolChain.getDriver();
ArgStringList CmdArgs;
// Silence warning for "clang -g foo.o -o foo"
Args.ClaimAllArgs(options::OPT_g_Group);
// and "clang -emit-llvm foo.o -o foo"
Args.ClaimAllArgs(options::OPT_emit_llvm);
// and for "clang -w foo.o -o foo". Other warning options are already
// handled somewhere else.
Args.ClaimAllArgs(options::OPT_w);
if (!D.SysRoot.empty())
CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot));
if (Args.hasArg(options::OPT_pie))
CmdArgs.push_back("-pie");
if (Args.hasArg(options::OPT_static)) {
CmdArgs.push_back("-Bstatic");
} else {
if (Args.hasArg(options::OPT_rdynamic))
CmdArgs.push_back("-export-dynamic");
CmdArgs.push_back("--eh-frame-hdr");
if (Args.hasArg(options::OPT_shared)) {
CmdArgs.push_back("-Bshareable");
} else {
CmdArgs.push_back("-dynamic-linker");
CmdArgs.push_back("/libexec/ld-elf.so.1");
}
CmdArgs.push_back("--enable-new-dtags");
}
if (Output.isFilename()) {
CmdArgs.push_back("-o");
CmdArgs.push_back(Output.getFilename());
} else {
assert(Output.isNothing() && "Invalid output.");
}
if(!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs))
AddPS4SanitizerArgs(ToolChain, CmdArgs);
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
const char *crt1 = nullptr;
if (!Args.hasArg(options::OPT_shared)) {
if (Args.hasArg(options::OPT_pg))
crt1 = "gcrt1.o";
else if (Args.hasArg(options::OPT_pie))
crt1 = "Scrt1.o";
else
crt1 = "crt1.o";
}
if (crt1)
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crt1)));
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
const char *crtbegin = nullptr;
if (Args.hasArg(options::OPT_static))
crtbegin = "crtbeginT.o";
else if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_pie))
crtbegin = "crtbeginS.o";
else
crtbegin = "crtbegin.o";
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin)));
}
Args.AddAllArgs(CmdArgs, options::OPT_L);
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
Args.AddAllArgs(CmdArgs, options::OPT_e);
Args.AddAllArgs(CmdArgs, options::OPT_s);
Args.AddAllArgs(CmdArgs, options::OPT_t);
Args.AddAllArgs(CmdArgs, options::OPT_r);
if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle))
CmdArgs.push_back("--no-demangle");
AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
// For PS4, we always want to pass libm, libstdc++ and libkernel
// libraries for both C and C++ compilations.
CmdArgs.push_back("-lkernel");
if (D.CCCIsCXX()) {
if (ToolChain.ShouldLinkCXXStdlib(Args))
ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
if (Args.hasArg(options::OPT_pg))
CmdArgs.push_back("-lm_p");
else
CmdArgs.push_back("-lm");
}
// FIXME: For some reason GCC passes -lgcc and -lgcc_s before adding
// the default system libraries. Just mimic this for now.
if (Args.hasArg(options::OPT_pg))
CmdArgs.push_back("-lgcc_p");
else
CmdArgs.push_back("-lcompiler_rt");
if (Args.hasArg(options::OPT_static)) {
CmdArgs.push_back("-lstdc++");
} else if (Args.hasArg(options::OPT_pg)) {
CmdArgs.push_back("-lgcc_eh_p");
} else {
CmdArgs.push_back("--as-needed");
CmdArgs.push_back("-lstdc++");
CmdArgs.push_back("--no-as-needed");
}
if (Args.hasArg(options::OPT_pthread)) {
if (Args.hasArg(options::OPT_pg))
CmdArgs.push_back("-lpthread_p");
else
CmdArgs.push_back("-lpthread");
}
if (Args.hasArg(options::OPT_pg)) {
if (Args.hasArg(options::OPT_shared))
CmdArgs.push_back("-lc");
else {
if (Args.hasArg(options::OPT_static)) {
CmdArgs.push_back("--start-group");
CmdArgs.push_back("-lc_p");
CmdArgs.push_back("-lpthread_p");
CmdArgs.push_back("--end-group");
} else {
CmdArgs.push_back("-lc_p");
}
}
CmdArgs.push_back("-lgcc_p");
} else {
if (Args.hasArg(options::OPT_static)) {
CmdArgs.push_back("--start-group");
CmdArgs.push_back("-lc");
CmdArgs.push_back("-lpthread");
CmdArgs.push_back("--end-group");
} else {
CmdArgs.push_back("-lc");
}
CmdArgs.push_back("-lcompiler_rt");
} }
if (Args.hasArg(options::OPT_static)) { std::string LdName = std::string("orbis-ld");
CmdArgs.push_back("-lstdc++");
} else if (Args.hasArg(options::OPT_pg)) {
CmdArgs.push_back("-lgcc_eh_p");
} else {
CmdArgs.push_back("--as-needed");
CmdArgs.push_back("-lstdc++");
CmdArgs.push_back("--no-as-needed");
}
}
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_pie))
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtendS.o")));
else
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtend.o")));
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtn.o")));
}
const char *Exec = const char *Exec =
#ifdef _WIN32 Args.MakeArgString(ToolChain.GetProgramPath(LdName.c_str()));
probinsonUnsubmitted
Done
ReplyInline Actions

Seems like you shouldn't need a temp variable LdName here? The old code just passes the literal string directly:
Args.MakeArgString(ToolChain.GetProgramPath("orbis-ld"));

probinson: Seems like you shouldn't need a temp variable LdName here? The old code just passes the…
Args.MakeArgString(ToolChain.GetProgramPath("orbis-ld.gold"));
#else
Args.MakeArgString(ToolChain.GetProgramPath("orbis-ld"));
#endif
C.addCommand(std::make_unique<Command>(JA, T, Exec, CmdArgs, Inputs)); C.addCommand(std::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
}
void tools::PS4cpu::Link::ConstructJob(Compilation &C, const JobAction &JA,
const InputInfo &Output,
const InputInfoList &Inputs,
const ArgList &Args,
const char *LinkingOutput) const {
const toolchains::FreeBSD &ToolChain =
static_cast<const toolchains::FreeBSD &>(getToolChain());
const Driver &D = ToolChain.getDriver();
bool PS4Linker;
StringRef LinkerOptName;
if (const Arg *A = Args.getLastArg(options::OPT_fuse_ld_EQ)) {
LinkerOptName = A->getValue();
if (LinkerOptName != "ps4" && LinkerOptName != "gold")
D.Diag(diag::err_drv_unsupported_linker) << LinkerOptName;
}
if (LinkerOptName == "gold")
PS4Linker = false;
else if (LinkerOptName == "ps4")
PS4Linker = true;
else
PS4Linker = !Args.hasArg(options::OPT_shared);
if (PS4Linker)
ConstructPS4LinkJob(*this, C, JA, Output, Inputs, Args, LinkingOutput);
else
ConstructGoldLinkJob(*this, C, JA, Output, Inputs, Args, LinkingOutput);
} }
toolchains::PS4CPU::PS4CPU(const Driver &D, const llvm::Triple &Triple, toolchains::PS4CPU::PS4CPU(const Driver &D, const llvm::Triple &Triple,
const ArgList &Args) const ArgList &Args)
: Generic_ELF(D, Triple, Args) { : Generic_ELF(D, Triple, Args) {
if (Args.hasArg(clang::driver::options::OPT_static)) if (Args.hasArg(clang::driver::options::OPT_static))
D.Diag(clang::diag::err_drv_unsupported_opt_for_target) << "-static" D.Diag(clang::diag::err_drv_unsupported_opt_for_target) << "-static"
<< "PS4"; << "PS4";
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines

clang/test/Driver/ps4-linker-non-win.c

// UNSUPPORTED: system-windows // UNSUPPORTED: system-windows
// REQUIRES: x86-registered-target // REQUIRES: x86-registered-target
// RUN: mkdir -p %t // RUN: mkdir -p %t
// RUN: rm -f %t/orbis-ld // RUN: rm -f %t/orbis-ld
// RUN: touch %t/orbis-ld // RUN: touch %t/orbis-ld
// RUN: chmod +x %t/orbis-ld // RUN: chmod +x %t/orbis-ld
// RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-scei-ps4 %s -fuse-ld=gold 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s
// RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-scei-ps4 %s -shared 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s
// RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-scei-ps4 %s 2>&1 \ // RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-scei-ps4 %s 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s // RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s
// RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-scei-ps4 %s -fuse-ld=ps4 2>&1 \ // RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-scei-ps4 %s -shared 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s // RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s
// RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-scei-ps4 %s -shared \
// RUN: -fuse-ld=ps4 2>&1 | FileCheck --check-prefix=CHECK-PS4-LINKER %s
// CHECK-PS4-LINKER: /orbis-ld // CHECK-PS4-LINKER: /orbis-ld
// RUN: env "PATH=%t:%PATH%" %clang -### -target x86_64-scei-ps4 %s -fuse-ld=gold 2>&1 \
// RUN: | FileCheck --check-prefix=ERROR %s
// ERROR: error: unsupported option '-fuse-ld' for target 'x86_64-scei-ps4'

clang/test/Driver/ps4-linker-win.c

// The full path to the gold linker was not found on Windows because the // This test check that orbis-ld is used for linker all the time. Specifying
// driver fails to add an .exe extension to the name. // linker using -fuse-ld causes a error message emitted and compilation fail.
// We check that gold linker's full name (with an extension) is specified
// on the command line if -fuse-ld=gold, or -shared with no -fuse-ld option
// are passed. Otherwise, we check that the PS4's linker's full name is
// specified.
// REQUIRES: system-windows, x86-registered-target // REQUIRES: system-windows, x86-registered-target
// RUN: mkdir -p %t // RUN: mkdir -p %t
// RUN: touch %t/orbis-ld.exe // RUN: touch %t/orbis-ld.exe
// RUN: touch %t/orbis-ld.gold.exe
// RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-scei-ps4 %s -fuse-ld=gold -### 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-PS4-GOLD %s
// RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-scei-ps4 %s -shared -### 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-PS4-GOLD %s
// RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-scei-ps4 %s -### 2>&1 \ // RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-scei-ps4 %s -### 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s // RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s
// RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-scei-ps4 %s -fuse-ld=ps4 -### 2>&1 \ // RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-scei-ps4 %s -shared -### 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s // RUN: | FileCheck --check-prefix=CHECK-PS4-LINKER %s
// RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-scei-ps4 %s -shared \
// RUN: -fuse-ld=ps4 -### 2>&1 | FileCheck --check-prefix=CHECK-PS4-LINKER %s
// CHECK-PS4-GOLD: \\orbis-ld.gold
// CHECK-PS4-LINKER: \\orbis-ld // CHECK-PS4-LINKER: \\orbis-ld
// RUN: env "PATH=%t;%PATH%;" %clang -target x86_64-scei-ps4 %s -fuse-ld=gold -### 2>&1 \
// RUN: | FileCheck --check-prefix=ERROR %s
// ERROR: error: unsupported option '-fuse-ld' for target 'x86_64-scei-ps4'