This is an archive of the discontinued LLVM Phabricator instance.

Differential D113136

[Clang] Pass -z rel to linker for Fuchsia
ClosedPublic

Authored by mcgrathr on Nov 3 2021, 12:10 PM.

Details

Reviewers
phosek
Commits
rGff11f0aa5de1: [Clang] Pass -z rel to linker for Fuchsia
Summary

Fuchsia already supports the more compact relocation format.
Make it the default.

Diff Detail

Event Timeline

mcgrathr created this revision.Nov 3 2021, 12:10 PM
Herald added a subscriber: abrachet. · View Herald TranscriptNov 3 2021, 12:10 PM
mcgrathr requested review of this revision.Nov 3 2021, 12:10 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 3 2021, 12:10 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B132305: Diff 384553.Nov 3 2021, 12:48 PM
mcgrathr updated this revision to Diff 386262.Nov 10 2021, 11:25 AM

rebased

phosek accepted this revision.Nov 10 2021, 11:29 AM

LGTM

clang/lib/Driver/ToolChains/Fuchsia.cpp
66–67

Super minor nit, but I'd prefer moving this two lines up to keep all the -z options together.

This revision is now accepted and ready to land.Nov 10 2021, 11:29 AM
mcgrathr updated this revision to Diff 386293.Nov 10 2021, 1:02 PM
mcgrathr marked an inline comment as done.

reordered switches

mcgrathr added a comment.Nov 10 2021, 1:02 PM

Reordered the switches.

This revision was landed with ongoing or failed builds.Nov 10 2021, 1:31 PM
Closed by commit rGff11f0aa5de1: [Clang] Pass -z rel to linker for Fuchsia (authored by mcgrathr). · Explain Why
This revision was automatically updated to reflect the committed changes.
mcgrathr added a commit: rGff11f0aa5de1: [Clang] Pass -z rel to linker for Fuchsia.
Harbormaster completed remote builds in B133569: Diff 386293.Nov 10 2021, 2:03 PM

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
2 lines
test/
Driver/
2 lines

Diff 386302

clang/lib/Driver/ToolChains/Fuchsia.cpp

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Linesvoid fuchsia::Linker::ConstructJob(Compilation &C, const JobAction &JA,
const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath()); const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath());
if (llvm::sys::path::filename(Exec).equals_insensitive("ld.lld") || if (llvm::sys::path::filename(Exec).equals_insensitive("ld.lld") ||
llvm::sys::path::stem(Exec).equals_insensitive("ld.lld")) { llvm::sys::path::stem(Exec).equals_insensitive("ld.lld")) {
CmdArgs.push_back("-z"); CmdArgs.push_back("-z");
CmdArgs.push_back("rodynamic"); CmdArgs.push_back("rodynamic");
CmdArgs.push_back("-z"); CmdArgs.push_back("-z");
CmdArgs.push_back("separate-loadable-segments"); CmdArgs.push_back("separate-loadable-segments");
CmdArgs.push_back("-z");
CmdArgs.push_back("rel");
CmdArgs.push_back("--pack-dyn-relocs=relr"); CmdArgs.push_back("--pack-dyn-relocs=relr");
} }
phosekUnsubmitted
Done
ReplyInline Actions

Super minor nit, but I'd prefer moving this two lines up to keep all the -z options together.

phosek: Super minor nit, but I'd prefer moving this two lines up to keep all the `-z` options together.
if (!D.SysRoot.empty()) if (!D.SysRoot.empty())
CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot)); CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot));
if (!Args.hasArg(options::OPT_shared) && !Args.hasArg(options::OPT_r)) if (!Args.hasArg(options::OPT_shared) && !Args.hasArg(options::OPT_r))
CmdArgs.push_back("-pie"); CmdArgs.push_back("-pie");
if (Args.hasArg(options::OPT_rdynamic)) if (Args.hasArg(options::OPT_rdynamic))
CmdArgs.push_back("-export-dynamic"); CmdArgs.push_back("-export-dynamic");
▲ Show 20 Lines • Show All 364 Lines • Show Last 20 Lines

clang/test/Driver/fuchsia.c

Show All 29 Lines
// CHECK: "-funwind-tables=2" // CHECK: "-funwind-tables=2"
// CHECK: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]" // CHECK: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
// CHECK: "-isysroot" "[[SYSROOT:[^"]+]]" // CHECK: "-isysroot" "[[SYSROOT:[^"]+]]"
// CHECK: "-internal-externc-isystem" "[[SYSROOT]]{{/|\\\\}}include" // CHECK: "-internal-externc-isystem" "[[SYSROOT]]{{/|\\\\}}include"
// CHECK-AARCH64: "-fsanitize=shadow-call-stack" // CHECK-AARCH64: "-fsanitize=shadow-call-stack"
// CHECK-X86_64: "-fsanitize=safe-stack" // CHECK-X86_64: "-fsanitize=safe-stack"
// CHECK: "-stack-protector" "2" // CHECK: "-stack-protector" "2"
// CHECK-NOT: "-fcommon" // CHECK-NOT: "-fcommon"
// CHECK: {{.*}}ld.lld{{.*}}" "-z" "max-page-size=4096" "-z" "now" "-z" "rodynamic" "-z" "separate-loadable-segments" "--pack-dyn-relocs=relr" // CHECK: {{.*}}ld.lld{{.*}}" "-z" "max-page-size=4096" "-z" "now" "-z" "rodynamic" "-z" "separate-loadable-segments" "-z" "rel" "--pack-dyn-relocs=relr"
// CHECK: "--sysroot=[[SYSROOT]]" // CHECK: "--sysroot=[[SYSROOT]]"
// CHECK: "-pie" // CHECK: "-pie"
// CHECK: "--build-id" // CHECK: "--build-id"
// CHECK: "--hash-style=gnu" // CHECK: "--hash-style=gnu"
// CHECK: "-dynamic-linker" "ld.so.1" // CHECK: "-dynamic-linker" "ld.so.1"
// CHECK: Scrt1.o // CHECK: Scrt1.o
// CHECK-NOT: crti.o // CHECK-NOT: crti.o
// CHECK-NOT: crtbegin.o // CHECK-NOT: crtbegin.o
▲ Show 20 Lines • Show All 226 Lines • Show Last 20 Lines