Explorar el Código

atomic: Switch to _SDL_HAS_BUILTIN to detect __atomic_load_n

Cameron Gutman hace 1 día
padre
commit
cf5f7965df
Se han modificado 1 ficheros con 3 adiciones y 7 borrados
  1. 3 7
      src/atomic/SDL_atomic.c

+ 3 - 7
src/atomic/SDL_atomic.c

@@ -36,19 +36,15 @@
 #endif
 #endif
 
 
 /* The __atomic_load_n() intrinsic showed up in different times for different compilers. */
 /* The __atomic_load_n() intrinsic showed up in different times for different compilers. */
-#if defined(__clang__)
-#if __has_builtin(__atomic_load_n) || defined(HAVE_GCC_ATOMICS)
+#if defined(__GNUC__) && (__GNUC__ >= 5)
+#define HAVE_ATOMIC_LOAD_N 1
+#elif _SDL_HAS_BUILTIN(__atomic_load_n) || (defined(__clang__) && defined(HAVE_GCC_ATOMICS))
 /* !!! FIXME: this advertises as available in the NDK but uses an external symbol we don't have.
 /* !!! FIXME: this advertises as available in the NDK but uses an external symbol we don't have.
    It might be in a later NDK or we might need an extra library? --ryan. */
    It might be in a later NDK or we might need an extra library? --ryan. */
 #if !defined(__ANDROID__)
 #if !defined(__ANDROID__)
 #define HAVE_ATOMIC_LOAD_N 1
 #define HAVE_ATOMIC_LOAD_N 1
 #endif
 #endif
 #endif
 #endif
-#elif defined(__GNUC__)
-#if (__GNUC__ >= 5)
-#define HAVE_ATOMIC_LOAD_N 1
-#endif
-#endif
 
 
 /* *INDENT-OFF* */ /* clang-format off */
 /* *INDENT-OFF* */ /* clang-format off */
 #if defined(__WATCOMC__) && defined(__386__)
 #if defined(__WATCOMC__) && defined(__386__)