From 19212f875d0dd43a8925c68e7b806561b4cabbb9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 9 Mar 1998 09:11:57 +0000 Subject: Update. 1998-03-09 08:21 Ulrich Drepper * sysdeps/unix/sysv/linux/chown.c: Moved to ... * sysdeps/unix/sysv/linux/i386/chown.c: ...here. * sysdeps/unix/sysv/linux/i386/chown.c: Correct versioning information. * libc.map: Add chown to GLIBC_2.1. * sysdeps/unix/sysv/linux/i386/syscalls.list: Add s_chown here. * sysdeps/unix/sysv/linux/syscalls.list: Remove s_chown here. 1998-03-06 Andreas Schwab * sysdeps/generic/ffs.S: Rename function to __ffs and make ffs a weak alias. * sysdeps/alpha/ffs.c: Likewise. * sysdeps/am29k/ffs.c: Likewise. * sysdeps/i386/ffs.c: Likewise. * sysdeps/i960/ffs.c: Likewise. * sysdeps/m68k/ffs.c: Likewise. * sysdeps/m88k/ffs.c: Likewise. * sysdeps/powerpc/ffs.c: Likewise. * sysdeps/rs6000/ffs.c: Likewise. * sysdeps/vax/ffs.s: Likewise. * string/string.h: Declare __ffs. * libc.map: Export it. * elf/dl-profile.c (_dl_start_profile): Use __ffs instead of __builtin_ffs, which is not guaranteed to be namespace clean. 1998-03-06 Andreas Schwab * elf/sprof.c: Rewrite symbol handling to use the normal symbol table, which is much more likely to exist than debugging symbols. (printsym): Remove const. (load_shobj): Don't use _dl_pagesize. Fix mapping of section header table. * libc.map: Export __profile_frequency, used by elf/sprof, to avoid infinite recursion during startup. 1998-03-09 12:16 Andreas Schwab --- sysdeps/alpha/ffs.S | 5 +- sysdeps/am29k/ffs.c | 3 +- sysdeps/generic/ffs.c | 3 +- sysdeps/i386/ffs.c | 3 +- sysdeps/i960/ffs.c | 3 +- sysdeps/m68k/ffs.c | 3 +- sysdeps/m88k/ffs.c | 3 +- sysdeps/powerpc/ffs.c | 3 +- sysdeps/rs6000/ffs.c | 3 +- sysdeps/unix/sysv/linux/i386/chown.c | 95 ++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/i386/syscalls.list | 1 + sysdeps/unix/sysv/linux/syscalls.list | 1 - sysdeps/vax/ffs.s | 3 +- 13 files changed, 117 insertions(+), 12 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/i386/chown.c (limited to 'sysdeps') diff --git a/sysdeps/alpha/ffs.S b/sysdeps/alpha/ffs.S index 23dff6e..6eb3afd 100644 --- a/sysdeps/alpha/ffs.S +++ b/sysdeps/alpha/ffs.S @@ -25,7 +25,7 @@ .set noreorder .set noat -ENTRY(ffs) +ENTRY(__ffs) #ifdef PROF ldgp gp, 0(pv) lda AT, _mcount @@ -69,4 +69,5 @@ ENTRY(ffs) $done: ret - END(ffs) + END(__ffs) +weak_alias (__ffs, ffs) diff --git a/sysdeps/am29k/ffs.c b/sysdeps/am29k/ffs.c index fe656e1..bccec88 100644 --- a/sysdeps/am29k/ffs.c +++ b/sysdeps/am29k/ffs.c @@ -26,7 +26,7 @@ #ifdef __GNUC__ int -ffs (x) +__ffs (x) int x; { int cnt; @@ -35,6 +35,7 @@ ffs (x) return 32 - cnt; } +weak_alias (__ffs, ffs) #else #include diff --git a/sysdeps/generic/ffs.c b/sysdeps/generic/ffs.c index 8e1c699..35cf218 100644 --- a/sysdeps/generic/ffs.c +++ b/sysdeps/generic/ffs.c @@ -24,7 +24,7 @@ /* Find the first bit set in I. */ int -ffs (i) +__ffs (i) int i; { static const unsigned char table[] = @@ -45,3 +45,4 @@ ffs (i) return table[x >> a] + a; } +weak_alias (__ffs, ffs) diff --git a/sysdeps/i386/ffs.c b/sysdeps/i386/ffs.c index 411439d..4f46dc7 100644 --- a/sysdeps/i386/ffs.c +++ b/sysdeps/i386/ffs.c @@ -26,7 +26,7 @@ #ifdef __GNUC__ int -ffs (x) +__ffs (x) int x; { int cnt; @@ -40,6 +40,7 @@ ffs (x) return cnt; } +weak_alias (__ffs, ffs) #else #include diff --git a/sysdeps/i960/ffs.c b/sysdeps/i960/ffs.c index 7846c4b..dc09ba9 100644 --- a/sysdeps/i960/ffs.c +++ b/sysdeps/i960/ffs.c @@ -27,7 +27,7 @@ #if defined (__GNUC__) && defined (__i960__) int -ffs (x) +__ffs (x) int x; { int cnt; @@ -36,6 +36,7 @@ ffs (x) return cnt; } +weak_alias (__ffs, ffs) #else diff --git a/sysdeps/m68k/ffs.c b/sysdeps/m68k/ffs.c index 26044b1..d30bd9d 100644 --- a/sysdeps/m68k/ffs.c +++ b/sysdeps/m68k/ffs.c @@ -26,7 +26,7 @@ #if defined (__GNUC__) && defined (__mc68020__) int -ffs (x) +__ffs (x) int x; { int cnt; @@ -35,6 +35,7 @@ ffs (x) return 32 - cnt; } +weak_alias (__ffs, ffs) #else diff --git a/sysdeps/m88k/ffs.c b/sysdeps/m88k/ffs.c index 3658f08..7aac897 100644 --- a/sysdeps/m88k/ffs.c +++ b/sysdeps/m88k/ffs.c @@ -26,7 +26,7 @@ #ifdef __GNUC__ int -ffs (x) +__ffs (x) int x; { int cnt; @@ -37,6 +37,7 @@ ffs (x) asm ("ff1 %0,%1" : "=r" (cnt) : "r" (x & -x)); return cnt + 1; } +weak_alias (__ffs, ffs) #else #include diff --git a/sysdeps/powerpc/ffs.c b/sysdeps/powerpc/ffs.c index 1e65bea..2ae12e6 100644 --- a/sysdeps/powerpc/ffs.c +++ b/sysdeps/powerpc/ffs.c @@ -21,10 +21,11 @@ #include int -ffs (int x) +__ffs (int x) { int cnt; asm ("cntlzw %0,%1" : "=r" (cnt) : "r" (x & -x)); return 32 - cnt; } +weak_alias (__ffs, ffs) diff --git a/sysdeps/rs6000/ffs.c b/sysdeps/rs6000/ffs.c index f078c91..2cf2302 100644 --- a/sysdeps/rs6000/ffs.c +++ b/sysdeps/rs6000/ffs.c @@ -26,7 +26,7 @@ #ifdef __GNUC__ int -ffs (x) +__ffs (x) int x; { int cnt; @@ -34,6 +34,7 @@ ffs (x) asm ("cntlz %0,%1" : "=r" (cnt) : "r" (x & -x)); return 32 - cnt; } +weak_alias (__ffs, ffs) #else #include diff --git a/sysdeps/unix/sysv/linux/i386/chown.c b/sysdeps/unix/sysv/linux/i386/chown.c new file mode 100644 index 0000000..e985ce0 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/chown.c @@ -0,0 +1,95 @@ +/* Copyright (C) 1998 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 Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#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 + new lchown do not follow symlinks. + The new lchown function has the same number as the old chown had and the + new chown has a new number. When compiling with headers from Linux > 2.1.8x + it's impossible to run this libc with older kernels. In these cases libc + has therefore to route calls to chown to the old chown function. +*/ + +extern int __syscall_chown (const char *__file, + uid_t __owner, gid_t __group); +#ifdef __NR_lchown +/* running under Linux 2.0 or < 2.1.8x */ +static int __libc_old_chown; + + +int +__real_chown (const char *file, uid_t owner, gid_t group) +{ + int result; + + if (!__libc_old_chown) + { + int saved_errno = errno; + result = __syscall_chown (file, owner, group); + + if (result >= 0 || errno != ENOSYS) + return result; + + __set_errno (saved_errno); + __libc_old_chown = 1; + } + + return __lchown (file, owner, group); +} +#endif + + +#if !defined __NR_lchown || \ + (defined HAVE_ELF && defined PIC && defined DO_VERSIONING) +/* compiling under older kernels or for compatibiity */ +int +__chown_is_lchown (const char *file, uid_t owner, gid_t group) +{ + return __lchown (file, owner, group); +} +#endif + +#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING +strong_alias (__chown_is_lchown, _chown_is_lchown) +symbol_version (__chown_is_lchown, __chown, GLIBC_2.0); +symbol_version (_chown_is_lchown, chown, GLIBC_2.0); + +# ifdef __NR_lchown +strong_alias (__real_chown, _real_chown) +default_symbol_version (__real_chown, __chown, GLIBC_2.1); +default_symbol_version (_real_chown, chown, GLIBC_2.1); +# else +strong_alias (__chown_is_lchown, __chown_is_lchown21) +strong_alias (__chown_is_lchown, _chown_is_lchown21) +default_symbol_version (__chown_is_lchown21, __chown, GLIBC_2.1); +default_symbol_version (_chown_is_lchown21, chown, GLIBC_2.1); +# endif +#else +# ifdef __NR_lchown +strong_alias (__real_chown, __chown) +weak_alias (__real_chown, chown) +# else +strong_alias (__chown_is_lchown, __chown) +weak_alias (__chown_is_lchown, chown) +# endif +#endif diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list index 392a257..a66ccc0 100644 --- a/sysdeps/unix/sysv/linux/i386/syscalls.list +++ b/sysdeps/unix/sysv/linux/i386/syscalls.list @@ -1,5 +1,6 @@ # File name Caller Syscall name # args Strong name Weak names +s_chown chown chown 3 __syscall_chown s_getgroups getgroups getgroups 2 __syscall_getgroups s_llseek llseek _llseek 5 __sys_llseek s_setgroups setgroups setgroups 2 __syscall_setgroups diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index d0ab7d2..f55c3f6 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -40,7 +40,6 @@ rt_sigprocmask - rt_sigprocmask 4 __syscall_rt_sigprocmask rt_sigqueueinfo - rt_sigqueueinfo 3 __syscall_rt_sigqueueinfo rt_sigsuspend - rt_sigsuspend 2 __syscall_rt_sigsuspend rt_sigtimedwait - rt_sigtimedwait 4 __syscall_rt_sigtimedwait -s_chown chown chown 3 __syscall_chown s_getdents EXTRA getdents 3 __getdents s_getpriority getpriority getpriority 2 __syscall_getpriority s_getresgid getresgid getresgid 3 __syscall_getresgid diff --git a/sysdeps/vax/ffs.s b/sysdeps/vax/ffs.s index 49faffb..9f7ebc9 100644 --- a/sysdeps/vax/ffs.s +++ b/sysdeps/vax/ffs.s @@ -39,10 +39,11 @@ #include "DEFS.h" -ENTRY(ffs, 0) +ENTRY(__ffs, 0) ffs $0,$32,4(ap),r0 bneq 1f mnegl $1,r0 1: incl r0 ret +weak_alias (__ffs, ffs) -- cgit v1.1