r5667 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2013-07-19 20:19:19 +0000 (Fri, 19 Jul 2013)
New Revision: 5667
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
kfreebsd/local-sysdeps.diff: update to revision 4775 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-07-18 15:57:51 UTC (rev 5666)
+++ glibc-package/trunk/debian/changelog 2013-07-19 20:19:19 UTC (rev 5667)
@@ -14,7 +14,7 @@
into kfreebsd/local-nscd-no-sockcloexec.diff and
kfreebsd/local-linuxthreads-tlsdesc.diff
* add kfreebsd/local-fbtl.diff and kfreebsd/local-fbtl-depends.diff
- * kfreebsd/local-sysdeps.diff: update to revision 4765 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 4775 (from glibc-bsd).
Addresses: #717032 in new binutils.
* update testsuite-checking/expected-results-*-kfreebsd-gnu-*
by fbtl tests that are known to fail.
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2013-07-18 15:57:51 UTC (rev 5666)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2013-07-19 20:19:19 UTC (rev 5667)
@@ -7563,7 +7563,7 @@
+#endif /* bits/typesizes.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/clock_getcpuclockid.c
-@@ -0,0 +1,32 @@
+@@ -0,0 +1,28 @@
+/* Copyright (C) 2013 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -7586,10 +7586,6 @@
+#include <unistd.h>
+#include <kernel-features.h>
+
-+int __syscall_clock_getcpuclockid2(long id, int which, clockid_t *clock_id);
-+libc_hidden_proto (__syscall_clock_getcpuclockid2)
-+
-+
+int
+__clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
+{
@@ -9230,7 +9226,7 @@
+}
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/pthread_getcpuclockid.c
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,38 @@
+/* Copyright (C) 2013 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -9255,9 +9251,6 @@
+#include <pthreadP.h>
+#include <tls.h>
+
-+int __syscall_clock_getcpuclockid2(long id, int which, clockid_t *clock_id);
-+libc_hidden_proto (__syscall_clock_getcpuclockid2)
-+
+int
+pthread_getcpuclockid (threadid, clockid)
+ pthread_t threadid;
@@ -10477,7 +10470,7 @@
+SEM_VALUE_MAX SEM_VALUE_MAX
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fbtl/sysconf.c
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,70 @@
+/* Get file-specific information about a file.
+ Copyright (C) 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -10508,9 +10501,6 @@
+
+static long int posix_sysconf (int name);
+
-+int __syscall_clock_getcpuclockid2(long id, int which, clockid_t *clock_id);
-+libc_hidden_proto (__syscall_clock_getcpuclockid2)
-+
+/* Get the value of the system variable NAME. */
+long int
+__sysconf (int name)
@@ -26633,7 +26623,7 @@
+#endif /* sys/un.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls-inline.h
-@@ -0,0 +1,79 @@
+@@ -0,0 +1,88 @@
+/* prototypes of generally used "inline syscalls"
+ Copyright (C) 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -26698,6 +26688,15 @@
+libc_hidden_proto (__syscall_sigwait)
+libc_hidden_proto (__syscall_sigwaitinfo)
+libc_hidden_proto (__syscall_sigtimedwait)
++
++#if 1
++// interface might not be final
++// see http://www.freebsd.org/cgi/query-pr.cgi?pr=180652
++int __syscall_clock_getcpuclockid2(int64_t id, int which, clockid_t *clock_id);
++#else
++int __syscall_clock_getcpuclockid2(long id, int which, clockid_t *clock_id);
++#endif
++libc_hidden_proto (__syscall_clock_getcpuclockid2)
+
+int __syscall_thr_exit(long *p);
+int __syscall_thr_kill(long id, int sig);
Reply to: