This is an archive of the discontinued LLVM Phabricator instance.

Differential D74776

[Hexagon] clang driver should consider --sysroot option when looking for includes
ClosedPublic

Authored by sidneym on Feb 18 2020, 9:41 AM.

Details

Reviewers
kparzysz
bcain
Commits
rGfaa889b23587: [Hexagon] clang driver should consider --sysroot option
Summary

Consider --sysroot when building the system c include paths.

Diff Detail

Event Timeline

sidneym created this revision.Feb 18 2020, 9:41 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 18 2020, 9:41 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
bcain accepted this revision.Feb 18 2020, 10:10 AM

LGTM

This revision is now accepted and ready to land.Feb 18 2020, 10:10 AM
Herald added a subscriber: ormris. · View Herald TranscriptFeb 18 2020, 10:10 AM
Closed by commit rGfaa889b23587: [Hexagon] clang driver should consider --sysroot option (authored by sidneym). · Explain WhyFeb 18 2020, 12:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
7 lines
test/
Driver/
11 lines

Diff 245237

clang/lib/Driver/ToolChains/Hexagon.cpp

Show First 20 Lines • Show All 534 Lines • ▼ Show 20 Lines
void HexagonToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, void HexagonToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
ArgStringList &CC1Args) const { ArgStringList &CC1Args) const {
if (DriverArgs.hasArg(options::OPT_nostdinc) || if (DriverArgs.hasArg(options::OPT_nostdinc) ||
DriverArgs.hasArg(options::OPT_nostdlibinc)) DriverArgs.hasArg(options::OPT_nostdlibinc))
return; return;
const Driver &D = getDriver(); const Driver &D = getDriver();
if (!D.SysRoot.empty()) {
SmallString<128> P(D.SysRoot);
llvm::sys::path::append(P, "include");
addExternCSystemInclude(DriverArgs, CC1Args, P.str());
return;
}
std::string TargetDir = getHexagonTargetDir(D.getInstalledDir(), std::string TargetDir = getHexagonTargetDir(D.getInstalledDir(),
D.PrefixDirs); D.PrefixDirs);
addExternCSystemInclude(DriverArgs, CC1Args, TargetDir + "/hexagon/include"); addExternCSystemInclude(DriverArgs, CC1Args, TargetDir + "/hexagon/include");
} }
void HexagonToolChain::addLibStdCxxIncludePaths( void HexagonToolChain::addLibStdCxxIncludePaths(
const llvm::opt::ArgList &DriverArgs, const llvm::opt::ArgList &DriverArgs,
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines

clang/test/Driver/hexagon-toolchain-elf.c

Show First 20 Lines • Show All 571 Lines • ▼ Show 20 Lines
// RUN: %clang -### -target hexagon-unknown-elf \ // RUN: %clang -### -target hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \ // RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \ // RUN: -mcpu=hexagonv60 \
// RUN: -fuse-ld=lld \ // RUN: -fuse-ld=lld \
// RUN: %s 2>&1 \ // RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK082 %s // RUN: | FileCheck -check-prefix=CHECK082 %s
// CHECK082-NOT: -march= // CHECK082-NOT: -march=
// CHECK082-NOT: -mcpu= // CHECK082-NOT: -mcpu=
// -----------------------------------------------------------------------------
// Passing --sysroot
// -----------------------------------------------------------------------------
// RUN: %clang -### -target hexagon-unknown-elf \
// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
// RUN: -mcpu=hexagonv60 \
// RUN: --sysroot=/hexagon \
// RUN: %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHECK083 %s
// CHECK083: "-isysroot" "/hexagon"
// CHECK083: "-internal-externc-isystem" "/hexagon/include"