Move some chown / lchown / fchown definitions to syscalls.list (bug 14138).

Continuing the move of syscall definitions to syscalls.list, where the
removal of support for old kernel versions has made this possible,
this patch moves various definitions of chown, lchown and fchown.

In most cases the need for special syscalls.list entries (rather than
existing generic ones) is because these architectures use chown32,
lchown32 and fchown32 as syscall names.  Some architectures also have
symbol versioning compatibility for older versions of chown having
been equivalent to lchown.

In the case of powerpc, chown.c (providing the chown@@GLIBC_2.1
default version) is replaced by a syscalls.list entry (for powerpc32;
powerpc64 has no need for this because of its more recent minimum
symbol version, so can just use the entry in
sysdeps/unix/syscalls.list), but lchown.S is left as-is because it
provides the compat version of chown as an actual alias for __lchown,
which is not yet supported by syscalls.list.  This file can be removed
once such aliases are supported in syscalls.list.

	[BZ #14138]
	* sysdeps/unix/sysv/linux/arm/fchown.c: Remove file.
	* sysdeps/unix/sysv/linux/arm/lchown.c: Likewise.
	* sysdeps/unix/sysv/linux/m68k/fchown.c: Likewise.
	* sysdeps/unix/sysv/linux/m68k/lchown.c: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/chown.c: Likewise.
	* sysdeps/unix/sysv/linux/arm/syscalls.list (lchown): Add syscall.
	(fchown): Likewise.
	* sysdeps/unix/sysv/linux/m68k/syscalls.list (lchown): Likewise.
	(fchown): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list (chown):
	Likewise.

diff --git a/ChangeLog b/ChangeLog
index 0d37530437794ca42cb2b3dbca87ae735be2e0f3..5a89797b45f36744a892ca551522cfce2e6a60d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2014-10-06  Joseph Myers  <joseph@codesourcery.com>
+
+       [BZ #14138]
+       * sysdeps/unix/sysv/linux/arm/fchown.c: Remove file.
+       * sysdeps/unix/sysv/linux/arm/lchown.c: Likewise.
+       * sysdeps/unix/sysv/linux/m68k/fchown.c: Likewise.
+       * sysdeps/unix/sysv/linux/m68k/lchown.c: Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/chown.c: Likewise.
+       * sysdeps/unix/sysv/linux/arm/syscalls.list (lchown): Add syscall.
+       (fchown): Likewise.
+       * sysdeps/unix/sysv/linux/m68k/syscalls.list (lchown): Likewise.
+       (fchown): Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list (chown):
+       Likewise.
+
 2014-10-06  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
        * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: Remove file.

diff --git a/sysdeps/unix/sysv/linux/arm/fchown.c b/sysdeps/unix/sysv/linux/arm/fchown.c
deleted file mode 100644 (file)
index 3a69ecc..0000000
--- a/sysdeps/unix/sysv/linux/arm/fchown.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fchown.c>

diff --git a/sysdeps/unix/sysv/linux/arm/lchown.c b/sysdeps/unix/sysv/linux/arm/lchown.c
deleted file mode 100644 (file)
index c89de99..0000000
--- a/sysdeps/unix/sysv/linux/arm/lchown.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/lchown.c>

diff --git a/sysdeps/unix/sysv/linux/arm/syscalls.list b/sysdeps/unix/sysv/linux/arm/syscalls.list
index ba8cdd7e6566fa7492e1501914855d0918ea77bf..f2133bc40466e8496afc6dc7475d919f0c059e95 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/syscalls.list
+++ b/sysdeps/unix/sysv/linux/arm/syscalls.list
@@ -1,6 +1,8 @@
 # File name    Caller  Syscall name    # args  Strong name     Weak names
 
 chown          -       chown32         i:sii   __chown         chown
+lchown         -       lchown32        i:sii   __lchown        lchown
+fchown         -       fchown32        i:iii   __fchown        fchown
 
 prlimit64      EXTRA   prlimit64       i:iipp  prlimit64
 

diff --git a/sysdeps/unix/sysv/linux/m68k/fchown.c b/sysdeps/unix/sysv/linux/m68k/fchown.c
deleted file mode 100644 (file)
index 3a69ecc..0000000
--- a/sysdeps/unix/sysv/linux/m68k/fchown.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fchown.c>

diff --git a/sysdeps/unix/sysv/linux/m68k/lchown.c b/sysdeps/unix/sysv/linux/m68k/lchown.c
deleted file mode 100644 (file)
index c89de99..0000000
--- a/sysdeps/unix/sysv/linux/m68k/lchown.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/lchown.c>

diff --git a/sysdeps/unix/sysv/linux/m68k/syscalls.list b/sysdeps/unix/sysv/linux/m68k/syscalls.list
index aee1011a62f6eab8800034852a3e4b94ce0f14c2..7896b870b8b00ed0d42fa420ee70e014aaed14ed 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/syscalls.list
+++ b/sysdeps/unix/sysv/linux/m68k/syscalls.list
@@ -1,6 +1,8 @@
 # File name    Caller  Syscall name    Args    Strong name     Weak names
 
 chown          -       chown32         i:sii   __chown         chown
+lchown         -       lchown32        i:sii   __lchown        lchown
+fchown         -       fchown32        i:iii   __fchown        fchown
 waitpid                -       waitpid         Ci:ipi  __waitpid       waitpid __libc_waitpid
 
 cacheflush     EXTRA   cacheflush      i:iiii  __cacheflush    cacheflush

diff --git a/sysdeps/unix/sysv/linux/powerpc/chown.c b/sysdeps/unix/sysv/linux/powerpc/chown.c
deleted file mode 100644 (file)
index 59c6147..0000000
--- a/sysdeps/unix/sysv/linux/powerpc/chown.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* chown() compatibility.
-   Copyright (C) 1998-2014 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
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <limits.h>
-#include <sysdep.h>
-#include <stdlib.h>
-
-/* Consider moving to syscalls.list.  */
-
-/*
-  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.
-  This file emulates chown() under the old kernels.
-*/
-
-int
-__chown (const char *file, uid_t owner, gid_t group)
-{
-  return INLINE_SYSCALL (chown, 3, file, owner, group);
-}
-libc_hidden_def (__chown)
-
-#include <shlib-compat.h>
-versioned_symbol (libc, __chown, chown, GLIBC_2_1);

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
index fb6535aa8a9a7d10765eb6052b4473996e073b35..25487cc3e0db88c15a1b2d4743f2b80f165dd1e7 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list
@@ -1,5 +1,7 @@
 # File name    Caller  Syscall name    # args  Strong name     Weak names
 
+chown          -       chown           i:sii   __chown         chown@@GLIBC_2.1
+
 # System calls with wrappers.
 oldgetrlimit   EXTRA   getrlimit       i:ip    __old_getrlimit getrlimit@GLIBC_2.0
 oldsetrlimit   EXTRA   setrlimit       i:ip    __old_setrlimit setrlimit@GLIBC_2.0