This is an archive of the discontinued LLVM Phabricator instance.

Differential D54082

[Driver] Use -Bstatic/dynamic for libc++ on Fuchsia
ClosedPublic

Authored by phosek on Nov 3 2018, 9:26 PM.

Details

Reviewers
mcgrathr
EricWF
Commits
rG6c652b7f1167: [Driver] Use -Bstatic/dynamic for libc++ on Fuchsia
rC346107: [Driver] Use -Bstatic/dynamic for libc++ on Fuchsia
rL346107: [Driver] Use -Bstatic/dynamic for libc++ on Fuchsia
Summary

-static relies on lld's behavior, but -Bstatic/dynamic across all
linkers, -lm is only needed when statically linking libc++.

Diff Detail

Repository
rL LLVM

Event Timeline

phosek created this revision.Nov 3 2018, 9:26 PM
Herald added a reviewer: EricWF. · View Herald TranscriptNov 3 2018, 9:26 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
phosek mentioned this in D53854: [Driver] Use -push-/-pop-state and -as-needed for libc++ on Fuchsia.Nov 3 2018, 9:26 PM
mcgrathr accepted this revision.Nov 3 2018, 9:32 PM

lgtm

This revision is now accepted and ready to land.Nov 3 2018, 9:32 PM
Closed by commit rL346107: [Driver] Use -Bstatic/dynamic for libc++ on Fuchsia (authored by phosek). · Explain WhyNov 4 2018, 2:42 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptNov 4 2018, 2:42 PM

Revision Contents

PathSize
cfe/
trunk/
lib/
Driver/
ToolChains/
4 lines
test/
Driver/
3 lines

Diff 172530

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

Show First 20 Lines • Show All 119 Lines • ▼ Show 20 Lines if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
if (D.CCCIsCXX()) { if (D.CCCIsCXX()) {
if (ToolChain.ShouldLinkCXXStdlib(Args)) { if (ToolChain.ShouldLinkCXXStdlib(Args)) {
bool OnlyLibstdcxxStatic = Args.hasArg(options::OPT_static_libstdcxx) && bool OnlyLibstdcxxStatic = Args.hasArg(options::OPT_static_libstdcxx) &&
!Args.hasArg(options::OPT_static); !Args.hasArg(options::OPT_static);
CmdArgs.push_back("--push-state"); CmdArgs.push_back("--push-state");
CmdArgs.push_back("--as-needed"); CmdArgs.push_back("--as-needed");
if (OnlyLibstdcxxStatic) if (OnlyLibstdcxxStatic)
CmdArgs.push_back("-static"); CmdArgs.push_back("-Bstatic");
ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs); ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
if (OnlyLibstdcxxStatic)
CmdArgs.push_back("-Bdynamic");
CmdArgs.push_back("-lm"); CmdArgs.push_back("-lm");
CmdArgs.push_back("--pop-state"); CmdArgs.push_back("--pop-state");
} }
} }
AddRunTimeLibs(ToolChain, D, CmdArgs, Args); AddRunTimeLibs(ToolChain, D, CmdArgs, Args);
if (Args.hasArg(options::OPT_pthread) || if (Args.hasArg(options::OPT_pthread) ||
▲ Show 20 Lines • Show All 150 Lines • Show Last 20 Lines

cfe/trunk/test/Driver/fuchsia.cpp

Show All 31 Lines
// RUN: | FileCheck %s -check-prefix=CHECK-STDLIB // RUN: | FileCheck %s -check-prefix=CHECK-STDLIB
// CHECK-STDLIB: error: invalid library name in argument '-stdlib=libstdc++' // CHECK-STDLIB: error: invalid library name in argument '-stdlib=libstdc++'
// RUN: %clangxx %s -### --target=x86_64-unknown-fuchsia -static-libstdc++ \ // RUN: %clangxx %s -### --target=x86_64-unknown-fuchsia -static-libstdc++ \
// RUN: -fuse-ld=lld 2>&1 \ // RUN: -fuse-ld=lld 2>&1 \
// RUN: | FileCheck %s -check-prefix=CHECK-STATIC // RUN: | FileCheck %s -check-prefix=CHECK-STATIC
// CHECK-STATIC: "--push-state" // CHECK-STATIC: "--push-state"
// CHECK-STATIC: "--as-needed" // CHECK-STATIC: "--as-needed"
// CHECK-STATIC: "-static" // CHECK-STATIC: "-Bstatic"
// CHECK-STATIC: "-lc++" // CHECK-STATIC: "-lc++"
// CHECK-STATIC: "-Bdynamic"
// CHECK-STATIC: "-lm" // CHECK-STATIC: "-lm"
// CHECK-STATIC: "--pop-state" // CHECK-STATIC: "--pop-state"
// CHECK-STATIC: "-lc" // CHECK-STATIC: "-lc"