This is an archive of the discontinued LLVM Phabricator instance.

Differential D68009

[Driver] Always use -z separate-loadable-segments with lld on Fuchsia
ClosedPublic

Authored by MaskRay on Sep 24 2019, 11:30 PM.

Details

Reviewers
jakehehrlich
mcgrathr
phosek
Commits
rG3cba180cac9a: [Driver] Always use -z separate-loadable-segments with lld on Fuchsia
rL372814: [Driver] Always use -z separate-loadable-segments with lld on Fuchsia
rC372814: [Driver] Always use -z separate-loadable-segments with lld on Fuchsia
Summary

The option was added to lld in D67481/372807.

Diff Detail

Repository
rL LLVM

Event Timeline

MaskRay created this revision.Sep 24 2019, 11:30 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 24 2019, 11:30 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B38522: Diff 221674.Sep 24 2019, 11:31 PM
phosek accepted this revision.Sep 24 2019, 11:41 PM

LGTM thanks!

This revision is now accepted and ready to land.Sep 24 2019, 11:41 PM
Closed by commit rL372814: [Driver] Always use -z separate-loadable-segments with lld on Fuchsia (authored by MaskRay). · Explain WhySep 25 2019, 12:06 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptSep 25 2019, 12:06 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
cfe/
trunk/
lib/
Driver/
ToolChains/
2 lines
test/
Driver/
2 lines

Diff 221675

cfe/trunk/lib/Driver/ToolChains/Fuchsia.cpp

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Linesvoid fuchsia::Linker::ConstructJob(Compilation &C, const JobAction &JA,
Args.ClaimAllArgs(options::OPT_w); Args.ClaimAllArgs(options::OPT_w);
const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath()); const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath());
if (llvm::sys::path::filename(Exec).equals_lower("ld.lld") || if (llvm::sys::path::filename(Exec).equals_lower("ld.lld") ||
llvm::sys::path::stem(Exec).equals_lower("ld.lld")) { llvm::sys::path::stem(Exec).equals_lower("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-code"); CmdArgs.push_back("separate-loadable-segments");
} }
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");
▲ Show 20 Lines • Show All 284 Lines • Show Last 20 Lines

cfe/trunk/test/Driver/fuchsia.c

Show All 10 Lines
// CHECK: "-munwind-tables" // CHECK: "-munwind-tables"
// CHECK: "-fuse-init-array" // CHECK: "-fuse-init-array"
// 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: "-fsanitize=safe-stack" // CHECK: "-fsanitize=safe-stack"
// CHECK: "-stack-protector" "2" // CHECK: "-stack-protector" "2"
// CHECK: "-fno-common" // CHECK: "-fno-common"
// CHECK: {{.*}}ld.lld{{.*}}" "-z" "rodynamic" "-z" "separate-code" // CHECK: {{.*}}ld.lld{{.*}}" "-z" "rodynamic" "-z" "separate-loadable-segments"
// 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 180 Lines • Show Last 20 Lines