dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the -print-multi-directory flag to print the selected multilib. 

Summary: Fix -print-multi-directory to print the selected multilib

Reviewers: jroelofs

Reviewed By: jroelofs

Subscribers: jroelofs, timshen, thakis, srhines, cfe-commits

Differential Revision: https://reviews.llvm.org/D51354

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@341547 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Christian Bruel 2018-09-06 14:03:44 +00:00
parent 23a0e9ffba
commit 7699dded74
4 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/clang/Driver/ToolChain.h
View File

@ -149,6 +149,7 @@ private:
protected:
MultilibSet Multilibs;
Multilib SelectedMultilib;
ToolChain(const Driver &D, const llvm::Triple &T,
const llvm::opt::ArgList &Args);
@ -227,6 +228,8 @@ public:
const MultilibSet &getMultilibs() const { return Multilibs; }
const Multilib &getMultilib() const { return SelectedMultilib; }
const SanitizerArgs& getSanitizerArgs() const;
const XRayArgs& getXRayArgs() const;

15
lib/Driver/Driver.cpp
View File

@ -1661,14 +1661,13 @@ bool Driver::HandleImmediateArgs(const Compilation &C) {
}
if (C.getArgs().hasArg(options::OPT_print_multi_directory)) {
for (const Multilib &Multilib : TC.getMultilibs()) {
if (Multilib.gccSuffix().empty())
llvm::outs() << ".\n";
else {
StringRef Suffix(Multilib.gccSuffix());
assert(Suffix.front() == '/');
llvm::outs() << Suffix.substr(1) << "\n";
}
const Multilib &Multilib = TC.getMultilib();
if (Multilib.gccSuffix().empty())
llvm::outs() << ".\n";
else {
StringRef Suffix(Multilib.gccSuffix());
assert(Suffix.front() == '/');
llvm::outs() << Suffix.substr(1) << "\n";
}
return false;
}

9
lib/Driver/ToolChains/Linux.cpp
View File

@ -210,6 +210,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
: Generic_ELF(D, Triple, Args) {
GCCInstallation.init(Triple, Args);
Multilibs = GCCInstallation.getMultilibs();
SelectedMultilib = GCCInstallation.getMultilib();
llvm::Triple::ArchType Arch = Triple.getArch();
std::string SysRoot = computeSysRoot();
@ -299,16 +300,14 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
if (GCCInstallation.isValid()) {
const llvm::Triple &GCCTriple = GCCInstallation.getTriple();
const std::string &LibPath = GCCInstallation.getParentLibPath();
const Multilib &Multilib = GCCInstallation.getMultilib();
const MultilibSet &Multilibs = GCCInstallation.getMultilibs();
// Add toolchain / multilib specific file paths.
addMultilibsFilePaths(D, Multilibs, Multilib,
addMultilibsFilePaths(D, Multilibs, SelectedMultilib,
GCCInstallation.getInstallPath(), Paths);
// Sourcery CodeBench MIPS toolchain holds some libraries under
// a biarch-like suffix of the GCC installation.
addPathIfExists(D, GCCInstallation.getInstallPath() + Multilib.gccSuffix(),
addPathIfExists(D, GCCInstallation.getInstallPath() + SelectedMultilib.gccSuffix(),
Paths);
// GCC cross compiling toolchains will install target libraries which ship
@ -330,7 +329,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
// Note that this matches the GCC behavior. See the below comment for where
// Clang diverges from GCC's behavior.
addPathIfExists(D, LibPath + "/../" + GCCTriple.str() + "/lib/../" +
OSLibDir + Multilib.osSuffix(),
OSLibDir + SelectedMultilib.osSuffix(),
Paths);
// If the GCC installation we found is inside of the sysroot, we want to

30
test/Driver/print-multi-directory.c Normal file
View File

@ -0,0 +1,30 @@
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: -target i386-none-linux \
// RUN: -B%S/Inputs/multilib_64bit_linux_tree/usr \
// RUN: -print-multi-directory \
// RUN: | FileCheck --check-prefix=CHECK-X86-MULTILIBS %s
// CHECK-X86-MULTILIBS: 32
// CHECK-X86-MULTILIBS-NOT: x32
// CHECK-X86-MULTILIBS-NOT: .
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: -target i386-none-linux -m64 \
// RUN: -B%S/Inputs/multilib_64bit_linux_tree/usr \
// RUN: -print-multi-directory \
// RUN: | FileCheck --check-prefix=CHECK-X86_64-MULTILIBS %s
// CHECK-X86_64-MULTILIBS: .
// CHECK-X86_64-MULTILIBS-NOT: x32
// CHECK-X86_64-MULTILIBS-NOT: 32
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
// RUN: -target arm-linux-androideabi21 \
// RUN: -mthumb \
// RUN: -B%S/Inputs/basic_android_ndk_tree \
// RUN: --sysroot=%S/Inputs/basic_android_ndk_tree/sysroot \
// RUN: -print-multi-directory \
// RUN: | FileCheck --check-prefix=CHECK-ARM-MULTILIBS %s
// CHECK-ARM-MULTILIBS: thumb
// CHECK-ARM-MULTILIBS-NOT: .