From: Paul Eggert Date: Tue, 21 Dec 2021 23:24:03 +0000 (-0800) Subject: maint: fix __clang_major__ misspellings X-Git-Tag: v1.0~2500 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=becd51839b868d6c9be6b413f93773f3701a2d3b;p=gnulib.git maint: fix __clang_major__ misspellings The intprops.h typo fix should fix a bug in Emacs on Debian testing with clang . * lib/asyncsafe-spin.c, lib/intprops.h, lib/pthread-spin.c: Fix some misspellings of ‘__clang_major__’. I left one misspelling alone, in lib/cdefs.h, and instead reported that bug upstream here: https://sourceware.org/pipermail/libc-alpha/2021-December/134512.html --- diff --git a/ChangeLog b/ChangeLog index 9c5b479082..2436a49133 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2021-12-21 Paul Eggert + + maint: fix __clang_major__ misspellings + The intprops.h typo fix should fix a bug in Emacs on Debian testing + with clang . + * lib/asyncsafe-spin.c, lib/intprops.h, lib/pthread-spin.c: + Fix some misspellings of ‘__clang_major__’. + I left one misspelling alone, in lib/cdefs.h, + and instead reported that bug upstream here: + https://sourceware.org/pipermail/libc-alpha/2021-December/134512.html + 2021-12-21 Bruno Haible get_ppid_of, get_progname_of: Fix runtime error on Mac OS X < 10.5. diff --git a/lib/asyncsafe-spin.c b/lib/asyncsafe-spin.c index 3771c4c0e4..f14f5f11c9 100644 --- a/lib/asyncsafe-spin.c +++ b/lib/asyncsafe-spin.c @@ -72,7 +72,7 @@ asyncsafe_spin_destroy (asyncsafe_spinlock_t *lock) require to link with -latomic. */ # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) \ - || __clang_major > 3 || (__clang_major__ == 3 && __clang_minor__ >= 1)) \ + || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 1)) \ && !defined __ibmxl__ /* Use GCC built-ins (available in GCC >= 4.7 and clang >= 3.1) that operate on the first byte of the lock. diff --git a/lib/intprops.h b/lib/intprops.h index 7f20f09fa0..a10d793e0a 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -240,7 +240,7 @@ #endif /* True if __builtin_mul_overflow (A, B, P) works when P is non-null. */ -#if defined __clang_major_ && __clang_major__ < 14 +#if defined __clang_major__ && __clang_major__ < 14 /* Work around Clang bug . */ # define _GL_HAS_BUILTIN_MUL_OVERFLOW 0 #else diff --git a/lib/pthread-spin.c b/lib/pthread-spin.c index a82437c834..2c57e4e6b3 100644 --- a/lib/pthread-spin.c +++ b/lib/pthread-spin.c @@ -69,7 +69,7 @@ pthread_spin_destroy (pthread_spinlock_t *lock) require to link with -latomic. */ # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) \ - || __clang_major > 3 || (__clang_major__ == 3 && __clang_minor__ >= 1)) \ + || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 1)) \ && !defined __ibmxl__ /* Use GCC built-ins (available in GCC >= 4.7 and clang >= 3.1) that operate on the first byte of the lock.