diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/truncate64.c | 35 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/generic/wordsize-32/truncate64.c | 31 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips32/truncate64.c | 35 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/syscalls.list | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/truncate64.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c | 34 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/truncate.c (renamed from sysdeps/unix/sysv/linux/generic/wordsize-32/truncate.c) | 18 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/truncate64.c | 26 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/wordsize-64/syscalls.list | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/wordsize-64/truncate64.c | 1 |
11 files changed, 40 insertions, 159 deletions
@@ -1,5 +1,20 @@ 2016-11-09 Adhemerval Zanella <adhemerval.zanella@linaro.org> + * sysdeps/unix/sysv/linux/arm/truncate64.c: Remove file. + * sysdeps/unix/sysv/linux/generic/wordsize-32/truncate.c: Likewise. + * sysdeps/sysv/linux/generic/wordsize-32/truncate64.c: Likewise. + * sysdeps/unix/sysv/linux/mips/mips32/truncate64.c: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/truncate64.c: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c: Likewise. + * sysdeps/unix/sysv/linux/wordsize-64/truncate64.c: Likewise. + * sysdeps/unix/sysv/linux/truncate.c: New file. + * sysdeps/unix/sysv/linux/truncate64.c (truncate64): Use + INLINE_SYSCALL_CALL, __ALIGNMENT_ARG and SYSCALL_LL64 macros. + * sysdeps/unix/sysv/linux/mips/mips64/syscalls.list (truncate): + Remove. + * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (truncate): + Likewise. + * posix/tst-truncate-common.c: New file. * posix/tst-truncate.c: Use tst-truncate-common.c. * posix/tst-truncate64.c: Likewise and add LFS tests. diff --git a/sysdeps/unix/sysv/linux/arm/truncate64.c b/sysdeps/unix/sysv/linux/arm/truncate64.c deleted file mode 100644 index 28563af..0000000 --- a/sysdeps/unix/sysv/linux/arm/truncate64.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 1997-2016 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 <sys/types.h> -#include <endian.h> -#include <errno.h> -#include <unistd.h> - -#include <sysdep.h> -#include <sys/syscall.h> - -/* Truncate the file FD refers to to LENGTH bytes. */ -int -truncate64 (const char *path, off64_t length) -{ - unsigned int low = length & 0xffffffff; - unsigned int high = length >> 32; - int result = INLINE_SYSCALL (truncate64, 4, path, 0, - __LONG_LONG_PAIR (high, low)); - return result; -} diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/truncate64.c b/sysdeps/unix/sysv/linux/generic/wordsize-32/truncate64.c deleted file mode 100644 index f2927ea..0000000 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/truncate64.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 2011-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011. - - 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 <sys/types.h> -#include <unistd.h> - -/* Truncate the file PATH to LENGTH bytes. */ -int -truncate64 (const char *path, off64_t length) -{ - unsigned int low = length & 0xffffffff; - unsigned int high = length >> 32; - return INLINE_SYSCALL (truncate64, __ALIGNMENT_COUNT (3, 4), path, - __ALIGNMENT_ARG __LONG_LONG_PAIR (high, low)); -} diff --git a/sysdeps/unix/sysv/linux/mips/mips32/truncate64.c b/sysdeps/unix/sysv/linux/mips/mips32/truncate64.c deleted file mode 100644 index 28563af..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips32/truncate64.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 1997-2016 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 <sys/types.h> -#include <endian.h> -#include <errno.h> -#include <unistd.h> - -#include <sysdep.h> -#include <sys/syscall.h> - -/* Truncate the file FD refers to to LENGTH bytes. */ -int -truncate64 (const char *path, off64_t length) -{ - unsigned int low = length & 0xffffffff; - unsigned int high = length >> 32; - int result = INLINE_SYSCALL (truncate64, 4, path, 0, - __LONG_LONG_PAIR (high, low)); - return result; -} diff --git a/sysdeps/unix/sysv/linux/mips/mips64/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/syscalls.list index 1e3ae0a..d0d9b9a 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/syscalls.list +++ b/sysdeps/unix/sysv/linux/mips/mips64/syscalls.list @@ -1,7 +1,5 @@ # File name Caller Syscall name Args Strong name Weak names -truncate - truncate i:si truncate truncate64 - # Semaphore and shm system calls. msgctl, shmctl, and semctl have C # wrappers (to set __IPC_64). msgget - msgget i:ii __msgget msgget diff --git a/sysdeps/unix/sysv/linux/mips/mips64/truncate64.c b/sysdeps/unix/sysv/linux/mips/mips64/truncate64.c deleted file mode 100644 index 6e25b02..0000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/truncate64.c +++ /dev/null @@ -1 +0,0 @@ -/* Empty. */ diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c deleted file mode 100644 index ccfdafa..0000000 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/truncate64.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 1997-2016 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 <sys/types.h> -#include <errno.h> -#include <unistd.h> - -#include <sysdep.h> -#include <sys/syscall.h> - -/* Truncate the file referenced by FD to LENGTH bytes. */ -int -truncate64 (const char *path, off64_t length) -{ - /* On PPC32 64bit values are aligned in odd/even register pairs. */ - int result = INLINE_SYSCALL (truncate64, 4, path, 0, - (long) (length >> 32), - (long) length); - return result; -} diff --git a/sysdeps/unix/sysv/linux/generic/wordsize-32/truncate.c b/sysdeps/unix/sysv/linux/truncate.c index 2579951..9e71288 100644 --- a/sysdeps/unix/sysv/linux/generic/wordsize-32/truncate.c +++ b/sysdeps/unix/sysv/linux/truncate.c @@ -1,6 +1,5 @@ -/* Copyright (C) 2011-2016 Free Software Foundation, Inc. +/* Copyright (C) 2016 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -16,16 +15,21 @@ License along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */ -#include <errno.h> -#include <sys/types.h> #include <unistd.h> +#include <sysdep.h> +#include <errno.h> +#ifndef __OFF_T_MATCHES_OFF64_T /* Truncate PATH to LENGTH bytes. */ int __truncate (const char *path, off_t length) { - return INLINE_SYSCALL (truncate64, __ALIGNMENT_COUNT (3, 4), path, - __ALIGNMENT_ARG - __LONG_LONG_PAIR (length >> 31, length)); +# ifndef __NR_truncate + return INLINE_SYSCALL_CALL (truncate64, path, + __ALIGNMENT_ARG SYSCALL_LL (length)); +# else + return INLINE_SYSCALL_CALL (truncate, path, length); +# endif } weak_alias (__truncate, truncate) +#endif diff --git a/sysdeps/unix/sysv/linux/truncate64.c b/sysdeps/unix/sysv/linux/truncate64.c index 92a6bc4..0d70da7 100644 --- a/sysdeps/unix/sysv/linux/truncate64.c +++ b/sysdeps/unix/sysv/linux/truncate64.c @@ -15,21 +15,23 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <sys/types.h> -#include <endian.h> -#include <errno.h> #include <unistd.h> - #include <sysdep.h> -#include <sys/syscall.h> +#include <errno.h> -/* Truncate the file referenced by FD to LENGTH bytes. */ +#ifndef __NR_truncate64 +# define __NR_truncate64 __NR_truncate +#endif + +/* Truncate PATH to LENGTH bytes. */ int -truncate64 (const char *path, off64_t length) +__truncate64 (const char *path, off64_t length) { - unsigned int low = length & 0xffffffff; - unsigned int high = length >> 32; - int result = INLINE_SYSCALL (truncate64, 3, path, - __LONG_LONG_PAIR (high, low)); - return result; + return INLINE_SYSCALL_CALL (truncate64, path, + __ALIGNMENT_ARG SYSCALL_LL64 (length)); } +weak_alias (__truncate64, truncate64) + +#ifdef __OFF_T_MATCHES_OFF64_T +weak_alias (__truncate64, truncate); +#endif diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list index 8c20ef9..99236ba 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list @@ -3,7 +3,6 @@ fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64 statfs - statfs i:sp __statfs statfs statfs64 mmap - mmap b:aniiii __mmap mmap __mmap64 mmap64 -truncate - truncate i:si truncate truncate64 getrlimit - getrlimit i:ip __getrlimit getrlimit getrlimit64 __getrlimit64 setrlimit - setrlimit i:ip __setrlimit setrlimit setrlimit64 readahead - readahead i:iii __readahead readahead diff --git a/sysdeps/unix/sysv/linux/wordsize-64/truncate64.c b/sysdeps/unix/sysv/linux/wordsize-64/truncate64.c deleted file mode 100644 index 8999768..0000000 --- a/sysdeps/unix/sysv/linux/wordsize-64/truncate64.c +++ /dev/null @@ -1 +0,0 @@ -/* truncate64 is the same as truncate. */ |