From 958f238f3619373d3dbc106d3cda3c467b3419b1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 26 May 1999 23:37:38 +0000 Subject: Update. 1999-05-26 Ulrich Drepper * config.h.in: Add __LINUX_KERNEL_VERSION. * configure.in: Recognize --enable-kernel. * sysdeps/unix/sysv/linux/configure.in: Check for correct kernel headers if --enable-kernel is given and set __LINUX_KERNEL_VERSION appropriately. * sysdeps/unix/sysv/linux/init-first.c: If minimal kernel version is given perform runtime test. * sysdeps/unix/sysv/linux/kernel-features.h: New file. * sysdeps/unix/sysv/linux/getcwd.c: Elide compatibility code if minimal supported kernel is known to have the feature. * sysdeps/unix/sysv/linux/poll.c: Likewise. * sysdeps/unix/sysv/linux/pread.c: Likewise. * sysdeps/unix/sysv/linux/pread64.c: Likewise. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/seteuid.c: Likewise. * sysdeps/unix/sysv/linux/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/testrtsig.h: Likewise. * sysdeps/unix/sysv/linux/i386/chown.c: Likewise. * sysdeps/unix/sysv/linux/i386/pread.c: Likewise. * sysdeps/unix/sysv/linux/i386/pread64.c: Likewise. * sysdeps/unix/sysv/linux/i386/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/i386/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/sysctl.c: Add __sysctl alias. --- sysdeps/unix/sysv/linux/i386/chown.c | 14 ++++++++++---- sysdeps/unix/sysv/linux/i386/pread.c | 17 +++++++++++++---- sysdeps/unix/sysv/linux/i386/pread64.c | 18 ++++++++++++------ sysdeps/unix/sysv/linux/i386/pwrite.c | 17 +++++++++++++---- sysdeps/unix/sysv/linux/i386/pwrite64.c | 17 +++++++++++++---- 5 files changed, 61 insertions(+), 22 deletions(-) (limited to 'sysdeps/unix/sysv/linux/i386') diff --git a/sysdeps/unix/sysv/linux/i386/chown.c b/sysdeps/unix/sysv/linux/i386/chown.c index 3776a44..9ab03e3 100644 --- a/sysdeps/unix/sysv/linux/i386/chown.c +++ b/sysdeps/unix/sysv/linux/i386/chown.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999 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 @@ -22,6 +22,8 @@ #include #include +#include + /* In Linux 2.1.x the chown functions have been changed. A new function lchown was introduced. The new chown now follows symlinks - the old chown and the @@ -34,14 +36,15 @@ extern int __syscall_chown (const char *__file, uid_t __owner, gid_t __group); -#ifdef __NR_lchown +#if defined __NR_lchown || __ASSUME_LCHOWN_SYSCALL > 0 /* Running under Linux > 2.1.80. */ -static int __libc_old_chown; int __real_chown (const char *file, uid_t owner, gid_t group) { +# if __ASSUME_LCHOWN_SYSCALL == 0 + static int __libc_old_chown; int result; if (!__libc_old_chown) @@ -57,11 +60,14 @@ __real_chown (const char *file, uid_t owner, gid_t group) } return __lchown (file, owner, group); +# else + return INLINE_SYSCALL (chown, 3, file, owner, group); +# endif } #endif -#ifndef __NR_lchown +#if !defined __NR_lchown && __ASSUME_LCHOWN_SYSCALL == 0 /* Compiling under older kernels. */ int __chown_is_lchown (const char *file, uid_t owner, gid_t group) diff --git a/sysdeps/unix/sysv/linux/i386/pread.c b/sysdeps/unix/sysv/linux/i386/pread.c index 4c2f18d..5745648 100644 --- a/sysdeps/unix/sysv/linux/i386/pread.c +++ b/sysdeps/unix/sysv/linux/i386/pread.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -23,10 +23,14 @@ #include #include -#ifdef __NR_pread +#include +#if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0 + +# if __ASSUME_PREAD_SYSCALL == 0 static ssize_t __emulate_pread (int fd, void *buf, size_t count, off_t offset) internal_function; +# endif ssize_t @@ -40,16 +44,21 @@ __pread (fd, buf, count, offset) /* First try the syscall. */ result = INLINE_SYSCALL (pread, 5, fd, buf, count, offset, 0); +# if __ASSUME_PREAD_SYSCALL == 0 if (result == -1 && errno == ENOSYS) /* No system call available. Use the emulation. */ result = __emulate_pread (fd, buf, count, offset); +# endif return result; } weak_alias (__pread, pread) -#define __pread(fd, buf, count, offset) \ +# define __pread(fd, buf, count, offset) \ static internal_function __emulate_pread (fd, buf, count, offset) #endif -#include + +#if __ASSUME_PREAD_SYSCALL == 0 +# include +#endif diff --git a/sysdeps/unix/sysv/linux/i386/pread64.c b/sysdeps/unix/sysv/linux/i386/pread64.c index 8cfb3c0..aa0c54d 100644 --- a/sysdeps/unix/sysv/linux/i386/pread64.c +++ b/sysdeps/unix/sysv/linux/i386/pread64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -23,13 +23,14 @@ #include #include -#ifdef __NR_pread +#include -extern ssize_t __syscall_pread64 (int fd, void *buf, size_t count, - off_t offset_hi, off_t offset_lo); +#if defined __NR_pread || __ASSUME_PREAD_SYSCALL > 0 +# if __ASSUME_PREAD_SYSCALL == 0 static ssize_t __emulate_pread64 (int fd, void *buf, size_t count, off64_t offset) internal_function; +# endif ssize_t @@ -45,16 +46,21 @@ __pread64 (fd, buf, count, offset) result = INLINE_SYSCALL (pread, 5, fd, buf, count, (off_t) (offset & 0xffffffff), (off_t) (offset >> 32)); +# if __ASSUME_PREAD_SYSCALL == 0 if (result == -1 && errno == ENOSYS) /* No system call available. Use the emulation. */ result = __emulate_pread64 (fd, buf, count, offset); +# endif return result; } weak_alias (__pread64, pread64) -#define __pread64(fd, buf, count, offset) \ +# define __pread64(fd, buf, count, offset) \ static internal_function __emulate_pread64 (fd, buf, count, offset) #endif -#include + +#if __ASSUME_PREAD_SYSCALL == 0 +# include +#endif diff --git a/sysdeps/unix/sysv/linux/i386/pwrite.c b/sysdeps/unix/sysv/linux/i386/pwrite.c index a1fc99f..90eee5b 100644 --- a/sysdeps/unix/sysv/linux/i386/pwrite.c +++ b/sysdeps/unix/sysv/linux/i386/pwrite.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -23,10 +23,14 @@ #include #include -#ifdef __NR_pwrite +#include +#if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0 + +# if __ASSUME_PWRITE_SYSCALL == 0 static ssize_t __emulate_pwrite (int fd, const void *buf, size_t count, off_t offset) internal_function; +# endif ssize_t @@ -40,16 +44,21 @@ __pwrite (fd, buf, count, offset) /* First try the syscall. */ result = INLINE_SYSCALL (pwrite, 5, fd, buf, count, offset, 0); +# if __ASSUME_PWRITE_SYSCALL == 0 if (result == -1 && errno == ENOSYS) /* No system call available. Use the emulation. */ result = __emulate_pwrite (fd, buf, count, offset); +# endif return result; } weak_alias (__pwrite, pwrite) -#define __pwrite(fd, buf, count, offset) \ +# define __pwrite(fd, buf, count, offset) \ static internal_function __emulate_pwrite (fd, buf, count, offset) #endif -#include + +#if __ASSUME_PWRITE_SYSCALL == 0 +# include +#endif diff --git a/sysdeps/unix/sysv/linux/i386/pwrite64.c b/sysdeps/unix/sysv/linux/i386/pwrite64.c index 7a5d665..500cd7c 100644 --- a/sysdeps/unix/sysv/linux/i386/pwrite64.c +++ b/sysdeps/unix/sysv/linux/i386/pwrite64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -23,10 +23,14 @@ #include #include -#ifdef __NR_pwrite +#include +#if defined __NR_pwrite || __ASSUME_PWRITE_SYSCALL > 0 + +# if __ASSUME_PWRITE_SYSCALL == 0 static ssize_t __emulate_pwrite64 (int fd, const void *buf, size_t count, off64_t offset) internal_function; +# endif ssize_t @@ -42,16 +46,21 @@ __pwrite64 (fd, buf, count, offset) result = INLINE_SYSCALL (pwrite, 5, fd, buf, count, (off_t) (offset & 0xffffffff), (off_t) (offset >> 32)); +# if __ASSUME_PWRITE_SYSCALL == 0 if (result == -1 && errno == ENOSYS) /* No system call available. Use the emulation. */ result = __emulate_pwrite64 (fd, buf, count, offset); +# endif return result; } weak_alias (__pwrite64, pwrite64) -#define __pwrite64(fd, buf, count, offset) \ +# define __pwrite64(fd, buf, count, offset) \ static internal_function __emulate_pwrite64 (fd, buf, count, offset) #endif -#include + +#if __ASSUME_PWRITE_SYSCALL == 0 +# include +#endif -- cgit v1.1