Skip to content

Commit

Permalink
Revert "Roll src/buildtools/third_party/libc++abi/trunk/ 196ba1aaa..5…
Browse files Browse the repository at this point in the history
…fb4080 (222 commits)"

This reverts commit d711ce2.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 856344 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtL2Q3MTFjZTI1ZjE4NmI3M2U4NjdlZmNkOTlkZjNhYmQwMzdjMzA3OTAM

Sample Failed Build: https://ci.chromium.org/b/8854570611236928432

Sample Failed Step: compile

See https://crbug.com/1181057

Original change's description:
> Roll src/buildtools/third_party/libc++abi/trunk/ 196ba1aaa..5fb4080 (222 commits)
>
> Requires an ugly workaround for https://llvm.org/PR49313
>
> https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/196ba1aaa8ac..5fb4080bfe3d
>
> $ git log 196ba1aaa..5fb4080 --date=short --no-merges --format='%ad %ae %s'
> 2021-02-17 patrick.oppenlander [libc++abi] Add builtins to dynamic library link
> 2021-02-16 zibi [SystemZ][ZOS] Prefer -nostdlib++ as opposed to -nodefaultlibs when building c++ libraries
> 2021-02-12 vvereschaka [libc++abi] Fix forced_unwind tests failures on ARM/EHABI targets.
> 2021-02-05 i [libc++abi] Disable _Unwind_ForcedUnwind + exception tests for ARM EHABI
> 2021-02-02 i [test] Add basic _Unwind_ForcedUnwind + exception tests
> 2021-02-01 shivam98.tkg [Branch-Rename] Fix some links
> 2020-12-07 jyknight Itanium Mangling: Mangle `__alignof__` differently than `alignof`.
> 2021-01-25 marek.kurdej [libc++] Set CMAKE_FOLDER. NFC.
> 2021-01-21 i [libc++abi] Simplify scan_eh_tab
> 2021-01-21 danalbert [libc++abi] Add an option to avoid demangling in terminate.
> 2021-01-10 raul [CMake] Remove dead code setting policies to NEW
> 2020-12-17 ldionne.2 [libc++/abi] Re-remove unnecessary null pointer checks from operator delete
> 2021-01-07 i [libc++abi] Simplify __gxx_personality_v0
> 2020-12-16 i [libc++abi] Remove redundant null pointer check in operator delete
> 2020-12-01 ldionne.2 [libc++abi] Don't try calling __libcpp_aligned_free when aligned allocation is disabled
> 2020-04-06 leonardchan [libcxxabi] Add macro for changing functions to support the relative vtables ABI
> 2020-11-23 ldionne.2 [libc++] Introduce an indirection to create threads in the test suite
> 2020-11-24 bruce.mitchener [libc++] Replace several uses of 0 by nullptr
> 2020-11-26 marek.kurdej [libc++] Mark a few more tests as unsupported on gcc-8/9.
> 2020-11-26 marek.kurdej [libc++] [libc++abi] Mark a few tests as unsupported/xfail on gcc-7/8/9.
> 2020-11-12 ldionne [libc++] Factor out common logic for calling aligned allocation
> 2020-11-22 marek [libc++] [libc++abi] Use C++20 standard.
> 2020-10-22 richard Demangling support for class type non-type template parameter extensions.
> 2020-11-11 ldionne [libc++abi] Reuse libc++'s refstring.h header instead of copying it
> 2020-11-09 ldionne [runtimes] Avoid overwriting the rpath unconditionally
> 2020-11-06 ldionne Revert "Allow running back-deployment testing against libc++abi"
> 2020-07-08 ldionne Allow running back-deployment testing against libc++abi
> 2020-10-23 martin [libcxx] [libcxxabi] Set flags for visibility when statically linking libcxxabi into libcxx for windows
> 2020-10-30 martin [libcxxabi] Build all of libcxxabi with _LIBCPP_BUILDING_LIBRARY defined
> 2020-11-02 ldionne [libc++/libc++abi] Use Python3_EXECUTABLE consistently to run utilities
> 2020-10-30 ldionne [libc++abi] Get rid of warnings when running the tests with GCC
> 2020-10-26 ldionne [libc++abi] Make sure we can run the tests in Standalone mode
> 2020-10-23 ldionne [libc++] Refactor the run-buildbot script to make it more modular, and run the benchmarks
> 2020-10-23 ldionne [runtimes] Revert the libc++ __config_site change
> 2020-10-22 ldionne [libc++abi] Fix the standalone build after the __config_site change
> 2020-10-21 martin [libcxxabi] Define _LIBCXXABI_WEAK properly for mingw compilers
> 2020-10-21 ldionne [libc++] Fix compiler-rt build by copying libc++ headers to <build>/include
> 2020-10-21 abidh [libcxxabi] Stub out 'sleep' call when _LIBCXXABI_HAS_NO_THREADS is defined.
> 2020-06-26 ldionne [take 2] [libc++] Include <__config_site> from <__config>
> 2020-10-21 ldionne [libc++] Revert "Include <__config_site> from <__config>"
> 2020-06-26 ldionne [libc++] Include <__config_site> from <__config>
> 2020-10-20 eric [libc++] Make __shared_weak_count vtable consistent across all build configurations
> 2019-10-01 ldionne [libc++] Define new/delete in libc++abi only by default
> 2020-10-16 simon.tatham [libcxxabi] Fix printf formats in a test.
> 2020-08-24 dominik.montada [libcxxabi,libunwind] support running tests in standalone mode
> 2020-10-13 ldionne [libc++/abi] Clean up uses of <iostream> in the test suite
> 2020-10-13 teemperor Fix all the CMake code that can only handle -stdlib= but not --stdlib=
> 2020-10-08 ldionne [runtimes] Use int main(int, char**) consistently in tests
> 2020-10-05 ldionne remove copybara initialization artifacts
> 2020-10-05 ldionne Copybara Service Migration Initialization.
> (...)
> 2019-08-05 ldionne [libc++] Take 2: Integrate the PSTL into libc++
> 2019-07-22 yikong [runtimes] Don't depend on libpthread on Android
> 2019-07-19 ldionne Revert "[libc++] Integrate the PSTL into libc++"
> 2019-07-19 ldionne [libc++] Integrate the PSTL into libc++
> 2019-07-12 phosek [libcxxabi] Don't process exceptions in cxa_handlers when they're disabled
> 2019-06-28 erik.pilkington [demangle] Support for C++2a char8_t
> 2019-06-27 ldionne [libcxxabi] Use an explicit list to export symbols from the dylib
> 2019-06-18 erik.pilkington [demangle] Special case clang's creative mangling of __uuidof expressions.
> 2019-06-18 ldionne [libcxxabi] Remove the unused buildit script
> 2019-06-10 erik.pilkington [demangle] Vendor extended types shouldn't be considered substitution candidates
> 2019-06-02 phosek [libcxx] Use libtool when merging archives on Apple platforms
> 2019-05-30 phosek [libcxx][libcxxabi] Remove the unused CMake checks
> 2019-05-30 phosek [runtimes] Use -Wunknown-pragmas for the pragma check
> 2019-05-30 phosek [runtimes] Check if pragma comment(lib, ...) is supported first
> 2019-05-30 phosek [runtimes] Support ELF dependent libraries feature
> 2019-05-29 eric Update private_typeinfo's `is_equal` implementation after r361913
> 2019-05-22 phosek [runtimes] Move libunwind, libc++abi and libc++ to lib/$target/c++ and include/c++
> 2019-05-17 ldionne [libcxxabi] Add a test for invalid assumptions on the alignment of exceptions
> 2019-05-16 eric XFAIL test for new GCC version
> 2019-05-07 nicolasweber minor cmake formatting style fix
> 2019-05-06 phosek [libcxxabi] Don't use -fvisibility-global-new-delete-hidden when not defining them
> 2019-05-02 phosek [gn] Support for building libcxxabi
> 2019-05-02 eric Attempt to fix flaky tests.
> 2019-04-30 eric Update DemangleConfig.h to better mangle LLVM's version.
> 2019-04-29 eric Remove XFail for new GCC. They fixed it
> 2019-04-25 michael.platings Fix compilation error with -DLIBCXXABI_ENABLE_THREADS=OFF
> 2019-04-24 eric Cleanup new cxa guard implementation.
> 2019-04-24 eric Work around GCC test failure.
> 2019-04-24 eric Rewrite cxa guard implementation.
> 2019-04-23 ldionne [libc++abi] Don't use a .sh.cpp test for uncaught_exception
> 2019-04-18 ldionne [libc++] Make sure we re-export some missing libc++abi symbols from libc++
> 2019-04-11 eric Fix PR41465 - Use __builtin_mul_overflow instead of hand-rolled check.
> 2019-04-11 ldionne [NFC] Correct outdated links to the Itanium C++ ABI documentation
> 2019-04-10 ldionne [libc++abi] Create a macro for the 32 bit guard setting on ARM platforms
> 2019-04-08 eric Revert "Make reads and writes of the guard variable atomic."
> 2019-04-08 eric Fix incorrect change during refactoring.
> 2019-04-08 eric Remove unneeded write in __cxa_guard_release.
> 2019-04-08 eric Make reads and writes of the guard variable atomic.
> 2019-04-05 eric Fix PR41395 - __cxa_vec_new may overflow in allocation size calculation.
> 2019-04-05 eric Further refactor cxa_guard.cpp
> 2019-04-04 eric Create RAII lock guard for global initialization lock.
> 2019-04-04 eric Always use is_initialized and set_initialized in cxa_guard.cpp
> 2019-04-03 nicolasweber llvm-cxxfilt: Demangle gcc "old-style unified" ctors and dtors
> 2019-04-03 phosek [libc++abi] Do not share an object library to create the static/shared libraries
> 2019-04-03 sbc [libc++abi] Add LIBCXXABI_ENABLE_PIC cmake option
> 2019-04-03 sbc [libc++abi] Actually set POSITION_INDEPENDENT_CODE when building shared library
> 2019-03-29 sbc [libc++abi] Don't set POSITION_INDEPENDENT_CODE when building static library
> 2019-03-08 matthew.voss Revert "[runtimes] Move libunwind, libc++abi and libc++ to lib/ and include/"
> 2019-03-08 phosek [runtimes] Move libunwind, libc++abi and libc++ to lib/ and include/
> 2019-03-01 ldionne [libc++abi] Specify unwind lib before other system libraries when linking
>
> Created with:
>   roll-dep src/buildtools/third_party/libc++abi/trunk
>
> Bug: 1180836
> No-Presubmit: true
> Change-Id: I9ef6a50baecc96cafaa4775ee6aed35b8d4a7690
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2712282
> Auto-Submit: Nico Weber <thakis@chromium.org>
> Reviewed-by: Hans Wennborg <hans@chromium.org>
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#856344}


Change-Id: Ia6970ad18a5622c4cb7a79be223ae31dcd05ca3b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1180836
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2713706
Cr-Commit-Position: refs/heads/master@{#856427}
  • Loading branch information
Findit authored and nico committed Feb 22, 2021
1 parent 03038de commit 817d05f
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 154 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ vars = {
# TODO(crbug.com/1166332) rename to clang_format_revision.
'clang_fmt_revision': '99803d74e35962f63a775f29477882afd4d57d94',
'libcxx_revision': '8fa87946779682841e21e2da977eccfb6cb3bded',
'libcxxabi_revision': '5fb4080bfe3daeb36e10abe50202d6579bf95072',
'libcxxabi_revision': '196ba1aaa8ac285d94f4ea8d9836390a45360533',
'libunwind_revision': 'a2cc4f8c554dedcb0c64cac5511b19c43f1f3d32',

# resultdb CIPD package version.
Expand Down
2 changes: 1 addition & 1 deletion buildtools/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ vars = {
# TODO(crbug.com/1166332) rename to clang_format_revision.
'clang_fmt_revision': '99803d74e35962f63a775f29477882afd4d57d94',
'libcxx_revision': '8fa87946779682841e21e2da977eccfb6cb3bded',
'libcxxabi_revision': '5fb4080bfe3daeb36e10abe50202d6579bf95072',
'libcxxabi_revision': '196ba1aaa8ac285d94f4ea8d9836390a45360533',
'libunwind_revision': 'a2cc4f8c554dedcb0c64cac5511b19c43f1f3d32',
}

Expand Down
8 changes: 1 addition & 7 deletions buildtools/third_party/libc++abi/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ source_set("libc++abi") {
# libc++abi. We build lib++/libc++abi with exceptions enabled.
#"trunk/src/cxa_noexception.cpp",
"trunk/src/cxa_personality.cpp",
"trunk/src/cxa_unexpected.cpp",
"trunk/src/cxa_vector.cpp",
"trunk/src/cxa_virtual.cpp",
"trunk/src/fallback_malloc.cpp",
Expand All @@ -45,8 +46,6 @@ source_set("libc++abi") {

# See the comment in cxa_demangle_stub.cc for why we don't use LLVM's
# demangler on android.
# TODO(thakis): Switch to building with LIBCXXABI_NON_DEMANGLING_TERMINATE
# defined instead.
if (is_android) {
sources += [ "cxa_demangle_stub.cc" ]
} else {
Expand Down Expand Up @@ -79,9 +78,4 @@ source_set("libc++abi") {
configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
configs += [ "//build/config/gcc:symbol_visibility_default" ]
}

# TODO(thakis): This is a gross workaround for https:/llvm.org/PR49313
# We had to copy refstring.h into libc++abi for the relative path to work,
# but the copy includes more stuff from libc++'s internal headers.
include_dirs = [ "../libc++/trunk/src/include" ]
}
5 changes: 0 additions & 5 deletions buildtools/third_party/libc++abi/README.chromium
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,3 @@ Security Critical: yes
Description:

libc++abi for Chromium.

Local changes:
- Copied buildtools/third_party/libc++/trunk/src/include/refstring.h to
buildtools/third_party/libc++abi/libcxx/src/include/refstring.h to work
around https://llvm.org/PR49313
140 changes: 0 additions & 140 deletions buildtools/third_party/libc++abi/libcxx/src/include/refstring.h

This file was deleted.

0 comments on commit 817d05f

Please sign in to comment.