public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] microblaze: Add missing implementation when !__ASSUME_TIME64_SYSCALLS
Date: Tue, 28 Dec 2021 12:25:40 +0000 (GMT)	[thread overview]
Message-ID: <20211228122540.04D463858C60@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c75aa9246a8cfc814d99cf5f58229177bd69fc4f

commit c75aa9246a8cfc814d99cf5f58229177bd69fc4f
Author: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
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 <thomas.petazzoni@bootlin.com>
    Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

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 <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,


                 reply	other threads:[~2021-12-28 12:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211228122540.04D463858C60@sourceware.org \
    --to=azanella@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).