From d060e318a7e0f36690c9c88e23edf53708361250 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 14 Apr 2002 08:47:01 +0000 Subject: Update. 2002-04-14 Ulrich Drepper * include/sys/stat.h: Declare __fxstat_internal and __fxstat64_internal and define __fxstate and __fxstat64 macros if not NOT_IN_libc. Remove __lstat and __fstat inline functions. * sysdeps/generic/fxstat.c: Use INTDEF for __fxstat. * sysdeps/mach/hurd/fxstat.c: Likewise. * sysdeps/unix/fxstat.c: Likewise. * sysdeps/unix/sysv/aix/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/ia64/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c: Likewise. * sysdeps/generic/fxstat64.c: Use INTDEF for __fxstat64. * sysdeps/mach/hurd/fxstat64.c: Likewise. * sysdeps/unix/sysv/aix/fxstat64.c: Likewise. * sysdeps/unix/sysv/linux/fxstat64.c: Likewise. * include/unistd.h: Declare __getpid_internal and define __getpid macro if not NOT_IN_libc. * sysdeps/mach/hurd/getpid.c: Use INTDEF for __getpid. * sysdeps/generic/getpid.c: Likewise. * sysdeps/unix/syscalls.list: Add __getpid_internal alias. * include/unistd.h: Declare __getpgid_internal and define __getpgid macro if not NOT_IN_libc. * sysdeps/generic/getpgid.c: Use INTDEF for __getpgid. * sysdeps/mach/hurd/getpgid.c: Likewise. * sysdeps/unix/sysv/aix/getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/__getpgid.c: Likewise. * sysdeps/unix/sysv/sysv4/getpgid.c: Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add _getpgid_internal alias. * include/unistd.h: Declare __getpagesize_internal and define __getpagesize macro if not NOT_IN_libc. * sysdeps/unix/sysv/linux/shmat.c: Include for __getpagesize. * sysdeps/generic/getpagesize.c: Use INTDEF for __getpagesize. * sysdeps/mach/getpagesize.c: Likewise. * sysdeps/posix/getpagesize.c: Likewise. * sysdeps/unix/getpagesize.c: Likewise. * sysdeps/unix/sysv/linux/getpagesize.c: Likewise. * sysdeps/unix/sysv/linux/ia64/getpagesize.c: Likewise. * sysdeps/unix/sysv/linux/m68k/getpagesize.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c: Likewise. --- sysdeps/unix/sysv/linux/fxstat.c | 6 +++++- sysdeps/unix/sysv/linux/fxstat64.c | 4 ++++ sysdeps/unix/sysv/linux/getpagesize.c | 3 +++ sysdeps/unix/sysv/linux/i386/fxstat.c | 6 +++++- sysdeps/unix/sysv/linux/ia64/fxstat.c | 6 +++++- sysdeps/unix/sysv/linux/ia64/getpagesize.c | 5 ++++- sysdeps/unix/sysv/linux/m68k/getpagesize.c | 3 +++ sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c | 6 +++++- sysdeps/unix/sysv/linux/shmat.c | 3 ++- sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c | 3 +++ sysdeps/unix/sysv/linux/syscalls.list | 2 +- 11 files changed, 40 insertions(+), 7 deletions(-) (limited to 'sysdeps/unix/sysv/linux') diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c index e3fb1f5097..2d4317c8cf 100644 --- a/sysdeps/unix/sysv/linux/fxstat.c +++ b/sysdeps/unix/sysv/linux/fxstat.c @@ -1,5 +1,5 @@ /* fxstat using old-style Unix fstat system call. - Copyright (C) 1991, 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1991,1995-1998,2000,2002 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 @@ -34,6 +34,8 @@ extern int __syscall_fstat (int, struct kernel_stat *__unbounded); +#undef __fxstat + /* Get information about the file FD in BUF. */ int __fxstat (int vers, int fd, struct stat *buf) @@ -51,8 +53,10 @@ __fxstat (int vers, int fd, struct stat *buf) return result; } +INTDEF(__fxstat) weak_alias (__fxstat, _fxstat); #ifdef XSTAT_IS_XSTAT64 #undef __fxstat64 strong_alias (__fxstat, __fxstat64); +INTDEF(__fxstat64) #endif diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c index 2afe9cd267..2d9a6c17cc 100644 --- a/sysdeps/unix/sysv/linux/fxstat64.c +++ b/sysdeps/unix/sysv/linux/fxstat64.c @@ -90,6 +90,8 @@ ___fxstat64 (int vers, int fd, struct stat64 *buf) versioned_symbol (libc, ___fxstat64, __fxstat64, GLIBC_2_2); +INTDEF2(___fxstat64, __fxstat64) + # if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) strong_alias (___fxstat64, __old__fxstat64) compat_symbol (libc, __old__fxstat64, __fxstat64, GLIBC_2_1); @@ -97,4 +99,6 @@ compat_symbol (libc, __old__fxstat64, __fxstat64, GLIBC_2_1); #else strong_alias (___fxstat64, __fxstat64); + +INTDEF(__fxstat64) #endif diff --git a/sysdeps/unix/sysv/linux/getpagesize.c b/sysdeps/unix/sysv/linux/getpagesize.c index f030abc61b..6afb21ba37 100644 --- a/sysdeps/unix/sysv/linux/getpagesize.c +++ b/sysdeps/unix/sysv/linux/getpagesize.c @@ -21,6 +21,8 @@ #include +#undef __getpagesize + /* Return the system page size. */ int __getpagesize () @@ -42,4 +44,5 @@ __getpagesize () #endif /* EXEC_PAGESIZE. */ } +INTDEF(__getpagesize) weak_alias (__getpagesize, getpagesize) diff --git a/sysdeps/unix/sysv/linux/i386/fxstat.c b/sysdeps/unix/sysv/linux/i386/fxstat.c index 230ce21e03..8a6de099d5 100644 --- a/sysdeps/unix/sysv/linux/i386/fxstat.c +++ b/sysdeps/unix/sysv/linux/i386/fxstat.c @@ -1,5 +1,5 @@ /* fxstat using old-style Unix fstat system call. - Copyright (C) 1991,95,96,97,98,2000 Free Software Foundation, Inc. + Copyright (C) 1991,95,96,97,98,2000,2002 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 @@ -44,6 +44,8 @@ extern int __have_no_stat64; # endif #endif +#undef __fxstat + /* Get information about the file FD in BUF. */ int __fxstat (int vers, int fd, struct stat *buf) @@ -94,8 +96,10 @@ __fxstat (int vers, int fd, struct stat *buf) #endif /* __ASSUME_STAT64_SYSCALL */ } +INTDEF(__fxstat) weak_alias (__fxstat, _fxstat); #ifdef XSTAT_IS_XSTAT64 #undef __fxstat64 strong_alias (__fxstat, __fxstat64); +INTDEF(__fxstat64) #endif diff --git a/sysdeps/unix/sysv/linux/ia64/fxstat.c b/sysdeps/unix/sysv/linux/ia64/fxstat.c index 1edf44c8aa..2783c0f7bf 100644 --- a/sysdeps/unix/sysv/linux/ia64/fxstat.c +++ b/sysdeps/unix/sysv/linux/ia64/fxstat.c @@ -1,5 +1,5 @@ /* fxstat using old-style Unix fstat system call. - Copyright (C) 1991, 95, 96, 97, 98, 2000 Free Software Foundation, Inc. + Copyright (C) 1991,95,96,97,98,2000,2002 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 @@ -31,6 +31,8 @@ extern int __syscall_fstat (int, struct stat *__unbounded); +#undef __fxstat + /* Get information about the file FD in BUF. */ int __fxstat (int vers, int fd, struct stat *buf) @@ -38,6 +40,8 @@ __fxstat (int vers, int fd, struct stat *buf) return INLINE_SYSCALL (fstat, 2, fd, CHECK_1 (buf)); } +INTDEF(__fxstat) weak_alias (__fxstat, _fxstat); #undef __fxstat64 strong_alias (__fxstat, __fxstat64); +INTDEF(__fxstat64) diff --git a/sysdeps/unix/sysv/linux/ia64/getpagesize.c b/sysdeps/unix/sysv/linux/ia64/getpagesize.c index 0f1f8e13ed..3f31e759bc 100644 --- a/sysdeps/unix/sysv/linux/ia64/getpagesize.c +++ b/sysdeps/unix/sysv/linux/ia64/getpagesize.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001, 2002 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 @@ -24,6 +24,8 @@ #include #include +#undef __getpagesize + /* Return the system page size. The return value will depend on how the kernel is configured. A program must use this call to determine the page size to ensure proper alignment for calls such @@ -36,4 +38,5 @@ __getpagesize () return GL(dl_pagesize); } +INTDEF(__getpagesize) weak_alias (__getpagesize, getpagesize) diff --git a/sysdeps/unix/sysv/linux/m68k/getpagesize.c b/sysdeps/unix/sysv/linux/m68k/getpagesize.c index ce1048b47d..026a8943bf 100644 --- a/sysdeps/unix/sysv/linux/m68k/getpagesize.c +++ b/sysdeps/unix/sysv/linux/m68k/getpagesize.c @@ -25,6 +25,8 @@ #include #include +#undef __getpagesize + /* Return the system page size. */ int __getpagesize () @@ -46,4 +48,5 @@ __getpagesize () return 4096; } +INTDEF(__getpagesize) weak_alias (__getpagesize, getpagesize) diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c b/sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c index 2ab3046b0c..36d38751ad 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c +++ b/sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c @@ -1,5 +1,5 @@ /* fxstat using old-style Unix fstat system call. 64 bit S/390 version. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002 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 @@ -30,6 +30,8 @@ extern int __syscall_fstat (int, struct stat *); +#undef __fxstat + /* Get information about the file FD in BUF. */ int __fxstat (int vers, int fd, struct stat *buf) @@ -37,6 +39,8 @@ __fxstat (int vers, int fd, struct stat *buf) return INLINE_SYSCALL (fstat, 2, fd, buf); } +INTDEF(__fxstat) weak_alias (__fxstat, _fxstat); #undef __fxstat64 strong_alias (__fxstat, __fxstat64); +INTDEF(__fxstat64) diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c index d6dead138e..8168529a9f 100644 --- a/sysdeps/unix/sysv/linux/shmat.c +++ b/sysdeps/unix/sysv/linux/shmat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1995,1997,1998,1999,2000,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , August 1995. @@ -22,6 +22,7 @@ #include #include +#include #include #include diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c b/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c index 8bd47325b1..47bac2f8cf 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c @@ -20,6 +20,8 @@ #include #include +#undef __getpagesize + /* Return the system page size. This value will either be 4k or 8k depending on whether or not we are running on Sparc v9 machine. */ @@ -37,4 +39,5 @@ __getpagesize () return GL(dl_pagesize); } +INTDEF(__getpagesize) weak_alias (__getpagesize, getpagesize) diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index e443ca60c1..71c60ead0d 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -12,7 +12,7 @@ fork - fork i: __libc_fork __fork fork __fork_internal get_kernel_syms EXTRA get_kernel_syms i:p get_kernel_syms getegid - getegid i: __getegid getegid geteuid - geteuid i: __geteuid geteuid -getpgid - getpgid i:i __getpgid getpgid +getpgid - getpgid i:i __getpgid getpgid __getpgid_internal getpgrp - getpgrp i: getpgrp getppid - getppid i: __getppid getppid getsid - getsid i:i getsid -- cgit 1.4.1