This is an archive of the discontinued LLVM Phabricator instance.

Differential D55856

[Driver] Also obey -nostdlib++ when rewriting -lstdc++.
ClosedPublic

Authored by danalbert on Dec 18 2018, 3:02 PM.

Details

Reviewers
pirama
Commits
rGf5ffa1a67cea: [Driver] Also obey -nostdlib++ when rewriting -lstdc++.
rC349570: [Driver] Also obey -nostdlib++ when rewriting -lstdc++.
rL349570: [Driver] Also obey -nostdlib++ when rewriting -lstdc++.

Diff Detail

Repository
rL LLVM

Event Timeline

danalbert created this revision.Dec 18 2018, 3:02 PM
Harbormaster completed remote builds in B26129: Diff 178795.Dec 18 2018, 3:02 PM
pirama added inline comments.Dec 18 2018, 3:04 PM
test/Driver/nostdlibxx.cpp
14 ↗(On Diff #178795)

Missing space here?

pirama accepted this revision.Dec 18 2018, 3:05 PM
pirama added inline comments.
test/Driver/nostdlibxx.cpp
14 ↗(On Diff #178795)

Between -lstdc++ and the %s.

This revision is now accepted and ready to land.Dec 18 2018, 3:05 PM
danalbert updated this revision to Diff 178805.Dec 18 2018, 3:31 PM
Harbormaster completed remote builds in B26131: Diff 178805.Dec 18 2018, 3:32 PM
danalbert marked 2 inline comments as done.Dec 18 2018, 3:32 PM
Closed by commit rL349570: [Driver] Also obey -nostdlib++ when rewriting -lstdc++. (authored by danalbert). · Explain WhyDec 18 2018, 3:32 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptDec 18 2018, 3:32 PM

Revision Contents

PathSize
cfe/
trunk/
lib/
Driver/
4 lines
test/
Driver/
9 lines

Diff 178806

cfe/trunk/lib/Driver/Driver.cpp

Show First 20 Lines • Show All 297 Lines • ▼ Show 20 Lines if (Claim)
A->claim(); A->claim();
return A; return A;
} }
DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const { DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const {
DerivedArgList *DAL = new DerivedArgList(Args); DerivedArgList *DAL = new DerivedArgList(Args);
bool HasNostdlib = Args.hasArg(options::OPT_nostdlib); bool HasNostdlib = Args.hasArg(options::OPT_nostdlib);
bool HasNostdlibxx = Args.hasArg(options::OPT_nostdlibxx);
bool HasNodefaultlib = Args.hasArg(options::OPT_nodefaultlibs); bool HasNodefaultlib = Args.hasArg(options::OPT_nodefaultlibs);
for (Arg *A : Args) { for (Arg *A : Args) {
// Unfortunately, we have to parse some forwarding options (-Xassembler, // Unfortunately, we have to parse some forwarding options (-Xassembler,
// -Xlinker, -Xpreprocessor) because we either integrate their functionality // -Xlinker, -Xpreprocessor) because we either integrate their functionality
// (assembler and preprocessor), or bypass a previous driver ('collect2'). // (assembler and preprocessor), or bypass a previous driver ('collect2').
// Rewrite linker options, to replace --no-demangle with a custom internal // Rewrite linker options, to replace --no-demangle with a custom internal
// option. // option.
Show All 28 Lines if (A->getOption().matches(options::OPT_Wp_COMMA) &&
continue; continue;
} }
// Rewrite reserved library names. // Rewrite reserved library names.
if (A->getOption().matches(options::OPT_l)) { if (A->getOption().matches(options::OPT_l)) {
StringRef Value = A->getValue(); StringRef Value = A->getValue();
// Rewrite unless -nostdlib is present. // Rewrite unless -nostdlib is present.
if (!HasNostdlib && !HasNodefaultlib && Value == "stdc++") { if (!HasNostdlib && !HasNodefaultlib && !HasNostdlibxx &&
Value == "stdc++") {
DAL->AddFlagArg(A, Opts->getOption(options::OPT_Z_reserved_lib_stdcxx)); DAL->AddFlagArg(A, Opts->getOption(options::OPT_Z_reserved_lib_stdcxx));
continue; continue;
} }
// Rewrite unconditionally. // Rewrite unconditionally.
if (Value == "cc_kext") { if (Value == "cc_kext") {
DAL->AddFlagArg(A, Opts->getOption(options::OPT_Z_reserved_lib_cckext)); DAL->AddFlagArg(A, Opts->getOption(options::OPT_Z_reserved_lib_cckext));
continue; continue;
▲ Show 20 Lines • Show All 4,379 Lines • Show Last 20 Lines

cfe/trunk/test/Driver/nostdlibxx.cpp

// RUN: %clangxx -target i686-pc-linux-gnu -### -nostdlib++ %s 2> %t // RUN: %clangxx -target i686-pc-linux-gnu -### -nostdlib++ %s 2> %t
// RUN: FileCheck < %t %s // RUN: FileCheck < %t %s
// We should still have -lm and the C standard libraries, but not -lstdc++. // We should still have -lm and the C standard libraries, but not -lstdc++.
// CHECK-NOT: -lstdc++ // CHECK-NOT: -lstdc++
// CHECK-NOT: -lc++ // CHECK-NOT: -lc++
// CHECK: -lm // CHECK: -lm
// Make sure -lstdc++ isn't rewritten to the default stdlib when -nostdlib++ is
// used.
//
// RUN: %clangxx -target i686-pc-linux-gnu -### \
// RUN: -nostdlib++ -stdlib=libc++ -lstdc++ %s 2> %t
// RUN: FileCheck --check-prefix=CHECK-RESERVED-LIB-REWRITE < %t %s
// CHECK-RESERVED-LIB-REWRITE: -lstdc++
// CHECK-RESERVED-LIB-REWRITE-NOT: -lc++