* configure.in: Apply 2012-09-10 change to config.in here. Add

	__CONFIG_H__ check.
	* config.in: Regenerate.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 2f08dcc5a79077a0dc7734791e7f848748fb9625..3fed7933439fd967ec3d34a48b03862295a0fd1d 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-05  Alan Modra  <amodra@gmail.com>
+
+       * configure.in: Apply 2012-09-10 change to config.in here.  Add
+       __CONFIG_H__ check.
+       * config.in: Regenerate.
+
 2012-11-01  Tom Tromey  <tromey@redhat.com>
 
        * readelf.c (get_note_type): Handle NT_386_TLS, NT_386_IOPERM.

diff --git a/binutils/config.in b/binutils/config.in
index bcabbba79104d59dfaf7ffea6440cf0bc79491ca..f5f3298a1e00479fa09d8c8bba4f40f701a17835 100644 (file)
--- a/binutils/config.in
+++ b/binutils/config.in
@@ -2,9 +2,10 @@
 
 /* Check that config.h is #included before system headers
    (this works only for glibc, but that should be enough).  */
-#if defined(__GLIBC__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
 #  error config.h must be #included before system headers
 #endif
+#define __CONFIG_H__ 1
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.

diff --git a/binutils/configure.in b/binutils/configure.in
index e9852de44f9b12007db06e5446c9c199e6a570f3..b4e493ecb2d97642f3e4110af6a3198ac19595a8 100644 (file)
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -47,9 +47,10 @@ AC_CONFIG_HEADERS(config.h:config.in)
 AH_VERBATIM([00_CONFIG_H_CHECK],
 [/* Check that config.h is #included before system headers
    (this works only for glibc, but that should be enough).  */
-#if defined(__GLIBC__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
 #  error config.h must be #included before system headers
-#endif])
+#endif
+#define __CONFIG_H__ 1])
 
 if test -z "$target" ; then
     AC_MSG_ERROR(Unrecognized target system type; please check config.sub.)