Skip to content

Commit 22d9448

Browse files
authored
Revert "[libc] Implement barriers for pthreads (#148948)"
This reverts commit 7ca2375.
1 parent 5846381 commit 22d9448

25 files changed

+0
-625
lines changed

libc/config/linux/x86_64/entrypoints.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,9 +1050,6 @@ if(LLVM_LIBC_FULL_BUILD)
10501050
libc.src.pthread.pthread_join
10511051
libc.src.pthread.pthread_key_create
10521052
libc.src.pthread.pthread_key_delete
1053-
libc.src.pthread.pthread_barrier_init
1054-
libc.src.pthread.pthread_barrier_wait
1055-
libc.src.pthread.pthread_barrier_destroy
10561053
libc.src.pthread.pthread_mutex_destroy
10571054
libc.src.pthread.pthread_mutex_init
10581055
libc.src.pthread.pthread_mutex_lock

libc/hdr/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,6 @@ add_proxy_header_library(
7272
libc.include.fenv
7373
)
7474

75-
add_proxy_header_library(
76-
pthread_macros
77-
HDRS
78-
pthread_macros.h
79-
FULL_BUILD_DEPENDS
80-
libc.include.llvm-libc-macros.pthread_macros
81-
libc.include.pthread
82-
)
83-
8475
add_proxy_header_library(
8576
sched_macros
8677
HDRS

libc/hdr/pthread_macros.h

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

libc/hdr/types/CMakeLists.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -241,22 +241,6 @@ add_proxy_header_library(
241241
libc.include.llvm-libc-types.pid_t
242242
)
243243

244-
add_proxy_header_library(
245-
pthread_barrier_t
246-
HDRS
247-
pthread_barrier_t.h
248-
FULL_BUILD_DEPENDS
249-
libc.include.llvm-libc-types.pthread_barrier_t
250-
)
251-
252-
add_proxy_header_library(
253-
pthread_barrierattr_t
254-
HDRS
255-
pthread_barrierattr_t.h
256-
FULL_BUILD_DEPENDS
257-
libc.include.llvm-libc-types.pthread_barrierattr_t
258-
)
259-
260244
add_proxy_header_library(
261245
atexithandler_t
262246
HDRS

libc/hdr/types/pthread_barrier_t.h

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

libc/hdr/types/pthread_barrierattr_t.h

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

libc/include/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,8 +392,6 @@ add_header_macro(
392392
.llvm-libc-types.pthread_attr_t
393393
.llvm-libc-types.pthread_condattr_t
394394
.llvm-libc-types.pthread_key_t
395-
.llvm-libc-types.pthread_barrier_t
396-
.llvm-libc-types.pthread_barrierattr_t
397395
.llvm-libc-types.pthread_mutex_t
398396
.llvm-libc-types.pthread_mutexattr_t
399397
.llvm-libc-types.pthread_once_t

libc/include/llvm-libc-macros/pthread-macros.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#define PTHREAD_MUTEX_STALLED 0
2323
#define PTHREAD_MUTEX_ROBUST 1
2424

25-
#define PTHREAD_BARRIER_SERIAL_THREAD -1
26-
2725
#define PTHREAD_ONCE_INIT {0}
2826

2927
#define PTHREAD_PROCESS_PRIVATE 0

libc/include/llvm-libc-types/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ add_header(__exec_envp_t HDR __exec_envp_t.h)
1010
add_header(__futex_word HDR __futex_word.h)
1111
add_header(pid_t HDR pid_t.h)
1212
add_header(__mutex_type HDR __mutex_type.h DEPENDS .__futex_word .pid_t)
13-
add_header(__barrier_type HDR __barrier_type.h)
1413
add_header(__pthread_once_func_t HDR __pthread_once_func_t.h)
1514
add_header(__pthread_start_t HDR __pthread_start_t.h)
1615
add_header(__pthread_tss_dtor_t HDR __pthread_tss_dtor_t.h)
@@ -54,8 +53,6 @@ add_header(pthread_condattr_t HDR pthread_condattr_t.h DEPENDS .clockid_t)
5453
add_header(pthread_key_t HDR pthread_key_t.h)
5554
add_header(pthread_mutex_t HDR pthread_mutex_t.h DEPENDS .__futex_word .__mutex_type)
5655
add_header(pthread_mutexattr_t HDR pthread_mutexattr_t.h)
57-
add_header(pthread_barrier_t HDR pthread_barrier_t.h)
58-
add_header(pthread_barrierattr_t HDR pthread_barrierattr_t.h)
5956
add_header(pthread_once_t HDR pthread_once_t.h DEPENDS .__futex_word)
6057
add_header(pthread_rwlock_t HDR pthread_rwlock_t.h DEPENDS .__futex_word .pid_t)
6158
add_header(pthread_rwlockattr_t HDR pthread_rwlockattr_t.h)

libc/include/llvm-libc-types/__barrier_type.h

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

0 commit comments

Comments
 (0)