Skip to content

Commit 629078f

Browse files
chromium-autorollcopybara-github
authored andcommitted
Roll libc++ and libcxxabi across aligned_alloc.h change
This morally picks up a single upstream PR that touches both libc++ and libc++abi: llvm/llvm-project#166172 Since we mirror libc++ and libc++abi separately, this single commit has been split into one commit in each repo. ...and then there was a follow-up libc++-only buildfix for it: llvm/llvm-project#169418 To pick both of these up, this rolls libcxxabi by one revision, and libcxx by two. It combines these two rolls: 1. Roll libcxxabi from de02e5d57052 to 83a852080747 (1 revision) https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/de02e5d57052..83a852080747 2025-11-24 [email protected] [libc++][NFC] Move __memory/aligned_alloc.h into src/ (#166172) 2. Roll libc++ from 25731e23e3aa to 13cfd0942dfd (2 revisions) https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git/+log/25731e23e3aa..13cfd0942dfd 2025-11-24 [email protected] Fix path to aligned_alloc.h in #include statement (#169418) 2025-11-24 [email protected] [libc++][NFC] Move __memory/aligned_alloc.h into src/ (#166172) Change-Id: I04f1081884978d693d8a6dac8089e5c417b355e8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7201052 Commit-Queue: Nico Weber <[email protected]> Reviewed-by: Hans Wennborg <[email protected]> Cr-Commit-Position: refs/heads/main@{#1551246} NOKEYCHECK=True GitOrigin-RevId: d9b454f01e84d2a064c8a230cd30702cfe2e6a93
1 parent 180f0b9 commit 629078f

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
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 = "91c45fc28459e814889633be985b698c5e8050b4"
8+
libcxx_revision = "13cfd0942dfd76fc838d1ead5c3c75a540f4760c"
99
}

third_party/libc++/libcxx_headers.gni

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

1313
assert(
14-
libcxx_revision == "91c45fc28459e814889633be985b698c5e8050b4",
14+
libcxx_revision == "13cfd0942dfd76fc838d1ead5c3c75a540f4760c",
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 = [
@@ -586,7 +586,6 @@ libcxx_headers = [
586586
"//third_party/libc++/src/include/__mdspan/mdspan.h",
587587
"//third_party/libc++/src/include/__memory/addressof.h",
588588
"//third_party/libc++/src/include/__memory/align.h",
589-
"//third_party/libc++/src/include/__memory/aligned_alloc.h",
590589
"//third_party/libc++/src/include/__memory/allocate_at_least.h",
591590
"//third_party/libc++/src/include/__memory/allocation_guard.h",
592591
"//third_party/libc++/src/include/__memory/allocator.h",

0 commit comments

Comments
 (0)