Changes after testing with Xcode 6.2 on macOS 10.9

ronaldoussoren · ronaldoussoren · commit 2f019f4e25e5 · 2020-10-21T01:37:31.000-07:00
- __builtin_available is not present in the compiler, fall
  back to the ancient way of testing if a symbol is usable.
- Logic error code in pytime.c resulted in a compile error.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -55,7 +55,9 @@
  * In mixing the test with other tests or using negations will result in compile 
  * errors.
  */
-#if defined(__APPLE__) && defined(__has_builtin) && __has_builtin(__builtin_available)
+#if defined(__APPLE__) 
+
+#if defined(__has_builtin) && __has_builtin(__builtin_available)
 #  define HAVE_FSTATAT_RUNTIME __builtin_available(macOS 10.10, iOS 8.0, *)
 #  define HAVE_FACCESSAT_RUNTIME __builtin_available(macOS 10.10, iOS 8.0, *)
 #  define HAVE_FCHMODAT_RUNTIME __builtin_available(macOS 10.10, iOS 8.0, *)
@@ -72,7 +74,60 @@
 #  define HAVE_UTIMENSAT_RUNTIME __builtin_available(macOS 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *)
 #  define HAVE_PWRITEV_RUNTIME __builtin_available(macOS 11.0, iOS 14.0, tvOS 14.0, watchOS 7.0, *)
 
+#else /* Xcode 8 or earlier */
+
+#ifdef HAVE_FSTATAT
+#  define HAVE_FSTATAT_RUNTIME (fstatat != NULL)
+#endif
+
+#ifdef HAVE_FACCESSAT
+#  define HAVE_FACCESSAT_RUNTIME (faccessat != NULL)
+#endif
+
+#ifdef HAVE_FCHMODAT
+#  define HAVE_FCHMODAT_RUNTIME (fchmodat != NULL)
+#endif
+
+#ifdef HAVE_FCHOWNAT
+#  define HAVE_FCHOWNAT_RUNTIME (fchownat != NULL)
+#endif
+
+#ifdef HAVE_LINKAT
+#  define HAVE_LINKAT_RUNTIME (linkat != NULL)
+#endif
+
+#ifdef HAVE_FDOPENDIR
+#  define HAVE_FDOPENDIR_RUNTIME (fdopendir != NULL)
+#endif
+
+#ifdef HAVE_MKDIRAT
+#  define HAVE_MKDIRAT_RUNTIME (mkdirat != NULL)
+#endif
+
+#ifdef HAVE_RENAMEAT
+#  define HAVE_RENAMEAT_RUNTIME (renameat != NULL)
+#endif
+
+#ifdef HAVE_UNLINKAT
+#  define HAVE_UNLINKAT_RUNTIME (unlinkat != NULL)
+#endif
+
+#ifdef HAVE_OPENAT
+#  define HAVE_OPENAT_RUNTIME (openat != NULL)
+#endif
+
+#ifdef HAVE_READLINKAT
+#  define HAVE_READLINKAT_RUNTIME (readlinkat != NULL)
+#endif
+
+#ifdef HAVE_SYMLINKAT
+#  define HAVE_SYMLINKAT_RUNTIME (symlinkat != NULL)
+#endif
+
+#endif
+
 #ifdef HAVE_FUTIMESAT
+/* Some of the logic for weak linking depends on this assertion */
 # error "HAVE_FUTIMESAT unexpectedly defined"
 #endif
 
@@ -94,6 +149,7 @@
 #  define HAVE_PWRITEV_RUNTIME 1
 #endif
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/Python/pytime.c b/Python/pytime.c
@@ -750,7 +750,7 @@ pygettimeofday(_PyTime_t *tp, _Py_clock_info_t *info, int raise)
         info->adjustable = 1;
     }
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && defined(HAVE_CLOCK_GETTIME)
     } /* end of availibity block */
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ pygettimeofday(_PyTime_t tp, _Py_clock_info_t info, int raise)`
`750`	`750`	`info->adjustable = 1;`
`751`	`751`	`}`
`752`	`752`
`753`		`-#ifdef __APPLE__`
	`753`	`+#if defined(__APPLE__) && defined(HAVE_CLOCK_GETTIME)`
`754`	`754`	`} /* end of availibity block */`
`755`	`755`	`#endif`
`756`	`756`