Skip to content

Commit 53f9327

Browse files
iinozemtsevCommit Queue
authored andcommitted
Revert "Update libcxx and libcxxabi"
This reverts commit 3491f72. Reason for revert: breaks tsan on linux. I did test locally before submitting, but without RBE. Original change's description: > Update libcxx and libcxxabi > > Add libc, required by libcxx. > > Based on flutter/flutter#165621. > > Change-Id: I5b929dc81b2572e3b919a8d20e031f98196375e6 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/416220 > Auto-Submit: Ivan Inozemtsev <[email protected]> > Reviewed-by: Ryan Macnak <[email protected]> > Commit-Queue: Ivan Inozemtsev <[email protected]> No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: Idcae5b01dbec26045ea7704d1575f73947d0682e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/420560 Commit-Queue: Alexander Aprelev <[email protected]> Bot-Commit: Rubber Stamper <[email protected]> Auto-Submit: Ivan Inozemtsev <[email protected]> Reviewed-by: Alexander Aprelev <[email protected]>
1 parent 381508a commit 53f9327

File tree

5 files changed

+32
-79
lines changed

5 files changed

+32
-79
lines changed

DEPS

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,8 @@ vars = {
104104
"devtools_rev": "f10e8df8c517fb0412b9a66c626581867c9c267d",
105105
"icu_rev": "43953f57b037778a1b8005564afabe214834f7bd",
106106
"jinja2_rev": "2222b31554f03e62600cd7e383376a7c187967a1",
107-
"libcxx_rev": "bd557f6f764d1e40b62528a13b124ce740624f8f",
108-
"libcxxabi_rev": "a4dda1589d37a7e4b4f7a81ebad01b1083f2e726",
109-
"libc_rev": "5af39a19a1ad51ce93972cdab206dcd3ff9b6afa",
107+
"libcxx_rev": "44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0",
108+
"libcxxabi_rev": "2ce528fb5e0f92e57c97ec3ff53b75359d33af12",
110109
"libprotobuf_rev": "24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb",
111110
"markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
112111
"perfetto_rev": "13ce0c9e13b0940d2476cd0cff2301708a9a2e2b",
@@ -274,9 +273,6 @@ deps = {
274273
Var("dart_root") + "/third_party/libcxxabi":
275274
Var("llvm_git") + "/llvm-project/libcxxabi" + "@" + Var("libcxxabi_rev"),
276275

277-
Var("dart_root") + "/third_party/libc":
278-
Var("llvm_git") + "/llvm-project/libc" + "@" + Var("libc_rev"),
279-
280276
Var("dart_root") + "/third_party/boringssl/src":
281277
"https://boringssl.googlesource.com/boringssl.git" +
282278
"@" + Var("boringssl_rev"),

build/secondary/third_party/libc/BUILD.gn

Lines changed: 0 additions & 16 deletions
This file was deleted.

build/secondary/third_party/libcxx/BUILD.gn

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,17 @@ source_set("libcxx") {
1515
sources = [
1616
"src/algorithm.cpp",
1717
"src/any.cpp",
18-
"src/atomic.cpp",
19-
"src/barrier.cpp",
2018
"src/bind.cpp",
21-
"src/call_once.cpp",
2219
"src/charconv.cpp",
2320
"src/chrono.cpp",
2421
"src/condition_variable.cpp",
2522
"src/condition_variable_destructor.cpp",
26-
"src/error_category.cpp",
23+
"src/debug.cpp",
2724
"src/exception.cpp",
28-
"src/filesystem/directory_entry.cpp",
2925
"src/filesystem/directory_iterator.cpp",
30-
"src/filesystem/filesystem_clock.cpp",
31-
"src/filesystem/filesystem_error.cpp",
26+
"src/filesystem/filesystem_common.h",
3227
"src/filesystem/int128_builtins.cpp",
3328
"src/filesystem/operations.cpp",
34-
"src/filesystem/path.cpp",
35-
"src/fstream.cpp",
3629
"src/functional.cpp",
3730
"src/future.cpp",
3831
"src/hash.cpp",
@@ -41,17 +34,11 @@ source_set("libcxx") {
4134
"src/iostream.cpp",
4235
"src/locale.cpp",
4336
"src/memory.cpp",
44-
"src/memory_resource.cpp",
4537
"src/mutex.cpp",
4638
"src/mutex_destructor.cpp",
4739
"src/new.cpp",
48-
"src/new_handler.cpp",
49-
"src/new_helpers.cpp",
5040
"src/optional.cpp",
51-
"src/ostream.cpp",
52-
"src/print.cpp",
5341
"src/random.cpp",
54-
"src/random_shuffle.cpp",
5542
"src/regex.cpp",
5643
"src/ryu/d2fixed.cpp",
5744
"src/ryu/d2s.cpp",
@@ -63,16 +50,13 @@ source_set("libcxx") {
6350
"src/system_error.cpp",
6451
"src/thread.cpp",
6552
"src/typeinfo.cpp",
53+
"src/utility.cpp",
6654
"src/valarray.cpp",
6755
"src/variant.cpp",
6856
"src/vector.cpp",
69-
"src/verbose_abort.cpp",
7057
]
7158

72-
deps = [
73-
"//third_party/libc",
74-
"//third_party/libcxxabi",
75-
]
59+
deps = [ "//third_party/libcxxabi" ]
7660

7761
# TODO(goderbauer): remove when all sources build with LTO for android_arm64 and android_x64.
7862
if (is_android && (current_cpu == "arm64" || current_cpu == "x64")) {

build/secondary/third_party/libcxx/config/__assertion_handler

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,31 @@
11
#ifndef _LIBCPP_CONFIG_SITE
22
#define _LIBCPP_CONFIG_SITE
3-
#define _LIBCPP_ABI_VERSION 1
4-
#define _LIBCPP_ABI_NAMESPACE _d
3+
4+
/* #undef _LIBCPP_ABI_VERSION */
5+
/* #undef _LIBCPP_ABI_UNSTABLE */
6+
/* #undef _LIBCPP_ABI_FORCE_ITANIUM */
7+
/* #undef _LIBCPP_ABI_FORCE_MICROSOFT */
8+
/* #undef _LIBCPP_HIDE_FROM_ABI_PER_TU_BY_DEFAULT */
9+
/* #undef _LIBCPP_HAS_NO_GLOBAL_FILESYSTEM_NAMESPACE */
10+
/* #undef _LIBCPP_HAS_NO_STDIN */
11+
/* #undef _LIBCPP_HAS_NO_STDOUT */
12+
/* #undef _LIBCPP_HAS_NO_THREADS */
13+
/* #undef _LIBCPP_HAS_NO_MONOTONIC_CLOCK */
14+
/* #undef _LIBCPP_HAS_NO_THREAD_UNSAFE_C_FUNCTIONS */
15+
/* #undef _LIBCPP_HAS_MUSL_LIBC */
16+
/* #undef _LIBCPP_HAS_THREAD_API_PTHREAD */
17+
/* #undef _LIBCPP_HAS_THREAD_API_EXTERNAL */
18+
/* #undef _LIBCPP_HAS_THREAD_API_WIN32 */
19+
/* #undef _LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL */
20+
/* #undef _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS */
21+
#define _LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS
22+
/* #undef _LIBCPP_NO_VCRUNTIME */
23+
/* #undef _LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION */
24+
/* #undef _LIBCPP_ABI_NAMESPACE */
25+
/* #undef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY */
26+
/* #undef _LIBCPP_HAS_PARALLEL_ALGORITHMS */
27+
/* #undef _LIBCPP_HAS_NO_RANDOM_DEVICE */
28+
/* #undef _LIBCPP_HAS_NO_LOCALIZATION */
529

630
#define _LIBCPP_REMOVE_TRANSITIVE_INCLUDES
731

@@ -12,31 +36,4 @@
1236
#define _LIBCPP_COMPILER_CLANG_BASED
1337
#endif
1438

15-
#if defined(__APPLE__)
16-
#define _LIBCPP_PSTL_BACKEND_LIBDISPATCH 1
17-
#else
18-
#define _LIBCPP_PSTL_BACKEND_STD_THREAD 1
19-
#endif
20-
21-
#define _LIBCPP_HARDENING_MODE_DEFAULT _LIBCPP_HARDENING_MODE_NONE
22-
23-
#define _LIBCPP_HAS_FILESYSTEM 1
24-
#define _LIBCPP_HAS_LOCALIZATION 1
25-
#define _LIBCPP_HAS_MONOTONIC_CLOCK 1
26-
#define _LIBCPP_HAS_RANDOM_DEVICE 1
27-
#define _LIBCPP_HAS_THREADS 1
28-
#define _LIBCPP_HAS_VENDOR_AVAILABILITY_ANNOTATIONS 0
29-
#define _LIBCPP_HAS_UNICODE 1
30-
#define _LIBCPP_HAS_WIDE_CHARACTERS 1
31-
32-
#ifdef _WIN32
33-
#define _LIBCPP_HAS_THREAD_API_PTHREAD 0
34-
#define _LIBCPP_HAS_THREAD_API_EXTERNAL 0
35-
#define _LIBCPP_HAS_THREAD_API_WIN32 1
36-
#else
37-
#define _LIBCPP_HAS_THREAD_API_PTHREAD 1
38-
#define _LIBCPP_HAS_THREAD_API_EXTERNAL 0
39-
#define _LIBCPP_HAS_THREAD_API_WIN32 0
40-
#endif
41-
4239
#endif // _LIBCPP_CONFIG_SITE

0 commit comments

Comments
 (0)