Sync up posix_spawn_file_actions_addchdir_polyfill implementation between llbuild1 and llbuild3

Author: jakepetroules

lib/Basic/Subprocess.cpp

@@ -355,13 +355,17 @@ static bool posix_spawn_file_actions_addchdir_supported() {
 // Implementation mostly copied from _CFPosixSpawnFileActionsChdir in swift-corelibs-foundation
 static int posix_spawn_file_actions_addchdir_polyfill(posix_spawn_file_actions_t * __restrict file_actions,
                                                       const char * __restrict path) {
-#if (defined(__GLIBC__) && !__GLIBC_PREREQ(2, 29)) || (defined(__OpenBSD__)) || (defined(__ANDROID__) && __ANDROID_API__ < 34) || (defined(__QNX__))
+#if defined(__GLIBC__) && !__GLIBC_PREREQ(2, 29)
   // Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
   //  - Amazon Linux 2 (EoL mid-2025)
+  return ENOSYS;
+#elif defined(__ANDROID__) && __ANDROID_API__ < 34
+  // Android versions prior to 14 (API level 34) don't support posix_spawn_file_actions_addchdir_np
+  return ENOSYS;
+#elif defined(__OpenBSD__) || defined(__QNX__)
   // Currently missing as of:
   //  - OpenBSD 7.5 (April 2024)
   //  - QNX 8 (December 2023)
-  //  - Android <= 14
   return ENOSYS;
 #elif defined(__APPLE__) && defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
   // Conditionally available on macOS if building with a deployment target older than 10.15

src/llbuild3/LocalExecutor.cpp

@@ -94,23 +94,27 @@ int pthread_fchdir_np(int fd)
 
 #if !defined(_WIN32) && defined(HAVE_POSIX_SPAWN)
 // Implementation mostly copied from _CFPosixSpawnFileActionsChdir in swift-corelibs-foundation
-static int posix_spawn_file_actions_addchdir(posix_spawn_file_actions_t * __restrict file_actions,
-                                             const char * __restrict path) {
+static int posix_spawn_file_actions_addchdir_polyfill(posix_spawn_file_actions_t * __restrict file_actions,
+                                                      const char * __restrict path) {
 #if defined(__GLIBC__) && !__GLIBC_PREREQ(2, 29)
   // Glibc versions prior to 2.29 don't support posix_spawn_file_actions_addchdir_np, impacting:
   //  - Amazon Linux 2 (EoL mid-2025)
   return ENOSYS;
+#elif defined(__ANDROID__) && __ANDROID_API__ < 34
+  // Android versions prior to 14 (API level 34) don't support posix_spawn_file_actions_addchdir_np
+  return ENOSYS;
+#elif defined(__OpenBSD__) || defined(__QNX__)
+  // Currently missing as of:
+  //  - OpenBSD 7.5 (April 2024)
+  //  - QNX 8 (December 2023)
+  return ENOSYS;
 #elif defined(__APPLE__) && defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
   // Conditionally available on macOS if building with a deployment target older than 10.15
   if (__builtin_available(macOS 10.15, *)) {
     return posix_spawn_file_actions_addchdir_np(file_actions, path);
   }
   return ENOSYS;
-#elif defined(__OpenBSD__)
-  // Currently missing as of:
-  //  - OpenBSD 7.5 (April 2024)
-  return ENOSYS;
-#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) || (defined(__ANDROID__) && __ANDROID_API__ >= 34) || defined(__musl__)
+#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__musl__)
   // Pre-standard posix_spawn_file_actions_addchdir_np version available in:
   //  - Solaris 11.3 (October 2015)
   //  - Glibc 2.29 (February 2019)
@@ -123,7 +127,6 @@ static int posix_spawn_file_actions_addchdir(posix_spawn_file_actions_t * __rest
   // Standardized posix_spawn_file_actions_addchdir version (POSIX.1-2024, June 2024) available in:
   //  - Solaris 11.4 (August 2018)
   //  - NetBSD 10.0 (March 2024)
-  //  - QNX 8 (December 2023)
   return posix_spawn_file_actions_addchdir((posix_spawn_file_actions_t *)file_actions, path);
 #endif
 }
@@ -1106,7 +1109,7 @@ void spawnProcess(
   bool usePosixSpawnChdirFallback = true;
   const auto workingDir = attr.workingDir;
   if (!workingDir.empty() &&
-      posix_spawn_file_actions_addchdir(&fileActions, workingDir.c_str()) != ENOSYS) {
+      posix_spawn_file_actions_addchdir_polyfill(&fileActions, workingDir.c_str()) != ENOSYS) {
     usePosixSpawnChdirFallback = false;
   }