aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-06-27 20:48:27 +0000
committerUlrich Drepper <drepper@redhat.com>2004-06-27 20:48:27 +0000
commitf2481c319d604a9d797df6147ec6d3010861e4a4 (patch)
tree715ab4444fcabb043e8e9b5ca525c2e68dae964a
parent46f4c5787ad7e3940d3cfb67320e70cff2fbe032 (diff)
downloadglibc-f2481c319d604a9d797df6147ec6d3010861e4a4.tar
glibc-f2481c319d604a9d797df6147ec6d3010861e4a4.tar.gz
glibc-f2481c319d604a9d797df6147ec6d3010861e4a4.tar.bz2
glibc-f2481c319d604a9d797df6147ec6d3010861e4a4.zip
Update.
2004-06-25 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/powerpc/fcntl.c: Move to... * sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c: ... here. * sysdeps/unix/sysv/linux/powerpc/lockf64.c: Move to... * sysdeps/unix/sysv/linux/powerpc/powerpc32/lockf64.c: ... here. * sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: New file. * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (F_GETLK, F_SETLK, F_SETLKW): Fix values for -m32 -D_FILE_OFFSET_BITS=64.
-rw-r--r--ChangeLog11
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c (renamed from sysdeps/unix/sysv/linux/powerpc/fcntl.c)0
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/lockf64.c (renamed from sysdeps/unix/sysv/linux/powerpc/lockf64.c)0
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c70
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h29
5 files changed, 101 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 3be5d0c5a9..fa648cac44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-25 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/powerpc/fcntl.c: Move to...
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c: ... here.
+ * sysdeps/unix/sysv/linux/powerpc/lockf64.c: Move to...
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/lockf64.c: ... here.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: New file.
+
+ * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (F_GETLK, F_SETLK,
+ F_SETLKW): Fix values for -m32 -D_FILE_OFFSET_BITS=64.
+
2004-06-21 Jakub Jelinek <jakub@redhat.com>
[BZ #231]
diff --git a/sysdeps/unix/sysv/linux/powerpc/fcntl.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c
index ea951bc4f9..ea951bc4f9 100644
--- a/sysdeps/unix/sysv/linux/powerpc/fcntl.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c
diff --git a/sysdeps/unix/sysv/linux/powerpc/lockf64.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/lockf64.c
index a88f5a784a..a88f5a784a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/lockf64.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/lockf64.c
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c
new file mode 100644
index 0000000000..f629a35fb4
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c
@@ -0,0 +1,70 @@
+/* Copyright (C) 2000, 2002, 2003, 2004 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
+
+#include <sysdep-cancel.h>
+#include <sys/syscall.h>
+
+
+int
+__fcntl_nocancel (int fd, int cmd, ...)
+{
+ va_list ap;
+ void *arg;
+
+ va_start (ap, cmd);
+ arg = va_arg (ap, void *);
+ va_end (ap);
+
+ return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
+}
+
+
+int
+__libc_fcntl (int fd, int cmd, ...)
+{
+ va_list ap;
+ void *arg;
+
+ va_start (ap, cmd);
+ arg = va_arg (ap, void *);
+ va_end (ap);
+
+ if (cmd >= F_GETLK64 && cmd <= F_SETLKW64)
+ cmd -= F_GETLK64 - F_GETLK;
+
+ if (SINGLE_THREAD_P || cmd != F_SETLKW)
+ return __fcntl_nocancel (fd, cmd, arg);
+
+ int oldtype = LIBC_CANCEL_ASYNC ();
+
+ int result = __fcntl_nocancel (fd, cmd, arg);
+
+ LIBC_CANCEL_RESET (oldtype);
+
+ return result;
+}
+libc_hidden_def (__libc_fcntl)
+
+weak_alias (__libc_fcntl, __fcntl)
+libc_hidden_weak (__fcntl)
+weak_alias (__libc_fcntl, fcntl)
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
index 5e11760bf0..2247af08a5 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
@@ -70,18 +70,29 @@
#define F_SETFD 2 /* Set file descriptor flags. */
#define F_GETFL 3 /* Get file status flags. */
#define F_SETFL 4 /* Set file status flags. */
-#define F_GETLK 5 /* Get record locking info. */
-#define F_SETLK 6 /* Set record locking info (non-blocking). */
-#define F_SETLKW 7 /* Set record locking info (blocking). */
#if __WORDSIZE == 64
-# define F_GETLK64 F_GETLK /* Get record locking info. */
-# define F_SETLK64 F_SETLK /* Set record locking info (non-blocking). */
-# define F_SETLKW64 F_SETLKW /* Set record locking info (blocking). */
+# define F_GETLK 5 /* Get record locking info. */
+# define F_SETLK 6 /* Set record locking info (non-blocking). */
+# define F_SETLKW 7 /* Set record locking info (blocking). */
+/* Not necessary, we always have 64-bit offsets. */
+# define F_GETLK64 5 /* Get record locking info. */
+# define F_SETLK64 6 /* Set record locking info (non-blocking). */
+# define F_SETLKW64 7 /* Set record locking info (blocking). */
#else
-#define F_GETLK64 12 /* Get record locking info. */
-#define F_SETLK64 13 /* Set record locking info (non-blocking). */
-#define F_SETLKW64 14 /* Set record locking info (blocking). */
+# ifndef __USE_FILE_OFFSET64
+# define F_GETLK 5 /* Get record locking info. */
+# define F_SETLK 6 /* Set record locking info (non-blocking). */
+# define F_SETLKW 7 /* Set record locking info (blocking). */
+# else
+# define F_GETLK F_GETLK64 /* Get record locking info. */
+# define F_SETLK F_SETLK64 /* Set record locking info (non-blocking).*/
+# define F_SETLKW F_SETLKW64 /* Set record locking info (blocking). */
+# endif
+# define F_GETLK64 12 /* Get record locking info. */
+# define F_SETLK64 13 /* Set record locking info (non-blocking). */
+# define F_SETLKW64 14 /* Set record locking info (blocking). */
#endif
+
#if defined __USE_BSD || defined __USE_UNIX98
# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */
# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */