From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 04D463858C60; Tue, 28 Dec 2021 12:25:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 04D463858C60 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] microblaze: Add missing implementation when !__ASSUME_TIME64_SYSCALLS X-Act-Checkin: glibc X-Git-Author: Thomas Petazzoni X-Git-Refname: refs/heads/master X-Git-Oldrev: 484e672ddabe0a919a692520e6ac8f2580866235 X-Git-Newrev: c75aa9246a8cfc814d99cf5f58229177bd69fc4f Message-Id: <20211228122540.04D463858C60@sourceware.org> Date: Tue, 28 Dec 2021 12:25:40 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Dec 2021 12:25:40 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c75aa9246a8cfc814d99cf5f58229177bd69fc4f commit c75aa9246a8cfc814d99cf5f58229177bd69fc4f Author: Thomas Petazzoni Date: Tue Dec 28 09:09:49 2021 -0300 microblaze: Add missing implementation when !__ASSUME_TIME64_SYSCALLS In commit a92f4e6299fe0e3cb6f77e79de00817aece501ce ("linux: Add time64 pselect support"), a Microblaze specific implementation of __pselect32() was added to cover the case of kernels < 3.15 which lack the pselect6 system call. This new file sysdeps/unix/sysv/linux/microblaze/pselect32.c takes precedence over the default implementation sysdeps/unix/sysv/linux/pselect32.c. However sysdeps/unix/sysv/linux/pselect32.c provides an implementation of __pselect32() which is needed when __ASSUME_TIME64_SYSCALLS is not defined. On Microblaze, which is a 32-bit architecture, __ASSUME_TIME64_SYSCALLS is only true for kernels >= 5.1. Due to sysdeps/unix/sysv/linux/microblaze/pselect32.c taking precedence over sysdeps/unix/sysv/linux/pselect32.c, it means that when we are with a kernel >= 3.15 but < 5.1, we need a __pselect32() implementation, but sysdeps/unix/sysv/linux/microblaze/pselect32.c doesn't provide it, and sysdeps/unix/sysv/linux/pselect32.c which would provide it is not compiled in. This causes the following build failure on Microblaze with for example Linux kernel headers 4.9: [...]/build/libc_pic.os: in function `__pselect64': (.text+0x120b44): undefined reference to `__pselect32' collect2: error: ld returned 1 exit status Signed-off-by: Thomas Petazzoni Reviewed-by: Adhemerval Zanella Diff: --- sysdeps/unix/sysv/linux/microblaze/pselect32.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/microblaze/pselect32.c b/sysdeps/unix/sysv/linux/microblaze/pselect32.c index 70b7b52a48..dd9d56ba29 100644 --- a/sysdeps/unix/sysv/linux/microblaze/pselect32.c +++ b/sysdeps/unix/sysv/linux/microblaze/pselect32.c @@ -22,7 +22,9 @@ #include #include -#ifndef __ASSUME_PSELECT +#ifndef __ASSUME_TIME64_SYSCALL +#include +#elif !defined __ASSUME_PSELECT int __pselect32 (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, const struct __timespec64 *timeout,