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

8 files changed, 22 insertions, 5 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4fa94b1c0..c28f203a0 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,9 @@
 2012-11-05  Alan Modra  <amodra@gmail.com>
 
+	* configure.in: Apply 2012-09-10 change to config.in here.
+
+2012-11-05  Alan Modra  <amodra@gmail.com>
+
 	* elf64-ppc.c (ppc64_elf_edit_toc): Clear "repeat" inside
 	loop.  Really mark toc entry referring to another toc entry
 	only if the first is used.
diff --git a/bfd/configure.in b/bfd/configure.in
index 6261aab95..f7e3929b1 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -121,7 +121,7 @@ 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__) && !defined(__CONFIG_H__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
 #  error config.h must be #included before system headers
 #endif
 #define __CONFIG_H__ 1])
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 17045c733..395af6426 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
 2012-11-05  Alan Modra  <amodra@gmail.com>
 
+	* configure.in: Apply 2012-09-10 change to config.in here.
+
+2012-11-05  Alan Modra  <amodra@gmail.com>
+
 	* config/tc-ppc.c (md_chars_to_number): Delete.
 	(ppc_setup_opcodes): Assert num_powerpc_operands fit.
 	(ppc_is_toc_sym): Move earlier in file.
diff --git a/gas/configure.in b/gas/configure.in
index 20a64d501..53e905bee 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -62,7 +62,7 @@ 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__) && !defined(__CONFIG_H__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
 #  error config.h must be #included before system headers
 #endif
 #define __CONFIG_H__ 1])
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3b86fcb57..e327bbc69 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-05  Alan Modra  <amodra@gmail.com>
+
+	* configure.in: Apply 2012-09-10 change to config.in here.
+
 2012-11-01  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* emultempl/elf32.em: Print stacksize help.
diff --git a/ld/configure.in b/ld/configure.in
index 97a513360..34d1b9687 100644
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -128,7 +128,7 @@ 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__) && !defined(__CONFIG_H__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
 #  error config.h must be #included before system headers
 #endif
 #define __CONFIG_H__ 1])
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 0e148ad2a..a1f9d6e9f 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,7 +1,12 @@
+2012-11-05  Alan Modra  <amodra@gmail.com>
+
+	* configure.in: Apply 2012-09-10 change to config.in here.
+
 2012-10-26  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
 	* s390-mkopc.c: Accept empty lines in s390-opc.txt.
-	* s390-opc.c: Add M_20OPT field. New instruction formats RRF_RURR2 and RRF_RMRR.
+	* s390-opc.c: Add M_20OPT field. New instruction formats RRF_RURR2
+	and RRF_RMRR.
 	* s390-opc.txt: Add new instructions.  New instruction type for lptea.
 
 2012-10-26  Christian Groessler  <chris@groessler.org>
diff --git a/opcodes/configure.in b/opcodes/configure.in
index 3c1a22a8a..462d3be5f 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -51,7 +51,7 @@ 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__) && !defined(__CONFIG_H__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__)
 #  error config.h must be #included before system headers
 #endif
 #define __CONFIG_H__ 1])