about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/fcntl.h13
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/fcntl.c1
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/lockf64.c1
4 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8641090229..ef61a2b7c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-08-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_FCNTL64):
+	Define for 2.4.1 on sparc as well.
+	* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Fill in correct values
+	for F_GETLK64, F_SETLK64, and F_SETLKW64.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/fcntl.c: New file.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/lockf64.c: New file.
+
 2000-08-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* io/fts.c (fts_stat): Recognize DT_WHT only if S_IFWHT is also
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index cee74b7c46..4cf16f222c 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -88,10 +88,15 @@
 # define F_GETSIG	11	/* Get number of signal to be sent.  */
 #endif
 
-/* XXX missing */
-#define F_GETLK64	7	/* Get record locking info.  */
-#define F_SETLK64	8	/* Set record locking info (non-blocking).  */
-#define F_SETLKW64	9	/* 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).  */
+#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).  */
+#endif
 
 /* for F_[GET|SET]FL */
 #define FD_CLOEXEC	1	/* actually anything with low bit set goes */
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/fcntl.c b/sysdeps/unix/sysv/linux/sparc/sparc32/fcntl.c
new file mode 100644
index 0000000000..ea951bc4f9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/fcntl.c
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/fcntl.c>
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/lockf64.c b/sysdeps/unix/sysv/linux/sparc/sparc32/lockf64.c
new file mode 100644
index 0000000000..a88f5a784a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/lockf64.c
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/lockf64.c>