[Glibc-bsd-commits] r3685 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-08-17 12:10:42 +0000 (Wed, 17 Aug 2011)
New Revision: 3685

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
042_sysarch_stubs.diff: Work around missing syscall stubs in libc by declaring them as inline functions.  (Closes: #637424)

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2011-08-17 05:25:55 UTC (rev 3684)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2011-08-17 12:10:42 UTC (rev 3685)
@@ -1,10 +1,12 @@
-kfreebsd-kernel-headers (0.57) UNRELEASED; urgency=low
+kfreebsd-kernel-headers (0.57) unstable; urgency=low
 
   * Renable 039_mips_misc.diff.
   * 005_register_t.diff: #include <sys/types.h> in headers that use
     register_t.  (Closes: #637378)
+  * 042_sysarch_stubs.diff: Work around missing syscall stubs in libc by
+    declaring them as inline functions.  (Closes: #637424)
 
- -- Robert Millan <rmh at debian.org>  Wed, 10 Aug 2011 19:39:37 +0000
+ -- Robert Millan <rmh at debian.org>  Wed, 17 Aug 2011 11:44:04 +0000
 
 kfreebsd-kernel-headers (0.56) unstable; urgency=low
 

Added: trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff	2011-08-17 12:10:42 UTC (rev 3685)
@@ -0,0 +1,38 @@
+--- a/sys/amd64/include/sysarch.h
++++ b/sys/amd64/include/sysarch.h
+@@ -71,11 +71,11 @@
+ #include <sys/cdefs.h>
+ 
+ __BEGIN_DECLS
+-int amd64_get_fsbase(void **);
+-int amd64_get_gsbase(void **);
+-int amd64_set_fsbase(void *);
+-int amd64_set_gsbase(void *);
+ int sysarch(int, void *);
++static inline int amd64_get_fsbase(void **addr) { return sysarch(AMD64_GET_FSBASE, addr); }
++static inline int amd64_get_gsbase(void **addr) { return sysarch(AMD64_GET_GSBASE, addr); }
++static inline int amd64_set_fsbase(void *addr) { return sysarch(AMD64_SET_FSBASE, &addr); }
++static inline int amd64_set_gsbase(void *addr) { return sysarch(AMD64_SET_GSBASE, &addr); }
+ __END_DECLS
+ #else
+ struct thread;
+--- a/sys/i386/include/sysarch.h
++++ b/sys/i386/include/sysarch.h
+@@ -88,13 +88,13 @@
+ int i386_get_ioperm(unsigned int, unsigned int *, int *);
+ int i386_set_ioperm(unsigned int, unsigned int, int);
+ int i386_vm86(int, void *);
+-int i386_get_fsbase(void **);
+-int i386_get_gsbase(void **);
+-int i386_set_fsbase(void *);
+-int i386_set_gsbase(void *);
+ int i386_set_watch(int, unsigned int, int, int, struct dbreg *);
+ int i386_clr_watch(int, struct dbreg *);
+ int sysarch(int, void *);
++static inline int i386_get_fsbase(void **addr) { return sysarch(I386_GET_FSBASE, addr); }
++static inline int i386_get_gsbase(void **addr) { return sysarch(I386_GET_GSBASE, addr); }
++static inline int i386_set_fsbase(void *addr) { return sysarch(I386_SET_FSBASE, &addr); }
++static inline int i386_set_gsbase(void *addr) { return sysarch(I386_SET_GSBASE, &addr); }
+ __END_DECLS
+ #else
+ struct thread;

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2011-08-17 05:25:55 UTC (rev 3684)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2011-08-17 12:10:42 UTC (rev 3685)
@@ -38,3 +38,4 @@
 039_mips_misc.diff
 040_internal_types.patch
 041_gratuitous_sbuf_include.diff 
+042_syscall_stubs.diff