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

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c264d5f761467ea6791fa11d5a93d9a50339d368..fd717c96f73d550a7d9f19b8958f136b31e0b19c 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/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-10-29  Sean Keys <skeys@ipdatasys.com>
 
        * elf32-xgate.c(elf_xgate_howto_table): Fix src and dest mask for
@@ -35,7 +39,7 @@
 2012-09-18  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/14591
-       * elf-bfd.h (_bfd_elf_merge_symbol): Add an argument to return 
+       * elf-bfd.h (_bfd_elf_merge_symbol): Add an argument to return
        if the old symbol is weak.
 
        * elf32-sh-symbian.c (sh_symbian_relocate_section): Update

diff --git a/bfd/configure.in b/bfd/configure.in
index f5fe443926ceeaa06277257852cddb57e3b1cb4b..29d545b8b177f864f390a9d9a834d9b43a981fea 100644 (file)
--- 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/binutils/ChangeLog b/binutils/ChangeLog
index ad2e2d400d557edee6f908d155ef87987f985437..c9d6c51d97ba5a251a4ae2ff1c8802921b0de188 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-10-30  Nick Clifton  <nickc@redhat.com>
 
        PR binutils/14779

diff --git a/binutils/config.in b/binutils/config.in
index bc161439fbe8b53d138447c815211dce244c9ce2..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__) && !defined(__FreeBSD_kernel__)
+#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 5bfd6c005a987f5fd514a3630a54448cedcd202d..d142416841c735e462a7f2a65e69a729df7c8bbc 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.)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 36f075002469644921b8728e890730c6364812da..6d95496a2e7221419f1583b5083631eebb29ad20 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/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-09-18  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        * config/tc-arm.c: Changed ldra and strl-form mnemonics
@@ -13,7 +17,7 @@
        CPU_BTVER2_FLAGS.
        (i386_align_code): Add case for PROCESSOR_BT.
 
-       * config/tc-i386.h (enum processor_type): Add PROCESSOR_BT.       
+       * config/tc-i386.h (enum processor_type): Add PROCESSOR_BT.
 
        * doc/c-i386.texi: Add -march={btver1, btver2} options.
 

diff --git a/gas/configure.in b/gas/configure.in
index 1c0206d38790af600387ee51a91adcf3453045f5..14f6edfe5deb041e968454931c451e1da226e0d1 100644 (file)
--- 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/gold/ChangeLog b/gold/ChangeLog
index 122107dd993a9c842d1420e4f4e1d82dfea2713c..ff104578957109ae157479caa550616f4ea9c626 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-05  Alan Modra  <amodra@gmail.com>
+
+       * configure.ac: Apply 2012-09-10 change to config.in here.
+
 2012-09-10  Matthias Klose  <doko@ubuntu.com>
 
        * config.in: Disable sanity check for kfreebsd.

diff --git a/gold/configure.ac b/gold/configure.ac
index 05e807b64437ac289712d7a99c2526bf3b488ef7..c2326d35994b033a49591b896347d9b6755f2529 100644 (file)
--- a/gold/configure.ac
+++ b/gold/configure.ac
@@ -15,7 +15,7 @@ AM_CONFIG_HEADER(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 a4c300a2a1f181bc069631d77436e48156f31f2b..9f33f646b10809c24993bf6bfdc7bd0d860c85d9 100644 (file)
--- 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-09-10  Matthias Klose  <doko@ubuntu.com>
 
        * config.in: Disable sanity check for kfreebsd.

diff --git a/ld/configure.in b/ld/configure.in
index d0b8b94a0bd00a09ba572ff228d776c9bb0783f4..df5d2e22984822cfe14bf402dbcade7755cc65f1 100644 (file)
--- 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 96c98bf0e0468aa01c265326647fd13990c457b7..2e934761168f7364871bb6fd6d27f9d7ab08728f 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/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-09-18  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
         * arm-dis.c: Changed ldra and strl-form mnemonics
@@ -21,7 +25,7 @@
        * i386-gen.c (cpu_flag_init): Add CPU_BTVER1_FLAGS and
        CPU_BTVER2_FLAGS.
 
-       * i386-opc.h: Update CpuPRFCHW comment. 
+       * i386-opc.h: Update CpuPRFCHW comment.
 
        * i386-opc.tbl: Enable prefetch instruction for CpuPRFCHW.
        * i386-init.h: Regenerated.

diff --git a/opcodes/configure.in b/opcodes/configure.in
index cb5a0488d11b82057a923aa86e2e9346ae5e04c4..12d31c2ed83617911687c3c8f09c9b91a39d9021 100644 (file)
--- 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])