diff options
| author | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2021-12-28 09:09:49 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-12-28 09:09:49 -0300 |
| commit | c75aa9246a8cfc814d99cf5f58229177bd69fc4f (patch) | |
| tree | 39b10d1954a628d12b713a4ffdf4d5f154cd44ba | |
| parent | 484e672ddabe0a919a692520e6ac8f2580866235 (diff) | |
| download | glibc-c75aa9246a8cfc814d99cf5f58229177bd69fc4f.tar.gz glibc-c75aa9246a8cfc814d99cf5f58229177bd69fc4f.tar.xz glibc-c75aa9246a8cfc814d99cf5f58229177bd69fc4f.zip | |
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 <thomas.petazzoni@bootlin.com>
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| -rw-r--r-- | sysdeps/unix/sysv/linux/microblaze/pselect32.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 <sys/poll.h> #include <sysdep-cancel.h> -#ifndef __ASSUME_PSELECT +#ifndef __ASSUME_TIME64_SYSCALL +#include <sysdeps/unix/sysv/linux/pselect32.c> +#elif !defined __ASSUME_PSELECT int __pselect32 (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, const struct __timespec64 *timeout, |