From eaeffd07f7bbf57d33fcea5c9f1c9a669a436023 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 22 Aug 2012 21:03:12 +0000 Subject: [PATCH] Clean up MIPS stat64 handling. --- ports/ChangeLog.mips | 9 ++++ .../unix/sysv/linux/mips/kernel-features.h | 6 +++ .../unix/sysv/linux/mips/mips64/fxstat64.c | 45 +++++++++++++++++++ .../unix/sysv/linux/mips/mips64/lxstat64.c | 44 ++++++++++++++++++ .../unix/sysv/linux/mips/mips64/xstat64.c | 45 +++++++++++++++++++ 5 files changed, 149 insertions(+) create mode 100644 ports/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c create mode 100644 ports/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c create mode 100644 ports/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips index dfab023ee7..2d1ca84c8a 100644 --- a/ports/ChangeLog.mips +++ b/ports/ChangeLog.mips @@ -1,3 +1,12 @@ +2012-08-22 Joseph Myers + + * sysdeps/unix/sysv/linux/mips/kernel-features.h [_MIPS_SIM == + _ABIO32] (__ASSUME_STAT64_SYSCALL): Define. + * sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c: New file. Based + on version from ../sysdeps/unix/sysv/linux/. + * sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/xstat64.c: Likewise. + 2012-08-16 Carlos O'Donell * sysdeps/mips/ldsodefs.h (ARCH_PLTENTER_MEMBERS) diff --git a/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h b/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h index 62c1604e9f..d318a31ae6 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h +++ b/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h @@ -25,6 +25,12 @@ /* MIPS had the utimes syscall by 2.6.0. */ #define __ASSUME_UTIMES 1 +/* MIPS o32 had the stat64 syscalls by 2.6.0, but for n32 and n64 the + plain stat syscalls are 64-bit. */ +#if _MIPS_SIM == _ABIO32 +# define __ASSUME_STAT64_SYSCALL 1 +#endif + /* Support for the eventfd2 and signalfd4 syscalls was added in 2.6.27. */ #if __LINUX_KERNEL_VERSION >= 0x02061c # define __ASSUME_EVENTFD2 1 diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c new file mode 100644 index 0000000000..24b517e438 --- /dev/null +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/fxstat64.c @@ -0,0 +1,45 @@ +/* fxstat64 using 64-bit MIPS fstat system call. + Copyright (C) 1997-2012 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 + . */ + +#include +#include +#include +#include + +#include +#include +#include + +#include + +/* Get information about the file FD in BUF. */ + +int +__fxstat64 (int vers, int fd, struct stat64 *buf) +{ + int result; + struct kernel_stat kbuf; + + result = INLINE_SYSCALL (fstat, 2, fd, __ptrvalue (&kbuf)); + if (result == 0) + result = __xstat64_conv (vers, &kbuf, buf); + + return result; +} + +hidden_def (__fxstat64) diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c new file mode 100644 index 0000000000..71123f2bf9 --- /dev/null +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/lxstat64.c @@ -0,0 +1,44 @@ +/* lxstat64 using 64-bit MIPS lstat system call. + Copyright (C) 1997-2012 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 + . */ + +#include +#include +#include +#include + +#include +#include +#include + +#include + +/* Get information about the file NAME in BUF. */ +int +__lxstat64 (int vers, const char *name, struct stat64 *buf) +{ + int result; + struct kernel_stat kbuf; + + result = INLINE_SYSCALL (lstat, 2, CHECK_STRING (name), __ptrvalue (&kbuf)); + if (result == 0) + result = __xstat64_conv (vers, &kbuf, buf); + + return result; +} + +hidden_def (__lxstat64) diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c b/ports/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c new file mode 100644 index 0000000000..b5bb936143 --- /dev/null +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/xstat64.c @@ -0,0 +1,45 @@ +/* xstat64 using 64-bit MIPS stat system call. + Copyright (C) 1991-2012 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 + . */ + +#include +#include +#include +#include + +#include +#include +#include + +#include + +/* Get information about the file NAME in BUF. */ + +int +__xstat64 (int vers, const char *name, struct stat64 *buf) +{ + int result; + struct kernel_stat kbuf; + + result = INLINE_SYSCALL (stat, 2, CHECK_STRING (name), __ptrvalue (&kbuf)); + if (result == 0) + result = __xstat64_conv (vers, &kbuf, buf); + + return result; +} + +hidden_def (__xstat64)