Skip to content

Commit 1f926da

Browse files
nicocopybara-github
authored andcommitted
Roll libc++ from 0e3285ac398e to 4cba0fa3571b (1 revision)
https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/0e3285ac398e..4cba0fa3571b 2025-11-14 [email protected] [libc++][hardening] Allow setting the assertion semantic via CMake. (#167636) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/libcxx-chromium Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Change-Id: Iba577893c0e246990919ff5f5e954419f6c386cb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7157574 Commit-Queue: Nico Weber <[email protected]> Reviewed-by: Hans Wennborg <[email protected]> Cr-Commit-Position: refs/heads/main@{#1548042} NOKEYCHECK=True GitOrigin-RevId: 88e128a3b4d0f4c0107de549e55fb182bd8ce023
1 parent cb29e21 commit 1f926da

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

deps_revisions.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
declare_args() {
66
# Used to cause full rebuilds on libc++ rolls. This should be kept in sync
77
# with the libcxx_revision var in //DEPS.
8-
libcxx_revision = "0e3285ac398e8769e3496d077ecfe10d51cd3c53"
8+
libcxx_revision = "4cba0fa3571b78aca49da1e4e51bfd63a43729ee"
99
}

third_party/libc++/__config_site

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@
6363
#define _LIBCPP_PSTL_BACKEND_STD_THREAD
6464
#endif
6565

66+
// _LIBCPP_HARDENING_MODE_DEFAULT is not defined here. Instead, we define
67+
// _LIBCPP_HARDENING_MODE in build/config/compiler/BUILD.gn.
68+
69+
// Define _LIBCPP_ASSERTION_SEMANTIC_DEFAULT instead of
70+
// _LIBCPP_ASSERTION_SEMANTIC because the latter requires setting
71+
// _LIBCPP_HAS_EXPERIMENTAL_LIBRARY too.
72+
#define _LIBCPP_ASSERTION_SEMANTIC_DEFAULT \
73+
_LIBCPP_ASSERTION_SEMANTIC_HARDENING_DEPENDENT
74+
6675
// Settings below aren't part of __config_site upstream.
6776
// We set them here since we want them to take effect everywhere,
6877
// unconditionally.

third_party/libc++/libcxx_headers.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import("//buildtools/deps_revisions.gni")
1212

1313
assert(
14-
libcxx_revision == "0e3285ac398e8769e3496d077ecfe10d51cd3c53",
14+
libcxx_revision == "4cba0fa3571b78aca49da1e4e51bfd63a43729ee",
1515
"libcxx_headers.gni and third_party/libc++ are out of sync.$0x0A$0x0AIf you were messing around with the libc++ repository, run:$0x0A`buildtools/third_party/libc++/generate_libcxx_headers.py`$0x0A$0x0AIf the script doesn't resolve the error, file a bug to msta@ with reproduction details.$0x0A")
1616

1717
libcxx_headers = [

0 commit comments

Comments
 (0)