Merge branch 'apple:main' into main

classicvalues · web-flow · commit fe035e97aa20 · 2022-02-24T19:32:06.000-08:00
diff --git a/src/init.c b/src/init.c
@@ -24,6 +24,9 @@
 // NOTE: this file must not contain any atomic operations
 
 #include "internal.h"
+#if __linux__
+#include <linux/limits.h> // for PATH_MAX
+#endif
 
 #if HAVE_MACH
 #include "protocolServer.h"
diff --git a/src/shims/yield.c b/src/shims/yield.c
@@ -36,7 +36,7 @@ void *
 _dispatch_wait_for_enqueuer(void **ptr)
 {
 #if !DISPATCH_HW_CONFIG_UP
-#if defined(__arm__) || defined(__arm64__)
+#if (defined(__arm__) && defined(__APPLE__)) || defined(__arm64__)
 	int spins = DISPATCH_WAIT_SPINS_WFE;
 	void *value;
 	while (unlikely(spins-- > 0)) {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void *`
`36`	`36`	`_dispatch_wait_for_enqueuer(void **ptr)`
`37`	`37`	`{`
`38`	`38`	`#if !DISPATCH_HW_CONFIG_UP`
`39`		`-#if defined(__arm__) \|\| defined(__arm64__)`
	`39`	`+#if (defined(__arm__) && defined(__APPLE__)) \|\| defined(__arm64__)`
`40`	`40`	`int spins = DISPATCH_WAIT_SPINS_WFE;`
`41`	`41`	`void *value;`
`42`	`42`	`while (unlikely(spins-- > 0)) {`