[Glibc-bsd-commits] r5283 - in trunk/freebsd-glue: debian src/freebsd-glue

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-02 16:52:12 +0000 (Thu, 02 Jan 2014)
New Revision: 5283

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/src/freebsd-glue/sysarch.c
Log:
sysarch.c: Avoid conflicting declarations in <machine/sysarch.h>.

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2014-01-02 15:07:55 UTC (rev 5282)
+++ trunk/freebsd-glue/debian/changelog	2014-01-02 16:52:12 UTC (rev 5283)
@@ -1,3 +1,9 @@
+freebsd-glue (0.2.9) UNRELEASED; urgency=low
+
+  * sysarch.c: Avoid conflicting declarations in <machine/sysarch.h>.
+
+ -- Robert Millan <rmh at debian.org>  Thu, 02 Jan 2014 17:52:03 +0100
+
 freebsd-glue (0.2.8) unstable; urgency=low
 
   * Correctly setup BSD version of MAKEFLAGS to support parallel builds.

Modified: trunk/freebsd-glue/src/freebsd-glue/sysarch.c
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/sysarch.c	2014-01-02 15:07:55 UTC (rev 5282)
+++ trunk/freebsd-glue/src/freebsd-glue/sysarch.c	2014-01-02 16:52:12 UTC (rev 5283)
@@ -24,8 +24,29 @@
  *
  */
 
+/* Temporary kludge to avoid conflicting declarations (static inline) in certain
+   versions of <machine/sysarch.h> */
+
+#define amd64_get_fsbase __disabled_amd64_get_fsbase
+#define amd64_get_gsbase __disabled_amd64_get_gsbase
+#define amd64_set_fsbase __disabled_amd64_set_fsbase
+#define amd64_set_gsbase __disabled_amd64_set_gsbase
+#define i386_get_fsbase __disabled_i386_get_fsbase
+#define i386_get_gsbase __disabled_i386_get_gsbase
+#define i386_set_fsbase __disabled_i386_set_fsbase
+#define i386_set_gsbase __disabled_i386_set_gsbase
+
 #include <machine/sysarch.h>
 
+#undef amd64_get_fsbase
+#undef amd64_get_gsbase
+#undef amd64_set_fsbase
+#undef amd64_set_gsbase
+#undef i386_get_fsbase
+#undef i386_get_gsbase
+#undef i386_set_fsbase
+#undef i386_set_gsbase
+
 #if defined(__amd64__)
 int
 amd64_get_fsbase (void **addr)