[Glibc-bsd-commits] r5340 - in trunk/freebsd-glue: debian include include/embed include/machine include/sys

Sat Jan 18 00:12:43 UTC 2014

Author: rmh
Date: 2014-01-18 00:12:43 +0000 (Sat, 18 Jan 2014)
New Revision: 5340

Added:
   trunk/freebsd-glue/include/embed/
   trunk/freebsd-glue/include/embed/sys/
Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/include/machine/elf.h
   trunk/freebsd-glue/include/machine/endian.h
   trunk/freebsd-glue/include/sys/_stdint.h
   trunk/freebsd-glue/include/sys/elf.h
   trunk/freebsd-glue/include/sys/elf32.h
   trunk/freebsd-glue/include/sys/elf64.h
   trunk/freebsd-glue/include/sys/elf_common.h
   trunk/freebsd-glue/include/sys/endian.h
   trunk/freebsd-glue/include/sys/file.h
   trunk/freebsd-glue/include/sys/ioccom.h
   trunk/freebsd-glue/include/sys/limits.h
   trunk/freebsd-glue/include/sys/param.h
   trunk/freebsd-glue/include/sys/queue.h
   trunk/freebsd-glue/include/sys/time.h
   trunk/freebsd-glue/include/sys/ttycom.h
   trunk/freebsd-glue/include/sys/types.h
Log:
Allow users to force use of embedded headers even when building natively, by setting __FREEBSD_GLUE_USE_EMBEDDED_HEADERS macro. This makes it possible to detect FTBFS errors that affect other platforms also on GNU/kFreeBSD.

Modified: trunk/freebsd-glue/debian/changelog
===================================================================

--- trunk/freebsd-glue/debian/changelog	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/debian/changelog	2014-01-18 00:12:43 UTC (rev 5340)
@@ -2,6 +2,10 @@
 
   * Remove dependency on libutil-freebsd-dev (it was only needed during
     transition of libutil.h).
+  * Allow users to force use of embedded headers even when building
+    natively, by setting __FREEBSD_GLUE_USE_EMBEDDED_HEADERS macro. This
+    makes it possible to detect FTBFS errors that affect other platforms
+    also on GNU/kFreeBSD.
 
  -- Robert Millan <rmh at debian.org>  Wed, 08 Jan 2014 22:36:52 +0100
 

Modified: trunk/freebsd-glue/include/machine/elf.h
===================================================================
--- trunk/freebsd-glue/include/machine/elf.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/machine/elf.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,4 +1,4 @@
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 #include_next <machine/elf.h>
 #else
 

Modified: trunk/freebsd-glue/include/machine/endian.h
===================================================================
--- trunk/freebsd-glue/include/machine/endian.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/machine/endian.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,4 +1,4 @@
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 /* We have <machine/endian.h>.  Use it.  */
 # include_next <machine/endian.h>
 #else

Modified: trunk/freebsd-glue/include/sys/_stdint.h
===================================================================
--- trunk/freebsd-glue/include/sys/_stdint.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/_stdint.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,4 +1,4 @@
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 
 #include_next <sys/_stdint.h>
 

Modified: trunk/freebsd-glue/include/sys/elf.h
===================================================================
--- trunk/freebsd-glue/include/sys/elf.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/elf.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,4 +1,4 @@
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 #include_next <sys/elf.h>
 #else
 

Modified: trunk/freebsd-glue/include/sys/elf32.h
===================================================================
--- trunk/freebsd-glue/include/sys/elf32.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/elf32.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,4 +1,4 @@
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 #include_next <sys/elf32.h>
 #else
 /*-

Modified: trunk/freebsd-glue/include/sys/elf64.h
===================================================================
--- trunk/freebsd-glue/include/sys/elf64.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/elf64.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,4 +1,4 @@
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 #include_next <sys/elf64.h>
 #else
 /*-

Modified: trunk/freebsd-glue/include/sys/elf_common.h
===================================================================
--- trunk/freebsd-glue/include/sys/elf_common.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/elf_common.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,4 +1,4 @@
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 #include_next <sys/elf_common.h>
 #else
 

Modified: trunk/freebsd-glue/include/sys/endian.h
===================================================================
--- trunk/freebsd-glue/include/sys/endian.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/endian.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,4 +1,4 @@
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 /* We have <sys/endian.h>.  Use it.  */
 # include_next <sys/endian.h>
 #else

Modified: trunk/freebsd-glue/include/sys/file.h
===================================================================
--- trunk/freebsd-glue/include/sys/file.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/file.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,6 +1,6 @@
 #include_next <sys/file.h>
 
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 #include <sys/kglue/sys/file.h>
 #else
 #ifndef _SYS_FILE_H_

Modified: trunk/freebsd-glue/include/sys/ioccom.h
===================================================================
--- trunk/freebsd-glue/include/sys/ioccom.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/ioccom.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,4 +1,4 @@
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 
 # include_next <sys/ioccom.h>
 

Modified: trunk/freebsd-glue/include/sys/limits.h
===================================================================
--- trunk/freebsd-glue/include/sys/limits.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/limits.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,4 +1,4 @@
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 #include_next <sys/limits.h>
 #else
 #ifndef _SYS_LIMITS_H_

Modified: trunk/freebsd-glue/include/sys/param.h
===================================================================
--- trunk/freebsd-glue/include/sys/param.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/param.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -37,7 +37,7 @@
 
 #include_next <sys/param.h>
 
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 
 #include <sys/kern/param.h>
 #if !defined(__FreeBSD_version) && defined(__FreeBSD_kernel_version)

Modified: trunk/freebsd-glue/include/sys/queue.h
===================================================================
--- trunk/freebsd-glue/include/sys/queue.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/queue.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -30,7 +30,7 @@
  * $FreeBSD$
  */
 
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 #include_next <sys/queue.h>	/* Supply disabled macros using the Glibc version */
 #include <sys/kern/queue.h>
 #else

Modified: trunk/freebsd-glue/include/sys/time.h
===================================================================
--- trunk/freebsd-glue/include/sys/time.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/time.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,6 +1,6 @@
 #include_next <sys/time.h>
 
-# ifdef __FreeBSD_kernel__
+# if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 #  include <sys/kern/time.h>
 # else
 #ifndef _SYS_TIME_H_

Modified: trunk/freebsd-glue/include/sys/ttycom.h
===================================================================
--- trunk/freebsd-glue/include/sys/ttycom.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/ttycom.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,4 +1,4 @@
-#ifdef __FreeBSD_kernel__
+#if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 
 # include_next <sys/ttycom.h>
 

Modified: trunk/freebsd-glue/include/sys/types.h
===================================================================
--- trunk/freebsd-glue/include/sys/types.h	2014-01-16 23:53:28 UTC (rev 5339)
+++ trunk/freebsd-glue/include/sys/types.h	2014-01-18 00:12:43 UTC (rev 5340)
@@ -1,6 +1,6 @@
 #include_next <sys/types.h>
 
-# ifdef __FreeBSD_kernel__
+# if defined(__FreeBSD_kernel__) && !defined(__FREEBSD_GLUE_USE_EMBEDDED_HEADERS)
 #  include <sys/kern/types.h>
 # else
 #  ifndef _SYS_TYPES_H_


