[26/30] Linux: Remove generic sysdep
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
The includes chain is added on each architecture sysdep.h and
the __NR__llseek hack is moved to lseek.c and lseek64.c.
---
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
Comments
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
@@ -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>
@@ -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. */
@@ -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>
deleted file mode 100644
@@ -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
@@ -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__
@@ -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
+
# ifdef __NR__llseek
loff_t res;
int rc = INLINE_SYSCALL_CALL (_llseek, fd,
@@ -26,6 +26,10 @@
off64_t
__lseek64 (int fd, off64_t offset, int whence)
{
+#ifdef __NR_llseek
+# define __NR__llseek __NR_llseek
+#endif
+
#ifdef __NR__llseek
loff_t res;
int rc = INLINE_SYSCALL_CALL (_llseek, fd,
@@ -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>
@@ -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. */
@@ -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