From: Carlos O'Donell via Libc-alpha <libc-alpha@sourceware.org>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org
Subject: Re: [PATCH 26/30] Linux: Remove generic sysdep
Date: Tue, 6 Dec 2022 12:29:42 -0500 [thread overview]
Message-ID: <64f7973e-425c-4c78-9af3-c78425dc4fff@redhat.com> (raw)
In-Reply-To: <20221019221433.1082017-27-adhemerval.zanella@linaro.org>
On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> The includes chain is added on each architecture sysdep.h and
> the __NR__llseek hack is moved to lseek.c and lseek64.c.
LGTM.
No regressions on x86_64 and i686.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
> ---
> sysdeps/unix/sysv/linux/aarch64/sysdep.h | 3 ++-
> sysdeps/unix/sysv/linux/arc/sysdep.h | 4 +++-
> sysdeps/unix/sysv/linux/csky/sysdep.h | 2 +-
> sysdeps/unix/sysv/linux/generic/sysdep.h | 26 ----------------------
> sysdeps/unix/sysv/linux/loongarch/sysdep.h | 3 ++-
> sysdeps/unix/sysv/linux/lseek.c | 4 ++++
> sysdeps/unix/sysv/linux/lseek64.c | 4 ++++
> sysdeps/unix/sysv/linux/nios2/sysdep.h | 2 +-
> sysdeps/unix/sysv/linux/or1k/sysdep.h | 3 ++-
> sysdeps/unix/sysv/linux/riscv/sysdep.h | 3 ++-
> 10 files changed, 21 insertions(+), 33 deletions(-)
> delete mode 100644 sysdeps/unix/sysv/linux/generic/sysdep.h
>
> diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
> index f1853e012f..df5075aceb 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
> @@ -21,7 +21,8 @@
>
> #include <sysdeps/unix/sysdep.h>
> #include <sysdeps/aarch64/sysdep.h>
> -#include <sysdeps/unix/sysv/linux/generic/sysdep.h>
> +#include <sysdeps/unix/sysdep.h>
> +#include <sysdeps/unix/sysv/linux/sysdep.h>
>
> /* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO. */
> #include <dl-sysdep.h>
> diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.h b/sysdeps/unix/sysv/linux/arc/sysdep.h
> index d0c1a78381..90a92566a7 100644
> --- a/sysdeps/unix/sysv/linux/arc/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/arc/sysdep.h
> @@ -20,7 +20,9 @@
> #define _LINUX_ARC_SYSDEP_H 1
>
> #include <sysdeps/arc/sysdep.h>
> -#include <sysdeps/unix/sysv/linux/generic/sysdep.h>
> +#include <bits/wordsize.h>
> +#include <sysdeps/unix/sysdep.h>
> +#include <sysdeps/unix/sysv/linux/sysdep.h>
>
> /* "workarounds" for generic code needing to handle 64-bit time_t. */
>
> diff --git a/sysdeps/unix/sysv/linux/csky/sysdep.h b/sysdeps/unix/sysv/linux/csky/sysdep.h
> index 56c527fa8b..39c13c6d38 100644
> --- a/sysdeps/unix/sysv/linux/csky/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/csky/sysdep.h
> @@ -20,9 +20,9 @@
> #define _LINUX_CSKY_SYSDEP_H 1
>
> /* There is some commonality. */
> -#include <sysdeps/unix/sysv/linux/generic/sysdep.h>
> #include <sysdeps/unix/sysv/linux/sysdep.h>
> #include <sysdeps/csky/sysdep.h>
> +#include <sysdeps/unix/sysdep.h>
>
> /* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO. */
> #include <dl-sysdep.h>
> diff --git a/sysdeps/unix/sysv/linux/generic/sysdep.h b/sysdeps/unix/sysv/linux/generic/sysdep.h
> deleted file mode 100644
> index 7af5cb4e16..0000000000
> --- a/sysdeps/unix/sysv/linux/generic/sysdep.h
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> -
> - The GNU C Library is free software; you can redistribute it and/or
> - modify it under the terms of the GNU Lesser General Public
> - License as published by the Free Software Foundation; either
> - version 2.1 of the License, or (at your option) any later version.
> -
> - The GNU C Library is distributed in the hope that it will be useful,
> - but WITHOUT ANY WARRANTY; without even the implied warranty of
> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - Lesser General Public License for more details.
> -
> - You should have received a copy of the GNU Lesser General Public
> - License along with the GNU C Library. If not, see
> - <https://www.gnu.org/licenses/>. */
> -
> -#include <bits/wordsize.h>
> -#include <kernel-features.h>
> -#include <sysdeps/unix/sysdep.h>
> -#include <sysdeps/unix/sysv/linux/sysdep.h>
> -
> -/* Provide the common name to allow more code reuse. */
> -#ifdef __NR_llseek
> -# define __NR__llseek __NR_llseek
> -#endif
OK. Remove generic version and consolidate.
> diff --git a/sysdeps/unix/sysv/linux/loongarch/sysdep.h b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
> index f4a1d23a97..e2bb39a8f8 100644
> --- a/sysdeps/unix/sysv/linux/loongarch/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
> @@ -19,7 +19,8 @@
> #ifndef _LINUX_LOONGARCH_SYSDEP_H
> #define _LINUX_LOONGARCH_SYSDEP_H 1
>
> -#include <sysdeps/unix/sysv/linux/generic/sysdep.h>
> +#include <sysdeps/unix/sysv/linux/sysdep.h>
> +#include <sysdeps/unix/sysdep.h>
> #include <tls.h>
>
> #ifdef __ASSEMBLER__
> diff --git a/sysdeps/unix/sysv/linux/lseek.c b/sysdeps/unix/sysv/linux/lseek.c
> index 148503d7bc..3f10c8dc96 100644
> --- a/sysdeps/unix/sysv/linux/lseek.c
> +++ b/sysdeps/unix/sysv/linux/lseek.c
> @@ -41,6 +41,10 @@ static inline off_t lseek_overflow (loff_t res)
> off_t
> __lseek (int fd, off_t offset, int whence)
> {
> +#ifdef __NR_llseek
> +# define __NR__llseek __NR_llseek
> +#endif
OK. Agreed, good to move this here.
> +
> # ifdef __NR__llseek
> loff_t res;
> int rc = INLINE_SYSCALL_CALL (_llseek, fd,
> diff --git a/sysdeps/unix/sysv/linux/lseek64.c b/sysdeps/unix/sysv/linux/lseek64.c
> index 74aab82f5a..d14ba9e12b 100644
> --- a/sysdeps/unix/sysv/linux/lseek64.c
> +++ b/sysdeps/unix/sysv/linux/lseek64.c
> @@ -26,6 +26,10 @@
> off64_t
> __lseek64 (int fd, off64_t offset, int whence)
> {
> +#ifdef __NR_llseek
> +# define __NR__llseek __NR_llseek
> +#endif
OK. Agreed.
> +
> #ifdef __NR__llseek
> loff_t res;
> int rc = INLINE_SYSCALL_CALL (_llseek, fd,
> diff --git a/sysdeps/unix/sysv/linux/nios2/sysdep.h b/sysdeps/unix/sysv/linux/nios2/sysdep.h
> index 5fe960c2a5..4c9aba497b 100644
> --- a/sysdeps/unix/sysv/linux/nios2/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/nios2/sysdep.h
> @@ -19,9 +19,9 @@
> #ifndef _LINUX_NIOS2_SYSDEP_H
> #define _LINUX_NIOS2_SYSDEP_H 1
>
> +#include <sysdeps/unix/sysv/linux/sysdep.h>
> #include <sysdeps/unix/sysdep.h>
> #include <sysdeps/nios2/sysdep.h>
> -#include <sysdeps/unix/sysv/linux/generic/sysdep.h>
>
> /* For RTLD_PRIVATE_ERRNO. */
> #include <dl-sysdep.h>
> diff --git a/sysdeps/unix/sysv/linux/or1k/sysdep.h b/sysdeps/unix/sysv/linux/or1k/sysdep.h
> index 941c934554..fd884606ee 100644
> --- a/sysdeps/unix/sysv/linux/or1k/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/or1k/sysdep.h
> @@ -19,8 +19,9 @@
> #ifndef _LINUX_OR1K_SYSDEP_H
> #define _LINUX_OR1K_SYSDEP_H 1
>
> +#include <sysdeps/unix/sysv/linux/sysdep.h>
> #include <sysdeps/or1k/sysdep.h>
> -#include <sysdeps/unix/sysv/linux/generic/sysdep.h>
> +#include <sysdeps/unix/sysdep.h>
> #include <tls.h>
>
> /* "workarounds" for generic code needing to handle 64-bit time_t. */
> diff --git a/sysdeps/unix/sysv/linux/riscv/sysdep.h b/sysdeps/unix/sysv/linux/riscv/sysdep.h
> index 9b03b10567..c2c9b0c937 100644
> --- a/sysdeps/unix/sysv/linux/riscv/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/riscv/sysdep.h
> @@ -19,7 +19,8 @@
> #ifndef _LINUX_RISCV_SYSDEP_H
> #define _LINUX_RISCV_SYSDEP_H 1
>
> -#include <sysdeps/unix/sysv/linux/generic/sysdep.h>
> +#include <sysdeps/unix/sysv/linux/sysdep.h>
> +#include <sysdeps/unix/sysdep.h>
> #include <tls.h>
>
> #undef SYS_ify
--
Cheers,
Carlos.
next prev parent reply other threads:[~2022-12-06 17:30 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 22:14 [PATCH 00/30] Remove Linux generic sysdep Adhemerval Zanella via Libc-alpha
2022-10-19 22:14 ` [PATCH 01/30] linux: Fix generic struct_stat for 64 bit time (BZ# 29657) Adhemerval Zanella via Libc-alpha
2022-10-25 17:50 ` Joseph Myers
2022-12-05 16:39 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 02/30] linux: Consolidate dl-origin.c Adhemerval Zanella via Libc-alpha
2022-10-19 22:14 ` [PATCH 03/30] Linux: consolidate chmod implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:39 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 04/30] Linux: consolidate chown implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:40 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 05/30] Linux: consolidate dup2 implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:40 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 06/30] Lninux: consolidate epoll_create implementation Adhemerval Zanella via Libc-alpha
2022-10-21 8:57 ` Florian Weimer via Libc-alpha
2022-12-05 16:40 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 07/30] Linux: consolidate inotify_init implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:40 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 08/30] Linux: consolidate lchown implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:40 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 09/30] Linux: consolidate link implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:39 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 10/30] Linux: consolidate mkdir implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:40 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 11/30] Linux: consolidate readlink implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:39 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 12/30] Linux: consolidate rmdir implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:39 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 13/30] Linux: consolidate symlink implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:40 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 14/30] Linux: consolidate unlink implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:40 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 15/30] Linux: consolidate sendfile implementation Adhemerval Zanella via Libc-alpha
2022-12-05 16:39 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 16/30] Linux: Move wordsize-32 Version to default Adhemerval Zanella via Libc-alpha
2022-12-05 16:40 ` Carlos O'Donell via Libc-alpha
2022-12-07 0:10 ` Joseph Myers
2022-12-07 20:19 ` Adhemerval Zanella Netto via Libc-alpha
2022-10-19 22:14 ` [PATCH 17/30] Linux: consolidate ____longjmp_chk Adhemerval Zanella via Libc-alpha
2022-12-05 16:40 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 18/30] Linux: Assume and consolidate bind wire-up syscall Adhemerval Zanella via Libc-alpha
2022-12-05 16:39 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 19/30] Linux: Assume iand consolidate socket " Adhemerval Zanella via Libc-alpha
2022-12-05 16:39 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 20/30] Linux: Assume and consolidate socketpair " Adhemerval Zanella via Libc-alpha
2022-12-06 16:15 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 21/30] Linux: Assume and consolidate listen " Adhemerval Zanella via Libc-alpha
2022-12-06 16:17 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 22/30] Linux: Assume and consolidate getsockname " Adhemerval Zanella via Libc-alpha
2022-10-20 0:01 ` Joseph Myers
2022-10-20 18:12 ` Adhemerval Zanella Netto via Libc-alpha
2022-12-06 16:18 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 23/30] Linux: Assume and consolidate getpeername " Adhemerval Zanella via Libc-alpha
2022-10-20 0:02 ` Joseph Myers
2022-12-06 16:20 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 24/30] Linux: Assume and consolidate shutdown " Adhemerval Zanella via Libc-alpha
2022-12-06 16:23 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 25/30] Linux: Remove unused generic Makefile Adhemerval Zanella via Libc-alpha
2022-12-06 17:24 ` Carlos O'Donell via Libc-alpha
2022-12-07 21:19 ` Adhemerval Zanella Netto via Libc-alpha
2022-10-19 22:14 ` [PATCH 26/30] Linux: Remove generic sysdep Adhemerval Zanella via Libc-alpha
2022-12-06 17:29 ` Carlos O'Donell via Libc-alpha [this message]
2022-10-19 22:14 ` [PATCH 27/30] Linux: make generic xstatver.h the default one Adhemerval Zanella via Libc-alpha
2022-12-06 17:33 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 28/30] Linux: Make generic fcntl.h " Adhemerval Zanella via Libc-alpha
2022-12-06 17:36 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 29/30] Linux: Consolidate typesizes.h Adhemerval Zanella via Libc-alpha
2022-12-06 17:47 ` Carlos O'Donell via Libc-alpha
2022-10-19 22:14 ` [PATCH 30/30] Linux: Remove generic Implies Adhemerval Zanella via Libc-alpha
2022-12-06 17:50 ` Carlos O'Donell via Libc-alpha
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=64f7973e-425c-4c78-9af3-c78425dc4fff@redhat.com \
--to=libc-alpha@sourceware.org \
--cc=adhemerval.zanella@linaro.org \
--cc=carlos@redhat.com \
/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).