Skip to content

Commit c5f68a7

Browse files
committed
[libc++abi] Revert temporary workaround to unblock Chrome
This reverts commit 372f7dd, which is not needed by Chrome anymore.
1 parent 04f99be commit c5f68a7

5 files changed

+5
-31
lines changed

libcxxabi/src/cxa_exception_storage.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@
1212

1313
#include "cxa_exception.h"
1414

15-
// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302
16-
#if __has_include(<__thread/support.h>)
17-
# include <__thread/support.h>
18-
#else
19-
# include <__threading_support>
20-
#endif
15+
#include <__thread/support.h>
2116

2217
#if defined(_LIBCXXABI_HAS_NO_THREADS)
2318

libcxxabi/src/cxa_guard_impl.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,7 @@
5555
# endif
5656
#endif
5757

58-
// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302
59-
#if __has_include(<__thread/support.h>)
60-
# include <__thread/support.h>
61-
#else
62-
# include <__threading_support>
63-
#endif
64-
58+
#include <__thread/support.h>
6559
#include <cstdint>
6660
#include <cstring>
6761
#include <limits.h>

libcxxabi/src/cxa_thread_atexit.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@
88

99
#include "abort_message.h"
1010
#include "cxxabi.h"
11-
// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302
12-
#if __has_include(<__thread/support.h>)
13-
# include <__thread/support.h>
14-
#else
15-
# include <__threading_support>
16-
#endif
11+
#include <__thread/support.h>
1712
#ifndef _LIBCXXABI_HAS_NO_THREADS
1813
#if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB)
1914
#pragma comment(lib, "pthread")

libcxxabi/src/fallback_malloc.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
#include "fallback_malloc.h"
1010
#include "abort_message.h"
1111

12-
// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302
13-
#if __has_include(<__thread/support.h>)
14-
# include <__thread/support.h>
15-
#else
16-
# include <__threading_support>
17-
#endif
12+
#include <__thread/support.h>
1813
#ifndef _LIBCXXABI_HAS_NO_THREADS
1914
#if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB)
2015
#pragma comment(lib, "pthread")

libcxxabi/test/test_fallback_malloc.pass.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@
1111
#include <cassert>
1212
#include <inttypes.h>
1313

14-
// TODO: Temporary workaround, see https://github.com/llvm/llvm-project/pull/79654#issuecomment-1919397302
15-
#if __has_include(<__thread/support.h>)
16-
# include <__thread/support.h>
17-
#else
18-
# include <__threading_support>
19-
#endif
14+
#include <__thread/support.h>
2015

2116
// UNSUPPORTED: c++03
2217
// UNSUPPORTED: modules-build && no-threads

0 commit comments

Comments
 (0)