Commit 50a1419457bff596747ea7716e77140178c96389 | zig

author	Andrew Kelley <andrew@ziglang.org> 2024-05-20 06:19:58-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-05-20 16:12:36-04:00
log	50a1419457bff596747ea7716e77140178c96389
tree	362c0ee8ce4148bbf892b1df8926859fe738e91a
parent	9f4f43cf7fdd2b2a50e475a1e7d740c9bcc2227e

Contains fixes for OpenBSD

3 files changed, 32 insertions(+), 4 deletions(-)

lib/libcxx/src/atomic.cpp+14-2

 @@ -25,16 +25,28 @@
 #  if !defined(SYS_futex) && defined(SYS_futex_time64)
 #    define SYS_futex SYS_futex_time64
 #  endif
+#  define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__)
 #elif defined(__FreeBSD__)
 #  include <sys/types.h>
 #  include <sys/umtx.h>
+#  define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__)
+#elif defined(__OpenBSD__)
+#  include <sys/futex.h>
+// OpenBSD has no indirect syscalls
+#  define _LIBCPP_FUTEX(...) futex(__VA_ARGS__)
 #else // <- Add other operating systems here
 // Baseline needs no new headers
+#  define _LIBCPP_FUTEX(...) syscall(SYS_futex, __VA_ARGS__)
 #endif
 _LIBCPP_BEGIN_NAMESPACE_STD
 @@ -44,11 +56,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 static void
 __libcpp_platform_wait_on_address(__cxx_atomic_contention_t const volatile* __ptr, __cxx_contention_t __val) {
   static constexpr timespec __timeout = {2, 0};
-  syscall(SYS_futex, __ptr, FUTEX_WAIT_PRIVATE, __val, &__timeout, 0, 0);
+  _LIBCPP_FUTEX(__ptr, FUTEX_WAIT_PRIVATE, __val, &__timeout, 0, 0);
 }
 static void __libcpp_platform_wake_by_address(__cxx_atomic_contention_t const volatile* __ptr, bool __notify_one) {
-  syscall(SYS_futex, __ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0);
+  _LIBCPP_FUTEX(__ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0);
 }
 #elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK)

lib/libcxx/src/chrono.cpp+3-1

 @@ -31,7 +31,9 @@
 #  include <sys/time.h> // for gettimeofday and timeval
 #endif
-#if defined(__APPLE__) || defined(__gnu_hurd__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0)
+// OpenBSD does not have a fully conformant suite of POSIX timers, but
+// it does have clock_gettime and CLOCK_MONOTONIC which is all we need.
+#if defined(__APPLE__) || defined(__gnu_hurd__) || defined(__OpenBSD__) || (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0)
 #  define _LIBCPP_HAS_CLOCK_GETTIME
 #endif

lib/libcxxabi/src/cxa_guard_impl.h+15-1

...	@@ -47,6 +47,9 @@	...	@@ -47,6 +47,9 @@
47	#include "__cxxabi_config.h"	47	#include "__cxxabi_config.h"
48	#include "include/atomic_support.h" // from libc++	48	#include "include/atomic_support.h" // from libc++
49	#if defined(__has_include)	49	#if defined(__has_include)
		50	# if __has_include(<sys/futex.h>)
		51	# include <sys/futex.h>
		52	# endif
50	# if __has_include(<sys/syscall.h>)	53	# if __has_include(<sys/syscall.h>)
51	# include <sys/syscall.h>	54	# include <sys/syscall.h>
52	# endif	55	# endif
...	@@ -411,7 +414,18 @@ private:	...	@@ -411,7 +414,18 @@ private:
411	// Futex Implementation	414	// Futex Implementation
412	//===----------------------------------------------------------------------===//	415	//===----------------------------------------------------------------------===//
413		416
414	#if defined(SYS_futex)	417	#if defined(__OpenBSD__)
		418	void PlatformFutexWait(int* addr, int expect) {
		419	constexpr int WAIT = 0;
		420	futex(reinterpret_cast<volatile uint32_t*>(addr), WAIT, expect, NULL, NULL);
		421	__tsan_acquire(addr);
		422	}
		423	void PlatformFutexWake(int* addr) {
		424	constexpr int WAKE = 1;
		425	__tsan_release(addr);
		426	futex(reinterpret_cast<volatile uint32_t*>(addr), WAKE, INT_MAX, NULL, NULL);
		427	}
		428	#elif defined(SYS_futex)
415	void PlatformFutexWait(int* addr, int expect) {	429	void PlatformFutexWait(int* addr, int expect) {
416	constexpr int WAIT = 0;	430	constexpr int WAIT = 0;
417	syscall(SYS_futex, addr, WAIT, expect, 0);	431	syscall(SYS_futex, addr, WAIT, expect, 0);