This is an archive of the discontinued LLVM Phabricator instance.

Differential D120251

[clang][driver][wasm] Fix libstdc++ target-dependent include dir
ClosedPublic

Authored by tbaeder on Feb 21 2022, 7:04 AM.

Details

Reviewers
sbc100
Commits
rG2f300d34decb: [clang][driver][wasm] Fix libstdc++ target-dependent include dir
Summary

As an alternative to https://reviews.llvm.org/D119056 that addresses the issues raised with that patch and fixes the test case to succeed.

I think this does what Jonathan explained in https://reviews.llvm.org/D119056#3313911

Diff Detail

Event Timeline

tbaeder created this revision.Feb 21 2022, 7:04 AM
Herald added subscribers: sunfish, jgravelle-google, dschuff. · View Herald TranscriptFeb 21 2022, 7:04 AM
tbaeder requested review of this revision.Feb 21 2022, 7:04 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 21 2022, 7:04 AM
Herald added subscribers: cfe-commits, aheejin. · View Herald Transcript
Harbormaster completed remote builds in B150690: Diff 410295.Feb 21 2022, 8:00 AM
sbc100 accepted this revision.Feb 21 2022, 3:31 PM
This revision is now accepted and ready to land.Feb 21 2022, 3:31 PM
tbaeder added a comment.Feb 22 2022, 12:06 AM

@sbc100 Do you think we should add /backward as well? Gnu.cpp does that it seems: https://github.com/llvm/llvm-project/blob/main/clang/lib/Driver/ToolChains/Gnu.cpp#L2959-L2960

sbc100 added a comment.Feb 22 2022, 7:45 AM
In D120251#3336981, @tbaeder wrote:

@sbc100 Do you think we should add /backward as well? Gnu.cpp does that it seems: https://github.com/llvm/llvm-project/blob/main/clang/lib/Driver/ToolChains/Gnu.cpp#L2959-L2960

I don't see why not.

tbaeder updated this revision to Diff 410544.Feb 22 2022, 8:27 AM
Herald added a subscriber: ormris. · View Herald TranscriptFeb 22 2022, 8:27 AM
Harbormaster completed remote builds in B150870: Diff 410544.Feb 22 2022, 9:23 AM
This revision was landed with ongoing or failed builds.Feb 23 2022, 5:43 AM
Closed by commit rG2f300d34decb: [clang][driver][wasm] Fix libstdc++ target-dependent include dir (authored by tbaeder). · Explain Why
This revision was automatically updated to reflect the committed changes.
tbaeder added a commit: rG2f300d34decb: [clang][driver][wasm] Fix libstdc++ target-dependent include dir.
tbaeder mentioned this in D119056: add sysroot/include/c++/version/${TARGET} to wasm32-wasi.Feb 23 2022, 5:45 AM

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
4 lines
test/
Driver/
3 lines

Diff 410544

clang/lib/Driver/ToolChains/WebAssembly.cpp

Show First 20 Lines • Show All 522 Lines • ▼ Show 20 Lines if (MaxVersion.Major > 0)
Version = MaxVersion.Text; Version = MaxVersion.Text;
} }
if (Version.empty()) if (Version.empty())
return; return;
// First add the per-target include path if the OS is known. // First add the per-target include path if the OS is known.
if (IsKnownOs) { if (IsKnownOs) {
std::string TargetDir = LibPath + "/" + MultiarchTriple + "/c++/" + Version; std::string TargetDir = LibPath + "/c++/" + Version + "/" + MultiarchTriple;
addSystemInclude(DriverArgs, CC1Args, TargetDir); addSystemInclude(DriverArgs, CC1Args, TargetDir);
} }
// Second add the generic one. // Second add the generic one.
addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version); addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version);
// Third the backward one.
addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward");
Lint: Pre-merge checks
Inline Actions

clang-format: please reformat the code

-  addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward");
+  addSystemInclude(DriverArgs, CC1Args,
+                   LibPath + "/c++/" + Version + "/backward");
Lint: Pre-merge checks: clang-format: please reformat the code ``` - addSystemInclude(DriverArgs, CC1Args, LibPath +…
} }

clang/test/Driver/wasm-toolchain.cpp

Show First 20 Lines • Show All 74 Lines • ▼ Show 20 Lines
// COMPILE: "-internal-isystem" "[[SYSROOT:[^"]+]]/include" // COMPILE: "-internal-isystem" "[[SYSROOT:[^"]+]]/include"
// RUN: %clangxx -### -no-canonical-prefixes -target wasm32-wasi --stdlib=libstdc++ %s 2>&1 \ // RUN: %clangxx -### -no-canonical-prefixes -target wasm32-wasi --stdlib=libstdc++ %s 2>&1 \
// RUN: --sysroot=%S/Inputs/basic_linux_libstdcxx_libcxxv2_tree/usr \ // RUN: --sysroot=%S/Inputs/basic_linux_libstdcxx_libcxxv2_tree/usr \
// RUN: | FileCheck -check-prefix=COMPILE_STDCXX %s // RUN: | FileCheck -check-prefix=COMPILE_STDCXX %s
// COMPILE_STDCXX: clang{{.*}}" "-cc1" // COMPILE_STDCXX: clang{{.*}}" "-cc1"
// COMPILE_STDCXX: "-resource-dir" "[[RESOURCE_DIR:[^"]*]]" // COMPILE_STDCXX: "-resource-dir" "[[RESOURCE_DIR:[^"]*]]"
// COMPILE_STDCXX: "-isysroot" "[[SYSROOT:[^"]+]]" // COMPILE_STDCXX: "-isysroot" "[[SYSROOT:[^"]+]]"
// COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-wasi/c++/4.8" // COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/4.8/wasm32-wasi"
// COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/4.8" // COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/4.8"
// COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/4.8/backward"
// COMPILE_STDCXX: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include" // COMPILE_STDCXX: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|\\\\)}}include"
// COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-wasi" // COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-wasi"
// COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include" // COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include"