mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 17:53:37 +08:00
Linux: Remove generic sysdep
The includes chain is added on each architecture sysdep.h and the __NR__llseek hack is moved to lseek.c and lseek64.c. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
parent
127945c561
commit
71e4344f25
@ -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>
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user