Skip to content

Commit 1f5bb73

Browse files
committed
Fixup includes
1 parent f3270d1 commit 1f5bb73

File tree

7 files changed

+5
-7
lines changed

7 files changed

+5
-7
lines changed

libcxx/include/__atomic/atomic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
#include <__atomic/atomic_sync.h>
1313
#include <__atomic/check_memory_order.h>
14-
#include <__atomic/cxx_atomic_impl.h>
1514
#include <__atomic/is_always_lock_free.h>
1615
#include <__atomic/memory_order.h>
16+
#include <__atomic/support.h>
1717
#include <__config>
1818
#include <__cstddef/ptrdiff_t.h>
1919
#include <__functional/operations.h>

libcxx/include/__atomic/atomic_flag.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
#include <__atomic/atomic_sync.h>
1313
#include <__atomic/contention_t.h>
14-
#include <__atomic/cxx_atomic_impl.h>
1514
#include <__atomic/memory_order.h>
15+
#include <__atomic/support.h>
1616
#include <__chrono/duration.h>
1717
#include <__config>
1818
#include <__memory/addressof.h>

libcxx/include/__atomic/atomic_sync.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#define _LIBCPP___ATOMIC_ATOMIC_SYNC_H
1111

1212
#include <__atomic/contention_t.h>
13-
#include <__atomic/cxx_atomic_impl.h>
1413
#include <__atomic/memory_order.h>
1514
#include <__atomic/to_gcc_order.h>
1615
#include <__chrono/duration.h>

libcxx/include/__atomic/contention_t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef _LIBCPP___ATOMIC_CONTENTION_T_H
1010
#define _LIBCPP___ATOMIC_CONTENTION_T_H
1111

12-
#include <__atomic/cxx_atomic_impl.h>
12+
#include <__atomic/support.h>
1313
#include <__config>
1414
#include <cstdint>
1515

libcxx/include/__atomic/fence.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#ifndef _LIBCPP___ATOMIC_FENCE_H
1010
#define _LIBCPP___ATOMIC_FENCE_H
1111

12-
#include <__atomic/cxx_atomic_impl.h>
1312
#include <__atomic/memory_order.h>
13+
#include <__atomic/support.h>
1414
#include <__config>
1515

1616
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

libcxx/include/atomic

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,6 @@ template <class T>
597597
#include <__atomic/atomic_sync.h>
598598
#include <__atomic/check_memory_order.h>
599599
#include <__atomic/contention_t.h>
600-
#include <__atomic/cxx_atomic_impl.h>
601600
#include <__atomic/fence.h>
602601
#include <__atomic/is_always_lock_free.h>
603602
#include <__atomic/kill_dependency.h>

libcxx/test/configs/armv7m-picolibc-libc++.cfg.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ config.substitutions.append(('%{flags}', '--sysroot=@CMAKE_INSTALL_PREFIX@'))
77
config.substitutions.append(('%{compile_flags}',
88
'-nostdinc++ -I %{include-dir} -I %{target-include-dir} -I %{libcxx-dir}/test/support'
99

10-
# Disable warnings in cxx_atomic_impl.h:
10+
# Disable warnings in tye <atomic> implementation:
1111
# "large atomic operation may incur significant performance penalty; the
1212
# access size (4 bytes) exceeds the max lock-free size (0 bytes)"
1313
' -Wno-atomic-alignment'

0 commit comments

Comments
 (0)