From: Bruno Haible Date: Wed, 11 Jan 2023 17:06:09 +0000 (+0100) Subject: Fix link errors on Android 4.3: Limit last change to builds with GCC. X-Git-Tag: v1.0~1859 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d11822bc5f46b0e841f34d728f2344a0d3261acc;p=gnulib.git Fix link errors on Android 4.3: Limit last change to builds with GCC. --- diff --git a/ChangeLog b/ChangeLog index 4d632915b7..9045623e99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ 2023-01-11 Bruno Haible Fix link errors on Android 4.3. - * lib/asyncsafe-spin.c: Don't use the GCC >= 4.1 builtins on Android. + * lib/asyncsafe-spin.c: Don't use the GCC >= 4.1 builtins on Android, + when building with GCC. * lib/pthread-spin.c: Likewise. * lib/simple-atomic.c: Likewise. diff --git a/lib/asyncsafe-spin.c b/lib/asyncsafe-spin.c index 66e1669924..9964473828 100644 --- a/lib/asyncsafe-spin.c +++ b/lib/asyncsafe-spin.c @@ -134,9 +134,9 @@ do_unlock (asyncsafe_spinlock_t *lock) # endif # elif (((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) \ - && !defined __sparc__) \ + && !defined __sparc__ && !defined __ANDROID__) \ || __clang_major__ >= 3) \ - && !defined __ibmxl__ && !defined __ANDROID__ + && !defined __ibmxl__ /* Use GCC built-ins (available in GCC >= 4.1, except on SPARC, and clang >= 3.0). Documentation: diff --git a/lib/pthread-spin.c b/lib/pthread-spin.c index e551f733cf..4031975f0b 100644 --- a/lib/pthread-spin.c +++ b/lib/pthread-spin.c @@ -162,9 +162,10 @@ pthread_spin_destroy (pthread_spinlock_t *lock) return 0; } -# elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) \ +# elif (((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) \ + && !defined __ANDROID__) \ || __clang_major__ >= 3) \ - && !defined __ibmxl__ && !defined __ANDROID__ + && !defined __ibmxl__ /* Use GCC built-ins (available in GCC >= 4.1 and clang >= 3.0). Documentation: */ diff --git a/lib/simple-atomic.c b/lib/simple-atomic.c index ffa126613c..eab87a3ec2 100644 --- a/lib/simple-atomic.c +++ b/lib/simple-atomic.c @@ -67,9 +67,9 @@ atomic_compare_and_swap_ptr (uintptr_t volatile *vp, require to link with -latomic. */ # if (((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) \ - && !defined __sparc__) \ + && !defined __sparc__ && !defined __ANDROID__) \ || __clang_major__ >= 3) \ - && !defined __ibmxl__ && !defined __ANDROID__ + && !defined __ibmxl__ /* Use GCC built-ins (available in GCC >= 4.1, except on SPARC, and clang >= 3.0). Documentation: