r1862 - in glibc-package/branches/glibc-2.5/debian: . patches/kfreebsd
Author: aurel32
Date: 2006-10-19 21:45:20 +0000 (Thu, 19 Oct 2006)
New Revision: 1862
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 1689 (from glibc-bsd).
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-10-19 20:59:59 UTC (rev 1861)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-10-19 21:45:20 UTC (rev 1862)
@@ -37,7 +37,7 @@
upstream CVS.
* kfreebsd/local-scripts.diff: update.
* kfreebsd/local-sys_queue_h.diff: update.
- * kfreebsd/local-sysdeps.diff: update to revision 1688 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 1689 (from glibc-bsd).
* kfreebsd/local-sysdeps-2.4.diff: remove.
* sysdeps/kfreebsd: enable the ports add-on.
* sysdeps/kfreebsd-i386.mk: ditto.
Modified: glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff 2006-10-19 20:59:59 UTC (rev 1861)
+++ glibc-package/branches/glibc-2.5/debian/patches/kfreebsd/local-sysdeps.diff 2006-10-19 21:45:20 UTC (rev 1862)
@@ -6570,8 +6570,8 @@
+#include <sysdeps/posix/clock_getres.c>
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/clock_gettime.c ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/clock_gettime.c
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/clock_gettime.c 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/clock_gettime.c 2006-10-16 11:34:12.000000000 +0200
-@@ -0,0 +1,31 @@
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/clock_gettime.c 2006-10-19 23:20:22.000000000 +0200
+@@ -0,0 +1,32 @@
+/* Copyright (C) 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -6591,6 +6591,7 @@
+ 02111-1307 USA. */
+
+#include <sysdep.h>
++#include "kernel-posix-cpu-timers.h"
+
+int __syscall_clock_gettime(clockid_t clock_id, struct timespec *tp);
+
@@ -6605,8 +6606,8 @@
+#include <sysdeps/unix/clock_gettime.c>
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/clock_settime.c ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/clock_settime.c
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/clock_settime.c 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/clock_settime.c 2006-10-16 11:34:13.000000000 +0200
-@@ -0,0 +1,30 @@
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/clock_settime.c 2006-10-19 23:20:22.000000000 +0200
+@@ -0,0 +1,31 @@
+/* Copyright (C) 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -6626,6 +6627,7 @@
+ 02111-1307 USA. */
+
+#include <sysdep.h>
++#include "kernel-posix-cpu-timers.h"
+
+int __syscall_clock_settime(clockid_t clock_id, const struct timespec *tp);
+
@@ -12516,9 +12518,13 @@
+
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-posix-cpu-timers.h ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-posix-cpu-timers.h
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-posix-cpu-timers.h 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-posix-cpu-timers.h 2006-10-16 11:34:13.000000000 +0200
-@@ -0,0 +1 @@
-+/* placeholder */
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-posix-cpu-timers.h 2006-10-19 23:20:22.000000000 +0200
+@@ -0,0 +1,5 @@
++/* Parameters for the FreeBSD kernel ABI for CPU clocks. */
++
++#define CPUCLOCK_WHICH(clock) ((clock) & (clockid_t) CPUCLOCK_CLOCK_MASK)
++#define CPUCLOCK_CLOCK_MASK 7
++
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/ldconfig.h ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/ldconfig.h
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/ldconfig.h 1970-01-01 01:00:00.000000000 +0100
+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/ldconfig.h 2006-10-16 11:34:18.000000000 +0200
Reply to: