Squashed 'third_party/rules_rust/' changes from 078c6908f..bf9ddeb7c
bf9ddeb7c Release 0.25.1 (#2049)
db5b2fd65 Update tinyjson (#2050)
6a7872ae3 Fix prost proto packages not sanitizing to valid module names (#2044)
c080d7bfa Moved legacy protobuf rules to `proto/protobuf` (#2043)
1281cc051 Remove debug code. (#2048)
cd126be1f Fix build failure finding crate_roots when mixed with generated sources (#2041)
7f751cddd Consolidate rust_prost_library and fix extension-only proto generation. (#2047)
6118c81f2 Release 0.25.0 (#2042)
a6f29fd07 Add Prost and Tonic rules. (#2033)
9442aed8c fix: `crate_type` more accurately corresponds to CC linking actions (#1975)
4f4e2b17b Re-enable zig example on CI (#2030)
2ded0c2f5 Fix flaky coverage test in CI (#2028)
36f8251f9 Exclude .tmp_git_root from globs (#1948)
ca750fa83 Eliminate Rustfmt action in Bindgen rules. Bindgen can run rustfmt (#2025)
c55ec0cfb Allow sysroots from cc_toolchains to be added to bindgen actions (#2024)
9314b1b0c Release 0.24.1 (#2023)
92ea74ade Making rust_std attr in rust_toolchain mandatory (#1984)
a54b8e14b Update `rust_library_group` to use `DepVariantInfo` (#2022)
47644346b Release v0.24.0 (#2020)
a6b0a7f39 Rust library group (#1848)
bc43f4841 Fix crate_universe's `all_crate_deps` and `aliases` functions failing in case the crate's Cargo.toml has condtional dependencies (#2018)
8f27ec7c5 fix: load cargo manifest without resolving abs path of deps (#2017)
23f99bb63 feature: `target_compatible_with` added to `CommonAttrs` (#1976)
11f8c9875 Make `rust_doc_test` inherit it's crate aliases attribute (#2007)
8e848414d Regenerated crate_universe outputs for all packages (#2011)
1b6365131 Don't use startup:windows (#2012)
e80582e75 Fix thumbv* platform resolution (#2010)
367f90ef0 Update bindgen version to 0.65.1 (#2008)
e6ed5bf90 Release 0.23.0 (#2003)
93b230bb8 Fix code coverage collection. (#2001)
0a14bfbb0 Minor CI and test cleanup (#2004)
3e2ee941a Update bindgen rules to build clang from source. (#1998)
5a1a7577d Split up cargo_build_script tests (#2002)
eb6413e83 Update various bash scripts to pipe errors to stderr (#1999)
affe947ac Update stardoc version (#1997)
7073146f8 Add support for armv8-m (#1993)
73a06f130 Added Rust 1.70.0 (#1991)
23c20a93f Fixes crates_vendor workspace name detection when using bzlmod (#1990)
f5813fa08 Set windows flags in platform-specific bazelrc (#1988)
c1632b5b5 Fix up anchor link (#1987)
56e760487 Fix typo in crate_universe-generated defs.bzl comment (#1981)
94cbe4c2c Symlink in the exec-root so that relative paths will work, unchanged. (#1781)
af8ef62eb Release 0.22.0 (#1974)
4aaa6de30 Allow specifying exec and target compatibility constraints (#1971)
f1b19c394 Update rules_apple in tests (#1972)
937e63399 Add T2 support for x86_64-unknown-none (#1967)
66b1bf165 fix: lld-link (MSVC) fix flags including `-l` prefix (#1958)
285dcbbb9 feature: expose `extra_rustc_flags` and `extra_exec_rustc_flags` at `rust_register_toolchains` (#1959)
0f25cb462 Removed `rust_toolchain.os` in favor of `rust_toolchain.exec_triple`. (#1960)
a2a1109dc Add T2 support for thumbv7em-none-eabi (#1957)
80f0eb488 Support for `no_std` mode (#1934)
99aaf0830 Rename crates_vendor_manifests to cvm to shorten windows path lengths (#1944)
0a57da049 Added tests for build script dependencies to crate_universe (#1943)
caffb0a08 Release 0.21.1 (#1936)
c869a17c7 Fix regression in building zlib (#1935)
24b9dea4f Release 0.21.0 (#1933)
7677c617e Add support for rustc flags to `rust_proto_library` (#1932)
fa304ae48 Updated zlib BUILD file to support darwin-arm64 (#1931)
a86313282 Added Rust 1.69.0 (#1930)
f0e12c707 Make BuildInfo provider public (#1920)
c6ad23aba Respect `#[global_allocator]` in `cc_common.link` builds (#1926)
d78752504 Exclude target directory from release tars (#1922)
0339cd18a [wasm-bindgen] Update to v0.2.84 (#1919)
07af5678e Handle corner case for windows architecture detection (#1915)
c56e7660d Fix optional deps by platform (#1911)
4663ff6a3 cc_common_link: also respect --custom_malloc if set (#1912)
dab425760 Add Rust 1.68.2 (#1908)
e4bd39f95 Add empty rustfmt.toml (#1907)
eaf513865 Support bzlmod (#1528)
1074ecbab Release v0.20.0 (#1900)
44aec0a79 ci: fix test config in cc_common_link_ubuntu2004 (#1904)
6571cde64 Adds per_crate_rustc_flag build setting. (#1827)
7a47449df Added Rust 1.68.1 (#1898)
e3bcdbad1 Fixed rustdoc warnings in crate_universe (#1897)
529f45900 Added `rustdoc_flags` attribute to rust_doc rule (#1867)
9e3499405 Have rustdoc return its output directory instead of zip default. (#1868)
9d6741f40 Implement support for optional crates enabled with dep: features (#1885)
fd10963ea Skip adding -lstatic to libtest and libstd on Darwin (#1620)
b3314b45e Release 0.19.1 (#1895)
c1a9fd86f Accumulate all features from cargo tree output (#1884)
206f71c95 Disable zig example (#1893)
1a5d07cd2 Add runfiles support to rust_stdlib_filegroup (#1890)
6996cd550 Deleted unused targets and cleanup docs (#1889)
a85e24e20 Fix triple constraints for iOS and watchOS (#1888)
e13fd3bad Release rules_rust and cargo-bazel (#1882)
9e9853d63 Add support for thumbv7em with hard float (#1871)
b3cd5962e Added Rust 1.68.0 (#1866)
f1b7aedf5 Support sparse indexes (#1857)
7f2dd433a Make fetch_shas work with mktemp from coreutils 8.32 (#1870)
a9cc01230 Update crate_universe dependencies (#1872)
c038e94ae Pipe stderr from cargo tree processes (#1879)
222d60322 Parallelize cargo tree calls (#1874)
cdbbf7131 Add Fuchsia platform support (#1833)
17e5b04c2 Use `_make_link_flags_darwin` when target os is `ios`. (#1843)
d9ecc8df4 crate_universe: Support fetching crates with git branch, tag or rev (#1846)
1c694cd60 Forward `toolchains` to `cargo_build_script` targets (#1862)
9affcbfa7 Skip detecting abi for empty values (#1830)
6193fe823 Re-enable crate_universe MacOS tests (#1861)
c25db95ae Updated Rust to 1.67.1 (#1864)
7b8fd06be Support `[patch]` in crate_universe when using multiple `Cargo.toml`s (#1856)
c645fe399 Silence windows build failure (#1863)
75bba7b50 Make rust_clippy providers match rustfmt_test (#1806)
f09d72755 Fix test assertion for arm64 macs (#1845)
f4113bfe1 Fix tests for new Apple toolchain (#1844)
20ce44e30 fix: use target_triple struct instead of string (#1835)
bdbded181 Fix code example in doc (#1838)
4f4014052 Fix typo: plced -> placed (#1834)
baeb0664d Remove ios/android/wasm support for gen_rust_project deps (#1684)
02557a47a Add `render_config` attribute to `crates_vendor`. (#1832)
4357fb154 Updated rules_rust to version 0.18.0 (#1829)
9adfdca9b Various cleanups (#1828)
4fa412385 Added update known shas to include T1-T2 triples (#1824)
905731ad9 Instructions on how to perform `rustfmt` check (#1822) (#1823)
108b1a187 Encapsulate running cargo into a struct (#1815)
57a099b63 Fixes resolver issue with root packages and another dependency format (#1819)
78ca9ba0a Use env method recently added to cargo_metadata (#1813)
92834930f Updated `rust_toolchain.target_json` to take encoded json strings (#1810)
84f1d0657 support `resolver = "2"` target-specific features (#1710)
a5853fd37 Use correct dynamic link args fro proc-macro crates (#1803)
b656e2553 Added tests for the `triple` constructor (#1811)
ea4a79ad9 Disable job in CI to avoid infrastructure failure. (#1816)
2fc02f030 Delete `rust_toolchain.rusrc_srcs` (#1807)
804d5fc1f Convert `rust_toolchain` attrs `exec_triple` and `target_triple` to structs (#1808)
499a2ca38 Updated platform triple values from strings to structs ("triple") (#1804)
aae1dbdcb Unify functions for computing constraint values for platform triple abi (#1805)
0d6d2b1eb Updated rules_rust version to `0.17.0` (#1800)
88e83f2df Added Rust 1.67.0 (#1799)
6922b5012 rustdoc_test: fix and test OUT_DIR (#1779)
ad01d1b0e [crate_universe] add an annotation to disable pipelining (#1733)
f651cd18f Add `CARGO_BAZEL_REPIN_ONLY` repinning allowlist (#1798)
d7f0debb0 Revert "Disable broken clang and ldd CI jobs (#1785)" (#1796)
96f82aaad Fix `cc_common.link` file output name (#1795)
5079b64d5 Fix use of `rustfmt_toolchain` when `rustc` is not provided (#1794)
23c650f35 Have `--experimental_use_cc_common_link` cover `rust_shared_library` (#1792)
ba0fb5956 Added support for `--nolegacy_external_runfiles` to `rust_doc_test` (#1790)
112242bb7 Prevent crates_vendor from restarting bazel. (#1791)
52231ef9f Added compatibility flags to `.bazelrc` to prevent regressions (#1789)
91cd399a0 Add "crate-name={}" tag to Crate Universe targets (#1787)
1b1dae196 Added Rust 1.66.1 (#1767)
fe17e8b8e Add file:// prefix to env var in docs (#1788)
0fe742bff Updated `rust_bindgen` to use `rustfmt_toolchain` (#1770)
042fd6c1c Update docs on setting Rust versions (#1786)
dddd8a0d4 Updated crate_universe dependencies (#1775)
a1330a71f Download `rustc` in `rustfmt_toolchain_repository` (#1769)
e96aad9aa Updated the ios_build example to use `crates_vendor` (#1778)
e315007df Disable broken clang and ldd CI jobs (#1785)
4e89d52a9 rustdoc_test: substitute the root of the current crate (#1777)
a52041fb5 Support `target_settings` in `rust_repository_set` and `rust_toolchain_repository` (#1758)
49906eb29 Update clippy and rustfmt aspects to require CrateInfo providers (#1772)
85564208e Updated rules_rust version to `0.16.1` (#1761)
614499a5b Fixed inability to deserialize crate_universe lockfiles (#1760)
9803d3034 Fix data and compile_data for rust_doc (#1741)
927a364cb Update Release github pipeline to trigger automatically (#1757)
7d03e05f8 Fix release pipeline (#1756)
cf7ca5dfd Updated rules_rust to version `0.16.0` (#1750)
203fe4b9a Remove unnecessary binary file (#1755)
941c7cca9 Don't propagate `compatible_with` to the underlying `cargo_build_script` `rust_binary` target (#1754)
a31490d9a Make loads from @rules_rust//rust:defs.bzl come out on one line (#1753)
7ebad4d50 Generate only the needed subset of binaries for bindgen and proto (#1751)
4ef3d4aaa Repin examples/crate_universe_unnamed (#1752)
d6e300359 Regenerate BUILD files using serde_starlark renderer (#1746)
e7c8a97d1 Convert BUILD.$name-$version.bazel to serde_starlark (#1743)
c09818d3b Exclude generated files from language stats and collapse in code review (#1747)
26a24f030 Added CI for single toolchain channel workspaces (#1712)
caed7d814 Report context on error failing to get version (#1744)
36b57af7b Add gen_binaries annotation to control which bins to make target for (#1718)
d916a6f52 crate_universe re-pinning now defaults to "workspace" (#1723)
f34661ee1 Propagate `compatible_with` attribute to the underlying `_build_script_run` target (#1745)
92977d1bf Re-pinned all dependencies managed by crate_universe (#1735)
d5289ad1c Added `rustfmt_toolchain` and refactored toolchain repository rules (#1719)
532e60ff0 Collect targets in a deterministic order (#1736)
52e02c25b Eliminate all use of hash-based collections from crate_universe (#1737)
31073ff8e Replace tera template with serde_starlark (#1734)
d4e5586d0 Support the RUNFILES_DIR environment variable. (#1732)
1357b85b1 Addressed clippy warnings from `clippy 0.1.67 (ec56537c 2022-12-15)` (#1717)
8bc9f788d Support dsym_folder output group in tests (#1703)
90c5b6eb7 Added CI for minimum supported Rust version (#1720)
be82ff8bd Match prerelease versions with annotation wildcard (#1716)
36c7f285b Arm Thumb Embedded Targets. (#1721)
5ef52e465 Update current_toolchain_files tests to use a dedicated test rule (#1714)
c75ea6f9e Add `Runfiles::current_repository` to runfiles library (#1713)
2f0511782 Updated rules_rust to version `0.15.0` (#1706)
019f87178 Added Rust 1.66.0 (#1705)
1469cd7cb Fix labels to work with canonical label literals. (#1700)
5826a500a Add riscv32imc and riscv64gc to the known sha targets (#1698)
40dee95ce Fixed typos: normla -> normal (#1699)
8f08e77ac load_arbitrary_tool uses tool_suburl to look up sha256 (#1695)
8faec3060 Fix typos in crate_universe rendered comments (#1691)
bd64711ff Silence flaky test (#1693)
46b7ea5af Added a build setting for toolchain channels (#1671)
70b272aad Updated rules_rust to version `0.14.0` (#1669)
91e597dd1 Updated all crates_vendor outputs (#1687)
9a047b0b9 Updated crate_universe dependencies (#1686)
3a91d2f5b Add RV64GC target (#1683)
d9e752ab4 Add per-toolchain `rustc_flags` (#1635)
56237415e stardoc: Use backtick not `<code>` for attr default values (#1682)
d4b31a494 Allow passing a bazel path to vendor explicitly (#1661)
d51bf9ce0 Updated crate_universe to work with `--nolegacy_external_runfiles` (#1680)
7f40636d1 crate_universe/private/crates_vendor.bzl typo fix (#1678)
025bf7db8 Merge cc toolchain flags into build script env (#1675)
b7c36c051 Fix confusing/misleading crate_universe docs (#1677)
29233e354 Revert #1564 (#1663)
ed32b6de2 Common glob excludes (#1673)
61b99cdd1 fix: add space to crate data exclude list (#1665)
8bb25b8b7 Support Windows ARM64 (aarch64-pc-windows-msvc) (#1664)
ddf2a4c23 Re-render crate BUILD files after #1647 (#1655)
44c7e1588 Group deps and aliases by platform triple rather than by cfg string when generating BUILD files. This avoid bazel errors due to duplicate keys/deps. (#1647)
de18d8bb6 Allow `buildifier` attribute to be a file (#1660)
aa0815dc9 Fix naming of ambiguous libs (#1625)
ff314d4ab Also pass -c opt to tests in opt mode CI (#1626)
ff4e90515 Reenable windows job (#1658)
c45b8e91f Updated rules_rust to version `0.13.0` (#1644)
87d6b6c37 Update `//util/label` to support `+` in packages (#1654)
ab6959db5 fix: Fix issue with wasi-0.11.0+wasi-snapshot-preview1 (#1632)
28c090ed0 Replaced custom platform constraint values with aliases to `@platforms` (#1652)
dfbea4f52 Deprecated `rust_toolchain.rustc_srcs` (#1653)
fd1db4391 Remove deprecated attributes from rust_toolchain and cargo_bootstrap (#1651)
c8ab970c4 Generated rust-project.json files now include sysroot paths (#1641)
0a3e04cf9 Fix vendoring when not in a package (#1646)
aece1e37d Deduplicate expand_location targets in rust-project.json crate creation to avoid a bazel crash (#1639)
03a0b2483 [docs] Fixing typos in CargoConfig doc strings (#1638)
bd4fd2ac5 Upgraded cfg-expr dependency to 0.12.0. (#1636)
330554a13 Disable failing job in CI (#1640)
849f106e6 Consider compilation mode when choosing `pic`/`nopic` object files to link (#1624)
53491d719 Updated rules_rust to version `0.12.0` (#1630)
8e8843724 Remove empty glob (#1628)
1f621a944 Added Rust 1.65.0 (#1627)
c6af4d025 Add `-c opt` mode to CI (#1621)
95320cc8b process_wrapper: print line on error to parse message as json (#1566)
81eaccf39 Fixed CI breakage (#1619)
478fc3a57 Fix ambiguous native dependencies in `proc_macro`s and `staticlib`s (#1611)
9e3d8415e Build deps of _build_script_run in 'exec' mode (#1561)
ea031082b Fixed outdated docs (#1614)
a8c540e49 Restore support for old cargo_build_script load statements (#1613)
295b5ccc7 Renamed `_build_script_run` rule to `cargo_build_script` (#1612)
3778069ec Remove references to Google mirror in docs (#1607)
aad54ba29 Updated crate_universe dependencies (#1606)
c349df2a6 Remove Google mirror from Starlark snippet in release notes (#1604)
0493b998d Avoid rendering a mock root package when possible (#1596)
b04aa053c process_wrapper: Apply substitutions to param files (#1565)
b209b3e15 Updated rules_rust to version `0.11.0`. (#1587)
b1079453b Typo correction on doc (#1593)
ca5678266 Updated crate_universe dependencies (#1591)
a364d448f Fixes crates_vendor labels in remote mode when used from the root workspace (#1575)
1cc37c268 Expose the output directory from cargo_build_script (#1588)
7ffe0a555 Ignore non-utf8 text in build script output (#1583)
c5b38fe00 Merge runfiles from transitive dependencies of rust_test crate attr (#1487)
da3d522d5 Fix build scripts targeting the wrong architecture (#1564)
d288ed634 Add `out_dir` support in `cargo_dep_env` (#1571)
78d6c1b46 fix: incorrect rustfmt edition query (#1582)
48927127e Set CARGO_MANIFEST_DIR at runtime for tests (#1559)
76bd69033 Add an output group for the .rmeta (#1585)
352bfeb05 Cleanup deprecated code (#1577)
86dc561f9 Move crate_root_src to utils (#1570)
beb554eb9 update to wasm-bindgen v0.2.83 (#1567)
73fd1616b Export AbsoluteLabel functionality (#1568)
c57e7a399 Remap $PWD to empty string instead of "." (#1563)
f0cdcedc2 Added Rust 1.64.0 (#1562)
1d326554a Update docs to show release policies and support (#1560)
78c793a0a Fix markdown typo in rust_analyzer.md (#1553)
c13980fb6 Add iOS examples (#1546)
8a5e07e9f Update apple_support (#1549)
6dacd9803 Strip leading '@'s for labels in the splicing manifest (#1547)
f73d1d6fb use crate_info.deps in establish_cc_info (#1543)
4845af6c0 Add android example (#1545)
9570b7aa7 Remove -lgcc from Android builds (#1541)
cb9ca1b81 Fix crate_universe/private/srcs.bzl to work with repo mappings (#1540)
d1fc9accc Minor cleanup of CI pipelines (#1534)
2bb077b3b Updated rules_rust to version 0.10.0 (#1533)
b8751b860 add cc config info to dummy wasm32 cc toolchain (#1532)
f5ed797ee Updates rust_test to use main.rs as the root when use_libtest_harness is false (#1518)
cfcaf21d5 Preserve directory structure of source files when some are generated (#1526)
51c065841 migrating to rbe_preconfig and remove bazel_toolchains (#1524)
055abd402 Fix typo in an example of crates_repository rule (#1520)
8bfed1cd2 Added Rust 1.63.0 (#1512)
3a69ce09b Update wasm_bindgen to 0.2.82 (#1513)
git-subtree-dir: third_party/rules_rust
git-subtree-split: bf9ddeb7c83a9fe8a7d87c76134cdd8e16131b62
Signed-off-by: Adam Snaider <adsnaider@gmail.com>
Change-Id: Id9490c68d6221da66953a915a25042ef8b848505
diff --git a/bindgen/3rdparty/patches/llvm-project.cxx17.patch b/bindgen/3rdparty/patches/llvm-project.cxx17.patch
new file mode 100644
index 0000000..fba5384
--- /dev/null
+++ b/bindgen/3rdparty/patches/llvm-project.cxx17.patch
@@ -0,0 +1,537 @@
+diff --git a/utils/bazel/configure.bzl b/utils/bazel/configure.bzl
+index 4c5ab8bd0972..44de2da1a136 100644
+--- a/utils/bazel/configure.bzl
++++ b/utils/bazel/configure.bzl
+@@ -70,6 +70,11 @@ def _overlay_directories(repository_ctx):
+ ))
+
+ def _llvm_configure_impl(repository_ctx):
++ # Force this repository rule to update if any of the overlay
++ # sources change.
++ for target in repository_ctx.attr._srcs:
++ repository_ctx.path(target)
++
+ _overlay_directories(repository_ctx)
+
+ # Create a starlark file with the requested LLVM targets.
+@@ -86,6 +91,16 @@ llvm_configure = repository_rule(
+ configure = True,
+ attrs = {
+ "targets": attr.string_list(default = DEFAULT_TARGETS),
++ "_srcs": attr.label_list(default = [
++ Label("//utils/bazel/llvm-project-overlay/clang:BUILD.bazel"),
++ Label("//utils/bazel/llvm-project-overlay/libunwind:BUILD.bazel"),
++ Label("//utils/bazel/llvm-project-overlay/llvm:binary_alias.bzl"),
++ Label("//utils/bazel/llvm-project-overlay/llvm:BUILD.bazel"),
++ Label("//utils/bazel/llvm-project-overlay/llvm:cc_plugin_library.bzl"),
++ Label("//utils/bazel/llvm-project-overlay/llvm:config.bzl"),
++ Label("//utils/bazel/llvm-project-overlay/llvm:tblgen.bzl"),
++ Label("//utils/bazel/llvm-project-overlay/llvm:template_rule.bzl"),
++ ]),
+ },
+ )
+
+diff --git a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
+index a2b1e0f33073..0c1abe607b58 100644
+--- a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
++++ b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
+@@ -5,6 +5,7 @@
+ load("//llvm:tblgen.bzl", "gentbl")
+ load("//llvm:binary_alias.bzl", "binary_alias")
+ load("//llvm:cc_plugin_library.bzl", "cc_plugin_library")
++load("//llvm:config.bzl", "llvm_stdcxx_copts")
+
+ package(
+ default_visibility = ["//visibility:public"],
+@@ -28,7 +29,7 @@ cc_binary(
+ ]),
+ copts = [
+ "$(STACK_FRAME_UNLIMITED)",
+- ],
++ ] + llvm_stdcxx_copts,
+ stamp = 0,
+ deps = [
+ "//llvm:Support",
+@@ -391,8 +392,8 @@ cc_library(
+ cc_library(
+ name = "basic",
+ srcs = [
+- "include/clang/Basic/Version.inc",
+ "include/VCSVersion.inc",
++ "include/clang/Basic/Version.inc",
+ ] + glob([
+ "lib/Basic/*.cpp",
+ "lib/Basic/*.c",
+@@ -406,7 +407,7 @@ cc_library(
+ copts = [
+ "-DHAVE_VCS_VERSION_INC",
+ "$(STACK_FRAME_UNLIMITED)",
+- ],
++ ] + llvm_stdcxx_copts,
+ includes = ["include"],
+ textual_hdrs = [
+ "include/clang/Basic/arm_fp16.inc",
+@@ -471,6 +472,7 @@ cc_library(
+ hdrs = glob([
+ "include/clang/Lex/*.h",
+ ]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":basic",
+@@ -711,7 +713,7 @@ cc_library(
+ # headers such as `CXXABI.h`.
+ "-I$(GENDIR)/external/llvm-project/clang/lib/AST",
+ "-I$(GENDIR)/external/llvm-project/clang/lib/AST/Interp",
+- ],
++ ] + llvm_stdcxx_copts,
+ textual_hdrs = [
+ "include/clang/AST/AttrImpl.inc",
+ "include/clang/AST/AttrNodeTraverse.inc",
+@@ -763,6 +765,7 @@ cc_library(
+ "include/clang/Index/*.h",
+ "include/clang-c/*.h",
+ ]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":ast",
+@@ -786,6 +789,7 @@ cc_library(
+ hdrs = glob([
+ "include/clang/Analysis/**/*.h",
+ ]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ textual_hdrs = glob([
+ "include/clang/Analysis/**/*.def",
+@@ -844,7 +848,7 @@ cc_library(
+ "include/clang/Sema/*.h",
+ "include/clang-c/*.h",
+ ]),
+- copts = ["$(STACK_FRAME_UNLIMITED)"],
++ copts = ["$(STACK_FRAME_UNLIMITED)"] + llvm_stdcxx_copts,
+ includes = ["include"],
+ textual_hdrs = [
+ "include/clang/Sema/AttrParsedAttrImpl.inc",
+@@ -911,6 +915,7 @@ cc_library(
+ "include/clang/Parse/AttrParserStringSwitches.inc",
+ "include/clang/Parse/AttrSubMatchRulesParserStringSwitches.inc",
+ ] + glob(["include/clang/Parse/*.h"]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":ast",
+@@ -932,6 +937,7 @@ cc_library(
+ "lib/ASTMatchers/*.h",
+ ]),
+ hdrs = glob(["include/clang/ASTMatchers/*.h"]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":ast",
+@@ -948,7 +954,7 @@ cc_library(
+ "lib/ASTMatchers/Dynamic/*.h",
+ ]),
+ hdrs = glob(["include/clang/ASTMatchers/Dynamic/*.h"]),
+- copts = ["$(STACK_FRAME_UNLIMITED)"],
++ copts = ["$(STACK_FRAME_UNLIMITED)"] + llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":ast",
+@@ -966,6 +972,7 @@ cc_library(
+ "lib/Rewrite/*.h",
+ ]),
+ hdrs = glob(["include/clang/Rewrite/Core/*.h"]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":ast",
+@@ -982,6 +989,7 @@ cc_library(
+ "lib/Testing/*.cpp",
+ ]),
+ hdrs = glob(["include/clang/Testing/*.h"]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":basic",
+@@ -996,6 +1004,7 @@ cc_library(
+ "lib/Tooling/Core/*.h",
+ ]),
+ hdrs = glob(["include/clang/Tooling/Core/*.h"]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":ast",
+@@ -1018,6 +1027,7 @@ cc_library(
+ hdrs = glob([
+ "include/clang/Tooling/*.h",
+ ]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":ast",
+@@ -1042,6 +1052,7 @@ cc_library(
+ hdrs = glob([
+ "include/clang/Tooling/Inclusions/**/*.h",
+ ]),
++ copts = llvm_stdcxx_copts,
+ deps = [
+ ":basic",
+ ":lex",
+@@ -1061,6 +1072,7 @@ cc_library(
+ "include/clang/Tooling/Refactoring/**/*.h",
+ "include/clang/Tooling/Refactoring/**/*.def",
+ ]),
++ copts = llvm_stdcxx_copts,
+ deps = [
+ ":ast",
+ ":ast_matchers",
+@@ -1094,6 +1106,7 @@ cc_library(
+ name = "tooling_syntax",
+ srcs = glob(["lib/Tooling/Syntax/**/*.cpp"]),
+ hdrs = glob(["include/clang/Tooling/Syntax/**/*.h"]),
++ copts = llvm_stdcxx_copts,
+ deps = [
+ ":ast",
+ ":basic",
+@@ -1108,6 +1121,7 @@ cc_library(
+ name = "tooling_dependency_scanning",
+ srcs = glob(["lib/Tooling/DependencyScanning/**/*.cpp"]),
+ hdrs = glob(["include/clang/Tooling/DependencyScanning/**/*.h"]),
++ copts = llvm_stdcxx_copts,
+ deps = [
+ ":basic",
+ ":codegen",
+@@ -1123,6 +1137,7 @@ cc_library(
+ name = "transformer",
+ srcs = glob(["lib/Tooling/Transformer/**/*.cpp"]),
+ hdrs = glob(["include/clang/Tooling/Transformer/**/*.h"]),
++ copts = llvm_stdcxx_copts,
+ deps = [
+ ":ast",
+ ":ast_matchers",
+@@ -1138,6 +1153,7 @@ cc_library(
+ name = "ast-diff",
+ srcs = glob(["lib/Tooling/ASTDiff/*.cpp"]),
+ hdrs = glob(["include/clang/Tooling/ASTDiff/*.h"]),
++ copts = llvm_stdcxx_copts,
+ deps = [
+ ":ast",
+ ":basic",
+@@ -1150,6 +1166,7 @@ cc_library(
+ name = "crosstu",
+ srcs = glob(["lib/CrossTU/*.cpp"]),
+ hdrs = glob(["include/clang/CrossTU/*.h"]),
++ copts = llvm_stdcxx_copts,
+ deps = [
+ ":ast",
+ ":basic",
+@@ -1174,6 +1191,7 @@ cc_library(
+ ] + glob([
+ "include/clang/Format/*.h",
+ ]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":basic",
+@@ -1188,6 +1206,7 @@ cc_library(
+ name = "edit",
+ srcs = glob(["lib/Edit/*.cpp"]),
+ hdrs = glob(["include/clang/Edit/*.h"]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":ast",
+@@ -1222,6 +1241,7 @@ cc_library(
+ hdrs = glob([
+ "include/clang/StaticAnalyzer/Core/**/*.h",
+ ]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ textual_hdrs = glob([
+ "include/clang/StaticAnalyzer/Core/**/*.def",
+@@ -1268,7 +1288,7 @@ cc_library(
+ ] + glob([
+ "include/clang/StaticAnalyzer/Checkers/**/*.h",
+ ]),
+- copts = ["$(STACK_FRAME_UNLIMITED)"],
++ copts = ["$(STACK_FRAME_UNLIMITED)"] + llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":analysis",
+@@ -1316,7 +1336,7 @@ cc_library(
+ hdrs = glob([
+ "include/clang/Driver/*.h",
+ ]),
+- copts = ["$(STACK_FRAME_UNLIMITED)"],
++ copts = ["$(STACK_FRAME_UNLIMITED)"] + llvm_stdcxx_copts,
+ includes = [
+ "include",
+ # TODO: This is likely a layering issue, but files in Arch are currently
+@@ -1479,7 +1499,7 @@ cc_library(
+ hdrs = glob([
+ "include/clang/Frontend/*.h",
+ ]),
+- copts = ["$(STACK_FRAME_UNLIMITED)"],
++ copts = ["$(STACK_FRAME_UNLIMITED)"] + llvm_stdcxx_copts,
+ data = [":builtin_headers_gen"],
+ includes = ["include"],
+ textual_hdrs = glob([
+@@ -1519,6 +1539,7 @@ cc_library(
+ "lib/Frontend/Rewrite/*.h",
+ ]),
+ hdrs = glob(["include/clang/Rewrite/Frontend/*.h"]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":ast",
+@@ -1541,6 +1562,7 @@ cc_library(
+ "lib/Interpreter/*.h",
+ ]),
+ hdrs = glob(["include/clang/Interpreter/*.h"]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":analysis",
+@@ -1573,7 +1595,7 @@ cc_library(
+ "lib/CodeGen/*.h",
+ ]),
+ hdrs = glob(["include/clang/CodeGen/*.h"]),
+- copts = ["$(STACK_FRAME_UNLIMITED)"],
++ copts = ["$(STACK_FRAME_UNLIMITED)"] + llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":analysis",
+@@ -1624,6 +1646,7 @@ cc_library(
+ "lib/StaticAnalyzer/Frontend/**/*.h",
+ ]),
+ hdrs = glob(["include/clang/StaticAnalyzer/Frontend/**/*.h"]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":analysis",
+@@ -1678,6 +1701,7 @@ cc_library(
+ hdrs = glob([
+ "include/clang/Serialization/*.h",
+ ]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ textual_hdrs = glob([
+ "include/clang/Serialization/*.def",
+@@ -1705,6 +1729,7 @@ cc_library(
+ "lib/FrontendTool/*.h",
+ ]),
+ hdrs = glob(["include/clang/FrontendTool/*.h"]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":arc_migrate",
+@@ -1726,6 +1751,7 @@ cc_library(
+ "lib/ARCMigrate/*.h",
+ ]),
+ hdrs = glob(["include/clang/ARCMigrate/*.h"]),
++ copts = llvm_stdcxx_copts,
+ includes = ["include"],
+ deps = [
+ ":analysis",
+@@ -1752,6 +1778,7 @@ cc_library(
+ "tools/libclang/*.h",
+ ]),
+ hdrs = glob(["include/clang-c/*.h"]),
++ copts = llvm_stdcxx_copts,
+ defines = ["CINDEX_NO_EXPORTS"],
+ deps = [
+ ":arc_migrate",
+@@ -1783,7 +1810,7 @@ cc_plugin_library(
+ copts = select({
+ "@bazel_tools//src/conditions:windows": ["-D_CINDEX_LIB_"],
+ "//conditions:default": [],
+- }),
++ }) + llvm_stdcxx_copts,
+ strip_include_prefix = "include",
+ deps = [
+ ":arc_migrate",
+@@ -1912,7 +1939,7 @@ cc_library(
+ # Disable stack frame size checks in the driver because
+ # clang::ensureStackAddressSpace allocates a large array on the stack.
+ "$(STACK_FRAME_UNLIMITED)",
+- ],
++ ] + llvm_stdcxx_copts,
+ deps = [
+ ":analysis",
+ ":ast",
+@@ -1947,6 +1974,7 @@ cc_library(
+ cc_binary(
+ name = "clang",
+ srcs = [],
++ copts = llvm_stdcxx_copts,
+ stamp = 0,
+ deps = [
+ ":clang-driver",
+diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
+index 85d79a29b571..716d7f5d9645 100644
+--- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
++++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
+@@ -4,7 +4,7 @@
+
+ load(":template_rule.bzl", "template_rule")
+ load(":tblgen.bzl", "gentbl")
+-load(":config.bzl", "llvm_config_defines")
++load(":config.bzl", "llvm_config_defines", "llvm_stdcxx_copts")
+ load(":targets.bzl", "llvm_targets")
+ load(":enum_targets_gen.bzl", "enum_targets_gen")
+ load(":binary_alias.bzl", "binary_alias")
+@@ -21,10 +21,12 @@ exports_files(["LICENSE.TXT"])
+ # toolchain or the `.bazelrc` file. This is just a workaround until we have a
+ # widely available feature to enable unlimited stack frame instead of using
+ # this `Make` variable.
+-llvm_copts = [
++llvm_c_only_opts = [
+ "$(STACK_FRAME_UNLIMITED)",
+ ]
+
++llvm_copts = llvm_c_only_opts + llvm_stdcxx_copts
++
+ enum_targets_gen(
+ name = "targets_def_gen",
+ src = "include/llvm/Config/Targets.def.in",
+@@ -167,10 +169,69 @@ genrule(
+ "echo -e '#undef HANDLE_EXTENSION' >> $@\n",
+ )
+
++# TODO: This separation is required to separate out C++ and C opts
++# https://github.com/bazelbuild/bazel/issues/16551
+ cc_library(
+- name = "Support",
++ name = "Support-c",
+ srcs = glob([
+ "lib/Support/*.c",
++ ]),
++ hdrs = glob([
++ "include/llvm/Support/**/*.h",
++ "include/llvm/ADT/*.h",
++ ]) + [
++ "include/llvm-c/Core.h",
++ "include/llvm-c/DataTypes.h",
++ "include/llvm-c/Deprecated.h",
++ "include/llvm-c/DisassemblerTypes.h",
++ "include/llvm-c/Error.h",
++ "include/llvm-c/ErrorHandling.h",
++ "include/llvm-c/ExternC.h",
++ "include/llvm-c/Support.h",
++ "include/llvm-c/Types.h",
++ "include/llvm/ExecutionEngine/JITSymbol.h",
++ "include/llvm/Support/Extension.def",
++ "include/llvm/Support/VCSRevision.h",
++ ],
++ copts = llvm_c_only_opts,
++ includes = ["include"],
++ linkopts = select({
++ "@bazel_tools//src/conditions:windows": [],
++ "@bazel_tools//src/conditions:freebsd": [
++ "-pthread",
++ "-lexecinfo",
++ "-ldl",
++ "-lm",
++ ],
++ "//conditions:default": [
++ "-pthread",
++ "-ldl",
++ "-lm",
++ ],
++ }),
++ textual_hdrs = glob([
++ "include/llvm/Support/*.def",
++ "lib/Support/*.h",
++ "lib/Support/*.inc",
++ ]),
++ deps = [
++ ":config",
++ ":Demangle",
++ # We unconditionally depend on the custom LLVM terminfo wrapper. This
++ # will be an empty library unless terminfo is enabled, in which case it
++ # will both provide the necessary dependencies and configuration
++ # defines.
++ "@llvm_terminfo//:terminfo",
++ # We unconditionally depend on the custom LLVM zlib wrapper. This will
++ # be an empty library unless zlib is enabled, in which case it will
++ # both provide the necessary dependencies and configuration defines.
++ "@llvm_zlib//:zlib",
++ ],
++)
++
++cc_library(
++ name = "Support",
++ srcs = glob([
+ "lib/Support/*.cpp",
+ "lib/Support/*.h",
+ "lib/Support/*.inc",
+@@ -223,6 +284,7 @@ cc_library(
+ "include/llvm/Support/*.def",
+ ]),
+ deps = [
++ ":Support-c",
+ ":config",
+ ":Demangle",
+ # We unconditionally depend on the custom LLVM terminfo wrapper. This
+diff --git a/utils/bazel/llvm-project-overlay/llvm/cc_plugin_library.bzl b/utils/bazel/llvm-project-overlay/llvm/cc_plugin_library.bzl
+index 2ebd39c630dc..e45bd8a1ce92 100644
+--- a/utils/bazel/llvm-project-overlay/llvm/cc_plugin_library.bzl
++++ b/utils/bazel/llvm-project-overlay/llvm/cc_plugin_library.bzl
+@@ -16,6 +16,7 @@ configure generic aspects of all generated rules such as `testonly`. Lastly,
+ """
+
+ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_import", "cc_library")
++load(":config.bzl", "llvm_stdcxx_copts")
+
+ def cc_plugin_library(name, srcs, hdrs, include_prefix = None, strip_include_prefix = None, alwayslink = False, features = [], tags = [], testonly = False, **kwargs):
+ # Neither the name of the plugin binary nor tags on whether it is built are
+@@ -29,6 +30,7 @@ def cc_plugin_library(name, srcs, hdrs, include_prefix = None, strip_include_pre
+ dylib_name = name + ".dylib"
+ interface_output_name = name + "_interface_output"
+ import_name = name + "_import"
++ copts = kwargs.pop("copts", [])
+ for impl_name in [dll_name, dylib_name, so_name]:
+ cc_binary(
+ name = impl_name,
+@@ -38,6 +40,7 @@ def cc_plugin_library(name, srcs, hdrs, include_prefix = None, strip_include_pre
+ features = features,
+ tags = ["manual"] + tags,
+ testonly = testonly,
++ copts = copts + llvm_stdcxx_copts,
+ **kwargs
+ )
+ native.filegroup(
+diff --git a/utils/bazel/llvm-project-overlay/llvm/config.bzl b/utils/bazel/llvm-project-overlay/llvm/config.bzl
+index 2046b2645362..736844bfc2d0 100644
+--- a/utils/bazel/llvm-project-overlay/llvm/config.bzl
++++ b/utils/bazel/llvm-project-overlay/llvm/config.bzl
+@@ -97,3 +97,8 @@ llvm_config_defines = os_defines + select({
+ "__STDC_CONSTANT_MACROS",
+ "__STDC_FORMAT_MACROS",
+ ]
++
++llvm_stdcxx_copts = select({
++ "@platforms//os:windows": ["/std:c++17"],
++ "//conditions:default": ["-std=c++17"],
++})
+diff --git a/utils/bazel/llvm-project-overlay/llvm/tblgen.bzl b/utils/bazel/llvm-project-overlay/llvm/tblgen.bzl
+index d43390918e39..e0482a6fd4fa 100644
+--- a/utils/bazel/llvm-project-overlay/llvm/tblgen.bzl
++++ b/utils/bazel/llvm-project-overlay/llvm/tblgen.bzl
+@@ -12,6 +12,8 @@ TODO(chandlerc): Currently this expresses include-based dependencies as
+ correctly understood by the build system.
+ """
+
++load(":config.bzl", "llvm_stdcxx_copts")
++
+ def gentbl(
+ name,
+ tblgen,
+@@ -77,5 +79,6 @@ def gentbl(
+ # distinction between these two.
+ hdrs = [f for (_, f) in tbl_outs],
+ features = ["-parse_headers", "-header_modules"],
++ copts = llvm_stdcxx_copts,
+ **kwargs
+ )