diff options
author | Joseph Myers <joseph@codesourcery.com> | 2014-10-31 21:13:32 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2014-10-31 21:13:32 +0000 |
commit | 94a42455257226361fedf37a0ad7fc1d9d131645 (patch) | |
tree | 37863948d82e8d8ed652f50d595ef30be60005bd | |
parent | ff9dbdc048f8341c5f1bc6a6982b669b49a40983 (diff) | |
download | glibc-94a42455257226361fedf37a0ad7fc1d9d131645.tar.gz glibc-94a42455257226361fedf37a0ad7fc1d9d131645.tar.xz glibc-94a42455257226361fedf37a0ad7fc1d9d131645.zip |
Move powerpc64 pread/pwrite definitions to syscalls.list (bug 14138).
Concluding the move of syscall definitions to syscalls.list, where the removal of support for old kernel versions has made this possible, this patch removes C definitions of pread, pread64, pwrite and pwrite64 for powerpc64. As far as I can tell, the existing syscalls.list definitions in sysdeps/unix/sysv/linux/wordsize-64/syscalls.list should suffice to produce results equivalent to what these C files do. [BZ #14138] * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c: Remove file. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c: Likewise.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c | 55 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c | 54 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c | 55 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c | 55 |
6 files changed, 10 insertions, 221 deletions
diff --git a/ChangeLog b/ChangeLog index 41bfbe77fd..6a63313151 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-10-31 Joseph Myers <joseph@codesourcery.com> + + [BZ #14138] + * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c: Remove file. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c: Likewise. + 2014-10-31 Torvald Riegel <triegel@redhat.com> * sysdeps/sparc/sparc32/bits/atomic.h (atomic_write_barrier): Use diff --git a/NEWS b/NEWS index d08117e8b2..ebdd52347f 100644 --- a/NEWS +++ b/NEWS @@ -9,8 +9,8 @@ Version 2.21 * The following bugs are resolved with this release: - 6652, 12926, 14171, 15884, 17266, 17363, 17370, 17371, 17411, 17460, - 17485, 17501, 17508. + 6652, 12926, 14138, 14171, 15884, 17266, 17363, 17370, 17371, 17411, + 17460, 17485, 17501, 17508. Version 2.20 diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c deleted file mode 100644 index d85ab90195..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (C) 1997-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. - - 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 <assert.h> -#include <errno.h> -#include <unistd.h> - -#include <sysdep-cancel.h> -#include <sys/syscall.h> - - -/* Consider moving to syscalls.list. */ - -ssize_t -__libc_pread (fd, buf, count, offset) - int fd; - void *buf; - size_t count; - off_t offset; -{ - ssize_t result; - - if (SINGLE_THREAD_P) - { - result = INLINE_SYSCALL (pread, 4, fd, buf, count, offset); - - return result; - } - - int oldtype = LIBC_CANCEL_ASYNC (); - - result = INLINE_SYSCALL (pread, 4, fd, buf, count, offset); - - LIBC_CANCEL_RESET (oldtype); - - return result; -} - -strong_alias (__libc_pread, __pread) -weak_alias (__libc_pread, pread) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c deleted file mode 100644 index 5bdeada473..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (C) 1997-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. - - 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 <unistd.h> - -#include <sysdep-cancel.h> -#include <sys/syscall.h> - - -/* Consider moving to syscalls.list. */ - -ssize_t -__libc_pread64 (fd, buf, count, offset) - int fd; - void *buf; - size_t count; - off64_t offset; -{ - ssize_t result; - - if (SINGLE_THREAD_P) - { - result = INLINE_SYSCALL (pread, 4, fd, buf, count, offset); - - return result; - } - - int oldtype = LIBC_CANCEL_ASYNC (); - - result = INLINE_SYSCALL (pread, 4, fd, buf, count, offset); - - LIBC_CANCEL_RESET (oldtype); - - return result; -} - -weak_alias (__libc_pread64, __pread64) -weak_alias (__libc_pread64, pread64) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c deleted file mode 100644 index 7577d2ecaa..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (C) 1997-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. - - 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 <assert.h> -#include <errno.h> -#include <unistd.h> - -#include <sysdep-cancel.h> -#include <sys/syscall.h> - - -/* Consider moving to syscalls.list. */ - -ssize_t -__libc_pwrite (fd, buf, count, offset) - int fd; - const void *buf; - size_t count; - off_t offset; -{ - ssize_t result; - - if (SINGLE_THREAD_P) - { - result = INLINE_SYSCALL (pwrite, 4, fd, buf, count, offset); - - return result; - } - - int oldtype = LIBC_CANCEL_ASYNC (); - - result = INLINE_SYSCALL (pwrite, 4, fd, buf, count, offset); - - LIBC_CANCEL_RESET (oldtype); - - return result; -} - -strong_alias (__libc_pwrite, __pwrite) -weak_alias (__libc_pwrite, pwrite) diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c deleted file mode 100644 index 26ea65a2ba..0000000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (C) 1997-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. - - 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 <unistd.h> - -#include <sysdep-cancel.h> -#include <sys/syscall.h> - - -/* Consider moving to syscalls.list. */ - -ssize_t -__libc_pwrite64 (fd, buf, count, offset) - int fd; - const void *buf; - size_t count; - off64_t offset; -{ - ssize_t result; - - if (SINGLE_THREAD_P) - { - result = INLINE_SYSCALL (pwrite, 4, fd, buf, count, offset); - - return result; - } - - int oldtype = LIBC_CANCEL_ASYNC (); - - result = INLINE_SYSCALL (pwrite, 4, fd, buf, count, offset); - - LIBC_CANCEL_RESET (oldtype); - - return result; -} - -weak_alias (__libc_pwrite64, __pwrite64) -libc_hidden_weak (__pwrite64) -weak_alias (__libc_pwrite64, pwrite64) |