[Glibc-bsd-commits] r2568 - trunk/glibc-ports/kfreebsd

[Aurelien Jarno]

Author: aurel32
Date: 2009-06-02 18:54:20 +0000 (Tue, 02 Jun 2009)
New Revision: 2568

Modified:
   trunk/glibc-ports/kfreebsd/ftruncate.c
   trunk/glibc-ports/kfreebsd/kernel-features.h
   trunk/glibc-ports/kfreebsd/pread.c
   trunk/glibc-ports/kfreebsd/pwrite.c
Log:
update kernel-features to the correct versions


Modified: trunk/glibc-ports/kfreebsd/ftruncate.c
===================================================================
--- trunk/glibc-ports/kfreebsd/ftruncate.c	2009-06-02 18:30:28 UTC (rev 2567)
+++ trunk/glibc-ports/kfreebsd/ftruncate.c	2009-06-02 18:54:20 UTC (rev 2568)
@@ -36,7 +36,7 @@
   /* First try the new syscall. */
   result = INLINE_SYSCALL (ftruncate, 2, fd, length);
 
-#ifndef __ASSUME_FTRUNCATE_SYSCALL
+#ifndef __ASSUME_TRUNCATE_SYSCALL
   if (result == -1 && errno == ENOSYS)
     /* New syscall not available, us the old one. */
     result = INLINE_SYSCALL (freebsd6_ftruncate, 3, fd, 0, length);

Modified: trunk/glibc-ports/kfreebsd/kernel-features.h
===================================================================
--- trunk/glibc-ports/kfreebsd/kernel-features.h	2009-06-02 18:30:28 UTC (rev 2567)
+++ trunk/glibc-ports/kfreebsd/kernel-features.h	2009-06-02 18:54:20 UTC (rev 2568)
@@ -45,7 +45,7 @@
 */
 
 /* Real-time signals introduced in FreeBSD 7.x.  */
-#if __KFREEBSD_KERNEL_VERSION >= 0x70000
+#if __KFREEBSD_KERNEL_VERSION >= 0x70032
 # define __ASSUME_REALTIME_SIGNALS	1
 #endif
 
@@ -53,37 +53,27 @@
 #define PTHREAD_SIGBASE 32
 
 /* The `ftruncate' syscall was introduced in kFreeBSD 7.0. */
-#if __KFREEBSD_KERNEL_VERSION >= 0x70000
-# define __ASSUME_FTRUNCATE_SYSCALL	1
+#if __KFREEBSD_KERNEL_VERSION >= 0x70032
+# define __ASSUME_TRUNCATE_SYSCALL	1
 #endif
 
 /* The `lseek' syscall was introduced in kFreeBSD 7.0. */
-#if __KFREEBSD_KERNEL_VERSION >= 0x70000
+#if __KFREEBSD_KERNEL_VERSION >= 0x70032
 # define __ASSUME_LSEEK_SYSCALL		1
 #endif
 
 /* The `mmap' syscall was introduced in kFreeBSD 7.0. */
-#if __KFREEBSD_KERNEL_VERSION >= 0x70000
+#if __KFREEBSD_KERNEL_VERSION >= 0x70032
 # define __ASSUME_MMAP_SYSCALL		1
 #endif
 
-/* The `pread' syscall was introduced in kFreeBSD 7.0. */
-#if __KFREEBSD_KERNEL_VERSION >= 0x70000
-# define __ASSUME_PREAD_SYSCALL		1
+/* The `pread' and `pwrite' syscalls were introduced in kFreeBSD 7.0. */
+#if __KFREEBSD_KERNEL_VERSION >= 0x70032
+# define __ASSUME_PREAD_PWRITE_SYSCALLS	1
 #endif
 
-/* The `pwrite' syscall was introduced in kFreeBSD 7.0. */
-#if __KFREEBSD_KERNEL_VERSION >= 0x70000
-# define __ASSUME_PWRITE_SYSCALL	1
-#endif
-
-/* The `truncate' syscall was introduced in kFreeBSD 7.0. */
-#if __KFREEBSD_KERNEL_VERSION >= 0x70000
-# define __ASSUME_TRUNCATE_SYSCALL	1
-#endif
-
 /* The `*at' syscalls were introduced in kFreeBSD 8.0. */
-#if __KFREEBSD_KERNEL_VERSION >= 0x80000
+#if __KFREEBSD_KERNEL_VERSION >= 0x8001D
 # define __ASSUME_ATFCTS        1
 #endif
 

Modified: trunk/glibc-ports/kfreebsd/pread.c
===================================================================
--- trunk/glibc-ports/kfreebsd/pread.c	2009-06-02 18:30:28 UTC (rev 2567)
+++ trunk/glibc-ports/kfreebsd/pread.c	2009-06-02 18:54:20 UTC (rev 2568)
@@ -43,7 +43,7 @@
 
   /* First try the new syscall. */
   result = INLINE_SYSCALL (pread, 4, fd, buf, nbytes, offset);
-#ifndef __ASSUME_PREAD_SYSCALL
+#ifndef __ASSUME_PREAD_PWRITE_SYSCALLS
   if (result == -1 && errno == ENOSYS)
     /* New syscall not available, us the old one. */
     result = INLINE_SYSCALL (freebsd6_pread, 5, fd, buf, nbytes, 0, offset);

Modified: trunk/glibc-ports/kfreebsd/pwrite.c
===================================================================
--- trunk/glibc-ports/kfreebsd/pwrite.c	2009-06-02 18:30:28 UTC (rev 2567)
+++ trunk/glibc-ports/kfreebsd/pwrite.c	2009-06-02 18:54:20 UTC (rev 2568)
@@ -39,7 +39,7 @@
     {
       /* First try the new syscall. */
       result = INLINE_SYSCALL (pwrite, 4, fd, buf, nbytes, offset);
-#ifndef __ASSUME_PREAD_SYSCALL
+#ifndef __ASSUME_PREAD_PWRITE_SYSCALLS
       if (result == -1 && errno == ENOSYS)
         /* New syscall not available, us the old one. */
         result = INLINE_SYSCALL (freebsd6_pwrite, 5, fd, buf, nbytes, 0, offset);
@@ -50,7 +50,7 @@
   int oldtype = LIBC_CANCEL_ASYNC ();
   /* First try the new syscall. */
   result = INLINE_SYSCALL (pwrite, 4, fd, buf, nbytes, offset);
-#ifndef __ASSUME_PREAD_SYSCALL
+#ifndef __ASSUME_PREAD_PWRITE_SYSCALLS
   if (result == -1 && errno == ENOSYS)
     /* New syscall not available, us the old one. */
     result = INLINE_SYSCALL (freebsd6_pwrite, 5, fd, buf, nbytes, 0, offset);