diff options
| author | David Carlier <devnexen@gmail.com> | 2019-10-08 15:45:35 +0000 |
|---|---|---|
| committer | David Carlier <devnexen@gmail.com> | 2019-10-08 15:45:35 +0000 |
| commit | 757fcb8a374bbe7c19c3f75ec33053f6c4013918 (patch) | |
| tree | 3f7d69d6617eeb03d50f207b536275df97c8ce23 | |
| parent | 52ad1a728a9295f34debe1541d82ae391df87b8b (diff) | |
| download | compiler-rt-757fcb8a374bbe7c19c3f75ec33053f6c4013918.tar.gz | |
[builtins] Unbreak build on FreeBSD armv7 after D60351
headers include reordering.
Reviewers: phosek, echristo
Reviewed-By: phosek
Differential Revsion: https://reviews.llvm.org/D68045
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@374070 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/builtins/atomic.c | 4 | ||||
| -rw-r--r-- | lib/builtins/clear_cache.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/builtins/atomic.c b/lib/builtins/atomic.c index 0f82803a6..32b3a0f9a 100644 --- a/lib/builtins/atomic.c +++ b/lib/builtins/atomic.c @@ -51,9 +51,11 @@ static const long SPINLOCK_MASK = SPINLOCK_COUNT - 1; //////////////////////////////////////////////////////////////////////////////// #ifdef __FreeBSD__ #include <errno.h> -#include <machine/atomic.h> +// clang-format off #include <sys/types.h> +#include <machine/atomic.h> #include <sys/umtx.h> +// clang-format on typedef struct _usem Lock; __inline static void unlock(Lock *l) { __c11_atomic_store((_Atomic(uint32_t) *)&l->_count, 1, __ATOMIC_RELEASE); diff --git a/lib/builtins/clear_cache.c b/lib/builtins/clear_cache.c index 079b245c3..e94e7f8eb 100644 --- a/lib/builtins/clear_cache.c +++ b/lib/builtins/clear_cache.c @@ -23,8 +23,10 @@ uintptr_t GetCurrentProcess(void); #endif #if defined(__FreeBSD__) && defined(__arm__) -#include <machine/sysarch.h> +// clang-format off #include <sys/types.h> +#include <machine/sysarch.h> +// clang-format on #endif #if defined(__NetBSD__) && defined(__arm__) @@ -32,8 +34,10 @@ uintptr_t GetCurrentProcess(void); #endif #if defined(__OpenBSD__) && defined(__mips__) -#include <machine/sysarch.h> +// clang-format off #include <sys/types.h> +#include <machine/sysarch.h> +// clang-format on #endif #if defined(__linux__) && defined(__mips__) |