[builtins] Unbreak build on FreeBSD armv7 after D60351

[jbeich]

Summary

According to FreeBSD style(9) and OpenBSD style(9) either <sys/types.h> or <sys/param.h> must come before any other header. Many system headers are not self-sufficient to avoid namespace pollution.

Found downstream via Rust

# FreeBSD
$ echo '#include <machine/sysarch.h>' | cc -xc -
In file included from <stdin>:1:
In file included from /usr/include/machine/sysarch.h:42:
/usr/include/machine/armreg.h:47:2: error: Please include sys/cdefs.h before including machine/armreg.h
#error Please include sys/cdefs.h before including machine/armreg.h
 ^
1 error generated.

# OpenBSD
$ echo '#include <machine/sysarch.h>' | cc -xc -
In file included from <stdin>:1:
/usr/include/machine/sysarch.h:47: error: expected specifier-qualifier-list before 'u_int32_t'
In file included from <stdin>:1:
/usr/include/machine/sysarch.h:56: error: expected ')' before 'addr'

[phosek]

LGTM

[jbeich]

Can someone land this change? Only tested on FreeBSD because contributing guide didn't cover how to elsewhere i.e., on platforms one doesn't have access to.

[devnexen]

In D68045#1699532, @jbeich wrote:

Can someone land this change? Only tested on FreeBSD because contributing guide didn't cover how to elsewhere i.e., on platforms one doesn't have access to.

Merged now.

[dim]

For some reason this didn't get closed by Phabricator. Committed in rCRT374070.

compiler-rt/lib/builtins/atomic.c

 
 ////////////////////////////////////////////////////////////////////////////////
 // Platform-specific lock implementation.  Falls back to spinlocks if none is
 // defined.  Each platform should define the Lock type, and corresponding
 // lock() and unlock() functions.
 ////////////////////////////////////////////////////////////////////////////////
 #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);
   __c11_atomic_thread_fence(__ATOMIC_SEQ_CST);
   if (l->_has_waiters)
     _umtx_op(l, UMTX_OP_SEM_WAKE, 1, 0, 0);
 }
 __inline static void lock(Lock *l) {

compiler-rt/lib/builtins/clear_cache.c

 // Forward declare Win32 APIs since the GCC mode driver does not handle the
 // newer SDKs as well as needed.
 uint32_t FlushInstructionCache(uintptr_t hProcess, void *lpBaseAddress,
                                uintptr_t dwSize);
 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__)
 #include <machine/sysarch.h>
 #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__)
 #include <sys/cachectl.h>
 #include <sys/syscall.h>
 #include <unistd.h>
 #if defined(__ANDROID__) && defined(__LP64__)
 // clear_mips_cache - Invalidates instruction cache for Mips.