From 3260d550ad21e8654155668d78528007ba2a1553 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 25 Jan 2024 20:17:33 +0100 Subject: [PATCH] Resolve conflicts for functions introduced in Android API level 30. * doc/glibc-functions/memfd_create.texi: Mention the Android API levels. * doc/glibc-functions/mlock2.texi: Likewise. * doc/glibc-functions/pthread_cond_clockwait.texi: Likewise. * doc/glibc-functions/pthread_mutex_clocklock.texi: Likewise. * doc/glibc-functions/pthread_rwlock_clockrdlock.texi: Likewise. * doc/glibc-functions/pthread_rwlock_clockwrlock.texi: Likewise. * doc/glibc-functions/renameat2.texi: Likewise. * doc/glibc-functions/sem_clockwait.texi: Likewise. * doc/glibc-functions/statx.texi: Likewise. --- ChangeLog | 10 ++++++++++ doc/glibc-functions/memfd_create.texi | 2 +- doc/glibc-functions/mlock2.texi | 4 ++-- doc/glibc-functions/pthread_cond_clockwait.texi | 4 ++-- doc/glibc-functions/pthread_mutex_clocklock.texi | 4 ++-- doc/glibc-functions/pthread_rwlock_clockrdlock.texi | 4 ++-- doc/glibc-functions/pthread_rwlock_clockwrlock.texi | 4 ++-- doc/glibc-functions/renameat2.texi | 4 ++-- doc/glibc-functions/sem_clockwait.texi | 4 ++-- doc/glibc-functions/statx.texi | 4 ++-- 10 files changed, 27 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39bb69bb4e..0500ac1751 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,16 @@ Resolve conflicts for functions introduced in Android API level 30. + * doc/glibc-functions/memfd_create.texi: Mention the Android API levels. + * doc/glibc-functions/mlock2.texi: Likewise. + * doc/glibc-functions/pthread_cond_clockwait.texi: Likewise. + * doc/glibc-functions/pthread_mutex_clocklock.texi: Likewise. + * doc/glibc-functions/pthread_rwlock_clockrdlock.texi: Likewise. + * doc/glibc-functions/pthread_rwlock_clockwrlock.texi: Likewise. + * doc/glibc-functions/renameat2.texi: Likewise. + * doc/glibc-functions/sem_clockwait.texi: Likewise. + * doc/glibc-functions/statx.texi: Likewise. + * lib/threads.in.h (thrd_sleep): Consider REPLACE_THRD_SLEEP. (thrd_yield): Consider REPLACE_THRD_YIELD. (mtx_init): Consider REPLACE_MTX_INIT. diff --git a/doc/glibc-functions/memfd_create.texi b/doc/glibc-functions/memfd_create.texi index b3852a5b55..0192869dae 100644 --- a/doc/glibc-functions/memfd_create.texi +++ b/doc/glibc-functions/memfd_create.texi @@ -26,5 +26,5 @@ Portability problems not fixed by Gnulib: @item This function exists only on Linux and FreeBSD and is therefore missing on many non-glibc platforms: -glibc 2.26, macOS 11.1, FreeBSD 12.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. +glibc 2.26, macOS 11.1, FreeBSD 12.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android API level 29. @end itemize diff --git a/doc/glibc-functions/mlock2.texi b/doc/glibc-functions/mlock2.texi index 697b4877f8..88826f411f 100644 --- a/doc/glibc-functions/mlock2.texi +++ b/doc/glibc-functions/mlock2.texi @@ -25,6 +25,6 @@ Portability problems not fixed by Gnulib: @itemize @item This function exists only on Linux and is therefore -missing on all non-glibc platforms: -glibc 2.26, macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. +missing on many platforms: +glibc 2.26, macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android API level 29. @end itemize diff --git a/doc/glibc-functions/pthread_cond_clockwait.texi b/doc/glibc-functions/pthread_cond_clockwait.texi index 9c3eabc53f..95c2d22bfe 100644 --- a/doc/glibc-functions/pthread_cond_clockwait.texi +++ b/doc/glibc-functions/pthread_cond_clockwait.texi @@ -22,6 +22,6 @@ Portability problems fixed by Gnulib: Portability problems not fixed by Gnulib: @itemize @item -This function is missing on all non-glibc platforms: -macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. +This function is missing on many platforms: +macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android API level 29. @end itemize diff --git a/doc/glibc-functions/pthread_mutex_clocklock.texi b/doc/glibc-functions/pthread_mutex_clocklock.texi index 466c9f720c..06dd84c8a8 100644 --- a/doc/glibc-functions/pthread_mutex_clocklock.texi +++ b/doc/glibc-functions/pthread_mutex_clocklock.texi @@ -13,6 +13,6 @@ Portability problems fixed by Gnulib: Portability problems not fixed by Gnulib: @itemize @item -This function is missing on all non-glibc platforms: -macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. +This function is missing on many platforms: +macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android API level 29. @end itemize diff --git a/doc/glibc-functions/pthread_rwlock_clockrdlock.texi b/doc/glibc-functions/pthread_rwlock_clockrdlock.texi index efde9e68c9..5c5ba934f8 100644 --- a/doc/glibc-functions/pthread_rwlock_clockrdlock.texi +++ b/doc/glibc-functions/pthread_rwlock_clockrdlock.texi @@ -22,6 +22,6 @@ Portability problems fixed by Gnulib: Portability problems not fixed by Gnulib: @itemize @item -This function is missing on all non-glibc platforms: -macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. +This function is missing on many platforms: +macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android API level 29. @end itemize diff --git a/doc/glibc-functions/pthread_rwlock_clockwrlock.texi b/doc/glibc-functions/pthread_rwlock_clockwrlock.texi index 01e47dc08e..a980c97d2a 100644 --- a/doc/glibc-functions/pthread_rwlock_clockwrlock.texi +++ b/doc/glibc-functions/pthread_rwlock_clockwrlock.texi @@ -22,6 +22,6 @@ Portability problems fixed by Gnulib: Portability problems not fixed by Gnulib: @itemize @item -This function is missing on all non-glibc platforms: -macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. +This function is missing on many platforms: +macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android API level 29. @end itemize diff --git a/doc/glibc-functions/renameat2.texi b/doc/glibc-functions/renameat2.texi index b845a43a27..a59b797260 100644 --- a/doc/glibc-functions/renameat2.texi +++ b/doc/glibc-functions/renameat2.texi @@ -14,6 +14,6 @@ Portability problems not fixed by Gnulib: @itemize @item This function exists only on Linux and is therefore -missing on all non-glibc platforms: -glibc 2.27, macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.4, Cygwin 1.7.x, mingw, MSVC 14, Android 9.0. +missing on many platforms: +glibc 2.27, macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.4, Cygwin 1.7.x, mingw, MSVC 14, Android API level 29. @end itemize diff --git a/doc/glibc-functions/sem_clockwait.texi b/doc/glibc-functions/sem_clockwait.texi index e846f3c2b3..8b418dfe8b 100644 --- a/doc/glibc-functions/sem_clockwait.texi +++ b/doc/glibc-functions/sem_clockwait.texi @@ -22,6 +22,6 @@ Portability problems fixed by Gnulib: Portability problems not fixed by Gnulib: @itemize @item -This function is missing on all non-glibc platforms: -macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. +This function is missing on many platforms: +macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 5.1, HP-UX 11, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android API level 29. @end itemize diff --git a/doc/glibc-functions/statx.texi b/doc/glibc-functions/statx.texi index 0218e8bebb..cd32c608f4 100644 --- a/doc/glibc-functions/statx.texi +++ b/doc/glibc-functions/statx.texi @@ -13,8 +13,8 @@ Portability problems fixed by Gnulib: Portability problems not fixed by Gnulib: @itemize @item -This function is missing on all non-glibc platforms: -glibc 2.27, macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android 9.0. +This function is missing on many platforms: +glibc 2.27, macOS 11.1, FreeBSD 14.0, NetBSD 9.0, OpenBSD 6.7, Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.4, Cygwin 2.9, mingw, MSVC 14, Android API level 29. @item There is an incompatible function of the same name on some platforms: AIX 5.2 or newer. -- 2.39.5