meta-microblaze: Move to glibc backport

Move to a backport of the official fix for glibc BZ #28883.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

3 files changed, 35 insertions, 51 deletions

diff --git a/meta-microblaze/recipes-core/glibc/files/0001-microblaze-Use-the-correct-select-syscall-BZ-28883.patch b/meta-microblaze/recipes-core/glibc/files/0001-microblaze-Use-the-correct-select-syscall-BZ-28883.patch
new file mode 100644
index 00000000..aaaa0fc1
--- /dev/null
+++ b/meta-microblaze/recipes-core/glibc/files/0001-microblaze-Use-the-correct-select-syscall-BZ-28883.patch
@@ -0,0 +1,34 @@
+From bbe199b27aa52fc407db3372af00c3e9ffa20d1d Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Wed, 16 Feb 2022 13:51:42 -0300
+Subject: [PATCH] microblaze: Use the correct select syscall (BZ #28883)
+
+On Microblaze only __NR_newselect is implemented, even though kernel
+advertise __NR_select on asm/unistd.h.  Since microblaze is the
+only architecture that undef __ASSUME_PSELECT, the generic code
+change is simpler than chaging the architecture syscall number.
+
+Upstream-Status: Backport [https://sourceware.org/git/?p=glibc.git;a=commit;h=bbe199b27aa52fc407db3372af00c3e9ffa20d1d]
+
+Acked-by: Mark Hatle <mark.hatle@xilinx.com>
+Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
+---
+ sysdeps/unix/sysv/linux/select.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysdeps/unix/sysv/linux/select.c b/sysdeps/unix/sysv/linux/select.c
+index 3bc8b0cc3d..a3f0a2eba7 100644
+--- a/sysdeps/unix/sysv/linux/select.c
++++ b/sysdeps/unix/sysv/linux/select.c
+@@ -108,7 +108,7 @@ __select64 (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+       ptv32 = &tv32;
+     }
+ 
+-  int r = SYSCALL_CANCEL (select, nfds, readfds, writefds, exceptfds, ptv32);
++  int r = SYSCALL_CANCEL (_newselect, nfds, readfds, writefds, exceptfds, ptv32);
+   if (timeout != NULL)
+     *timeout = valid_timeval_to_timeval64 (tv32);
+   return r;
+-- 
+2.17.1
+
diff --git a/meta-microblaze/recipes-core/glibc/files/select-use-newselect-syscall.patch b/meta-microblaze/recipes-core/glibc/files/select-use-newselect-syscall.patch
deleted file mode 100644
index 04231f0a..00000000
--- a/meta-microblaze/recipes-core/glibc/files/select-use-newselect-syscall.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Restore newselect syscall override of select syscall
-
-Commit 4c3df0eba5e8fe98f0de917ade9b2ebba6951c5f removed the check and override
-of select syscall with newselect if newselect was defined.
-
-This code path, using select instead of pselect is only executed when
-ASSUME_PSELECT is not enabled.  This happens on microblaze when the
-kernel version is set below 3.15.
-
-On Microblaze select is not implemented, only newselect is.  So this automatic
-conversion from select to newselect syscall is expected.  The original
-implementation of the select to newselect syscall was part of:
-
-  commit 26f28fd73d20df8847d93f88b6e2a7bd3bd9bf51
-  Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-  Date:   Fri Nov 18 14:27:03 2016 -0200
-
-    Consolidate Linux select implementation
-    
-    This patch consolidates the select Linux syscall implementation on
-    sysdeps/unix/sysv/linux/select.c.  The changes are:
-    
-      1. Remove select from auto-generation syscalls.list on the architecture
-         that uses __NR_select.
-      2. Remove generic implementation add a default one that handle all
-         current cases (with the expection of alpha)
-         The new default implementation will either use __NR_select if
-         available of fallback to __NR_pselect6 otherwise.
-      3. Add a alpha outlier implementation which requires old compatibility
-         symbols.
-
-Upstream-Status: Submitted [https://sourceware.org/bugzilla/show_bug.cgi?id=28883]
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-
-diff --git a/sysdeps/unix/sysv/linux/select.c b/sysdeps/unix/sysv/linux/select.c
-index da25b4b4cfe..0f4c67aa29e 100644
---- a/sysdeps/unix/sysv/linux/select.c
-+++ b/sysdeps/unix/sysv/linux/select.c
-@@ -101,6 +116,10 @@ __select64 (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
-     TIMESPEC_TO_TIMEVAL (timeout, pts32);
-   return r;
- # else
-+#  ifdef __NR__newselect
-+#   undef __NR_select
-+#   define __NR_select __NR__newselect
-+#  endif
-   struct timeval tv32, *ptv32 = NULL;
-   if (pts64 != NULL)
-     {
diff --git a/meta-microblaze/recipes-core/glibc/microblaze-glibc.inc b/meta-microblaze/recipes-core/glibc/microblaze-glibc.inc
index f7820f24..1dbb0a64 100644
--- a/meta-microblaze/recipes-core/glibc/microblaze-glibc.inc
+++ b/meta-microblaze/recipes-core/glibc/microblaze-glibc.inc
@@ -2,6 +2,6 @@
 FILESEXTRAPATHS:append:microblaze := ":${THISDIR}/files"
 
 SRC_URI:append:microblaze = " \
-        file://select-use-newselect-syscall.patch \
+        file://0001-microblaze-Use-the-correct-select-syscall-BZ-28883.patch \
         file://0001-microblaze-Add-missing-implementation-when-__ASSUME_.patch \
 "