Fix out-dated libc++

buildtools/third_party/libc++/BUILD.gn

@@ -7,6 +7,7 @@ import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 
 # Used by libc++ and libc++abi.
+# See //build/config/c++:runtime_library for the config used by users of libc++.
 config("config") {
   cflags = [ "-fstrict-aliasing" ]
   if (is_win) {
@@ -44,14 +45,19 @@ config("winver") {
 if (libcxx_is_shared) {
   _libcxx_target_type = "shared_library"
 } else {
-  _libcxx_target_type = "source_set"
+  if (is_win) {
+    _libcxx_target_type = "source_set"
+  } else {
+    _libcxx_target_type = "static_library"
+  }
 }
 target(_libcxx_target_type, "libc++") {
   # Most things that need to depend on libc++ should do so via the implicit
   # 'common_deps' dependency below.  Some targets that package libc++.so may
   # need to explicitly depend on libc++.
   visibility = [
     "//build/config:common_deps",
+    "//electron:libcxx_objects_zip",
     "//third_party/catapult/devil:devil",
   ]
   if (is_linux) {
@@ -68,7 +74,10 @@ target(_libcxx_target_type, "libc++") {
     libs = [ "atomic" ]
   }
 
-  inputs = [ "__config_site" ]
+  inputs = [
+    "__assertion_handler",
+    "__config_site",
+  ]
 
   # TODO(crbug.com/1458042): Move this build file to third_party/libc++/BUILD.gn once submodule migration is done
   sources = [
@@ -77,10 +86,12 @@ target(_libcxx_target_type, "libc++") {
     "//third_party/libc++/src/src/atomic.cpp",
     "//third_party/libc++/src/src/barrier.cpp",
     "//third_party/libc++/src/src/bind.cpp",
+    "//third_party/libc++/src/src/call_once.cpp",
     "//third_party/libc++/src/src/charconv.cpp",
     "//third_party/libc++/src/src/chrono.cpp",
     "//third_party/libc++/src/src/condition_variable.cpp",
     "//third_party/libc++/src/src/condition_variable_destructor.cpp",
+    "//third_party/libc++/src/src/error_category.cpp",
     "//third_party/libc++/src/src/exception.cpp",
     "//third_party/libc++/src/src/filesystem/directory_iterator.cpp",
     "//third_party/libc++/src/src/filesystem/filesystem_error.cpp",
@@ -137,13 +148,6 @@ target(_libcxx_target_type, "libc++") {
     ]
   }
 
-  if (enable_iterator_debugging) {
-    sources += [
-      "//third_party/libc++/src/src/debug.cpp",
-      "//third_party/libc++/src/src/legacy_debug_handler.cpp",
-    ]
-  }
-
   include_dirs = [ "//third_party/libc++/src/src" ]
   if (is_win) {
     sources += [
@@ -197,7 +201,7 @@ target(_libcxx_target_type, "libc++") {
       # specified in the C++ spec 3.7.4p2, which makes them always have default
       # visibility.  This option is needed to force hidden visibility since
       # -fvisibility=hidden doesn't have the desired effect.
-      cflags = [ "-fvisibility-global-new-delete-hidden" ]
+      cflags = [ "-fvisibility-global-new-delete=force-hidden" ]
     } else {
       defines += [
         # This resets the visibility to default only for the various

buildtools/third_party/libc++/__assertion_handler

@@ -0,0 +1,23 @@
+// -*- C++ -*-
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef _LIBCPP___ASSERTION_HANDLER
+#define _LIBCPP___ASSERTION_HANDLER
+
+#include <__config>
+#include <__verbose_abort>
+
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#  pragma GCC system_header
+#endif
+
+// TODO(hardening): in production, trap rather than abort.
+#define _LIBCPP_ASSERTION_HANDLER(message) _LIBCPP_VERBOSE_ABORT("%s", message)
+
+#endif // _LIBCPP___ASSERTION_HANDLER

buildtools/third_party/libc++/__config_site

@@ -12,7 +12,6 @@
 //    limit for PDBs (https://crbug.com/1327710#c5). To fix this, we set
 //    _LIBCPP_ABI_NAMESPACE to a shorter value.
 #define _LIBCPP_ABI_NAMESPACE __Cr
-#define _LIBCPP_ABI_VERSION 2
 
 /* #undef _LIBCPP_ABI_FORCE_ITANIUM */
 /* #undef _LIBCPP_ABI_FORCE_MICROSOFT */
@@ -33,9 +32,21 @@
 /* #undef _LIBCPP_HAS_NO_LOCALIZATION */
 /* #undef _LIBCPP_HAS_NO_WIDE_CHARACTERS */
 
+// TODO(thakis): Is this right?
+/* #undef _LIBCPP_HAS_NO_STD_MODULES */
+
+// TODO(thakis): Is this right?
+/* #undef _LIBCPP_HAS_NO_TIME_ZONE_DATABASE */
+
+#define _LIBCPP_INSTRUMENTED_WITH_ASAN
+
 // PSTL backends
 /* #undef _LIBCPP_PSTL_CPU_BACKEND_SERIAL */
+#if defined(__APPLE__)
+#define _LIBCPP_PSTL_CPU_BACKEND_LIBDISPATCH
+#else
 #define _LIBCPP_PSTL_CPU_BACKEND_THREAD
+#endif
 
 // Settings below aren't part of __config_site upstream.
 // We set them here since we want them to take effect everywhere,
@@ -65,4 +76,7 @@
 #define _LIBCPP_HAS_NO_INT128
 #endif
 
+// TODO(thakis): Remove this after LLVM 19's libc++ is rolled in.
+#define _LIBCPP_CHAR_TRAITS_REMOVE_BASE_SPECIALIZATION
+
 #endif // _LIBCPP_CONFIG_SITE

buildtools/third_party/libc++abi/BUILD.gn

@@ -6,7 +6,7 @@ import("//build/config/android/config.gni")
 import("//build/config/c++/c++.gni")
 import("//build/config/unwind.gni")
 
-source_set("libc++abi") {
+static_library("libc++abi") {
   if (export_libcxxabi_from_executables) {
     visibility = [ "//build/config:executable_deps" ]
   } else {

examples/libcxx/.gn

@@ -0,0 +1,7 @@
+use_chromium_config = true
+
+default_args = {
+  is_clang = true
+  use_xcode_clang = false
+  use_custom_libcxx = true
+}

examples/libcxx/BUILD.gn

@@ -0,0 +1,10 @@
+executable("test") {
+  sources = [
+    "main.cc",
+  ]
+
+  deps = [
+    "//build:branding_buildflags",
+    "//build:chromeos_buildflags",
+  ]
+}

examples/libcxx/main.cc

@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main(int argc, const char *argv[]) {
+  printf("Passed\n");
+  return 0;
+}

scripts/create_dist.js

@@ -47,6 +47,7 @@ const files =
   searchFiles('third_party/libunwind/src/include'))
 addFileToZip(gnzip, 'buildtools/deps_revisions.gni', '.')
 addFileToZip(gnzip, 'buildtools/third_party/eu-strip/bin/eu-strip', '.')
+addFileToZip(gnzip, 'buildtools/third_party/libc++/__assertion_handler', '.')
 addFileToZip(gnzip, 'buildtools/third_party/libc++/__config_site', '.')
 addFileToZip(gnzip, 'buildtools/third_party/libc++/BUILD.gn', '.')
 addFileToZip(gnzip, 'buildtools/third_party/libc++abi/cxa_demangle_stub.cc', '.')

scripts/test.js

@@ -43,6 +43,10 @@ function runEachTest(project, projectPath) {
   const outdir = path.resolve('out', 'Test')
   fs.emptyDirSync(outdir)
 
+  if (projectPath.endsWith('libcxx')) {
+    execSync(`python3 ${path.join(tmppath, 'gn/tools/clang/scripts/update.py')}`)
+  }
+
   const gn = path.join(tmppath, 'gn', 'gn')
   execSync(`${gn} gen ${outdir}`, {cwd: projectPath})