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/aix/fxstat.c | 5 ++++- sysdeps/unix/sysv/aix/fxstat64.c | 7 ++++++- sysdeps/unix/sysv/aix/getpgid.c | 5 ++++- 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 +- sysdeps/unix/sysv/sysv4/__getpgid.c | 5 ++++- sysdeps/unix/sysv/sysv4/getpgid.c | 5 ++++- 16 files changed, 62 insertions(+), 12 deletions(-) (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/aix/fxstat.c b/sysdeps/unix/sysv/aix/fxstat.c index e1f546d..4c1e145 100644 --- a/sysdeps/unix/sysv/aix/fxstat.c +++ b/sysdeps/unix/sysv/aix/fxstat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1999, 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 @@ -23,9 +23,12 @@ extern int fstatx (int fd, struct stat *st, int len, int cmd); +#undef __fxstat + int __fxstat (int ver, int fd, struct stat *st) { assert (ver == 0); return fstatx (fd, st, sizeof (*st), STX_NORMAL); } +INTDEF(__fxstat) diff --git a/sysdeps/unix/sysv/aix/fxstat64.c b/sysdeps/unix/sysv/aix/fxstat64.c index 39f8cd9..509fb2c 100644 --- a/sysdeps/unix/sysv/aix/fxstat64.c +++ b/sysdeps/unix/sysv/aix/fxstat64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1999, 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 @@ -22,11 +22,16 @@ #define STX_NORMAL 0x00 #define STX_64 0x08 +#undef __fxstat64 + extern int fstatx (int fd, struct stat64 *st, int len, int cmd); +#undef __fxstat64 + int __fxstat64 (int ver, int fd, struct stat64 *st) { assert (ver == 0); return fstatx (fd, st, sizeof (*st), STX_NORMAL | STX_64); } +INTDEF(__fxstat64) diff --git a/sysdeps/unix/sysv/aix/getpgid.c b/sysdeps/unix/sysv/aix/getpgid.c index 297fccc..889e3e1 100644 --- a/sysdeps/unix/sysv/aix/getpgid.c +++ b/sysdeps/unix/sysv/aix/getpgid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1999, 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 @@ -18,6 +18,8 @@ #include +#undef __getpgid + extern int kgetpgidx (pid_t pid); int @@ -25,4 +27,5 @@ __getgpid (pid_t pid) { return kgetpgidx (pid); } +INTDEF(__getgpid) strong_alias (__getpgid, getpgid) diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c index e3fb1f5..2d4317c 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 2afe9cd..2d9a6c1 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 f030abc..6afb21b 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 230ce21..8a6de09 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 1edf44c..2783c0f 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 0f1f8e1..3f31e75 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 ce1048b..026a894 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 2ab3046..36d3875 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 d6dead1..8168529 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 8bd4732..47bac2f 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 e443ca6..71c60ea 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 diff --git a/sysdeps/unix/sysv/sysv4/__getpgid.c b/sysdeps/unix/sysv/sysv4/__getpgid.c index 4ee0e74..9313434 100644 --- a/sysdeps/unix/sysv/sysv4/__getpgid.c +++ b/sysdeps/unix/sysv/sysv4/__getpgid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Brendan Kehoe (brendan@zen.org). @@ -21,6 +21,8 @@ #include #include +#undef __getpgid + extern int __pgrpsys __P ((int type, ...)); /* Get the process group ID of process PID. */ @@ -30,3 +32,4 @@ __getpgid (pid) { return __pgrpsys (4, pid); } +INTDEF(__getpgid) diff --git a/sysdeps/unix/sysv/sysv4/getpgid.c b/sysdeps/unix/sysv/sysv4/getpgid.c index 0d4e4ca..5ec9e2c 100644 --- a/sysdeps/unix/sysv/sysv4/getpgid.c +++ b/sysdeps/unix/sysv/sysv4/getpgid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995, 1997, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995, 1997, 1999, 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 @@ -19,6 +19,8 @@ #include #include +#undef __getpgid + extern pid_t __pgrpsys __P ((int type, ...)); /* Get the process group ID of process PID. */ @@ -29,4 +31,5 @@ __getpgid (pid) return __pgrpsys (4, pid); } +INTDEF(__getpgid) weak_alias (__getpgid, getpgid) -- cgit v1.1