From fd53f0fd596b79faa57b80a3cd2adc6f3a067ec9 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 5 Nov 2012 12:39:45 +0000 Subject: [PATCH] * configure.in: Apply 2012-09-10 change to config.in here. --- bfd/ChangeLog | 6 +++++- bfd/configure.in | 2 +- binutils/ChangeLog | 6 ++++++ binutils/config.in | 3 ++- binutils/configure.in | 5 +++-- gas/ChangeLog | 6 +++++- gas/configure.in | 2 +- gold/ChangeLog | 4 ++++ gold/configure.ac | 2 +- ld/ChangeLog | 4 ++++ ld/configure.in | 2 +- opcodes/ChangeLog | 6 +++++- opcodes/configure.in | 2 +- 13 files changed, 39 insertions(+), 11 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c264d5f7614..fd717c96f73 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2012-11-05 Alan Modra + + * configure.in: Apply 2012-09-10 change to config.in here. + 2012-10-29 Sean Keys * elf32-xgate.c(elf_xgate_howto_table): Fix src and dest mask for @@ -35,7 +39,7 @@ 2012-09-18 H.J. Lu 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 f5fe443926c..29d545b8b17 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/binutils/ChangeLog b/binutils/ChangeLog index ad2e2d400d5..c9d6c51d97b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,9 @@ +2012-11-05 Alan Modra + + * configure.in: Apply 2012-09-10 change to config.in here. Add + __CONFIG_H__ check. + * config.in: Regenerate. + 2012-10-30 Nick Clifton PR binutils/14779 diff --git a/binutils/config.in b/binutils/config.in index bc161439fbe..f5f3298a1e0 100644 --- 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 5bfd6c005a9..d142416841c 100644 --- 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 36f07500246..6d95496a2e7 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2012-11-05 Alan Modra + + * configure.in: Apply 2012-09-10 change to config.in here. + 2012-09-18 Kyrylo Tkachov * 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 1c0206d3879..14f6edfe5de 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/gold/ChangeLog b/gold/ChangeLog index 122107dd993..ff104578957 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,7 @@ +2012-11-05 Alan Modra + + * configure.ac: Apply 2012-09-10 change to config.in here. + 2012-09-10 Matthias Klose * config.in: Disable sanity check for kfreebsd. diff --git a/gold/configure.ac b/gold/configure.ac index 05e807b6443..c2326d35994 100644 --- 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 a4c300a2a1f..9f33f646b10 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2012-11-05 Alan Modra + + * configure.in: Apply 2012-09-10 change to config.in here. + 2012-09-10 Matthias Klose * config.in: Disable sanity check for kfreebsd. diff --git a/ld/configure.in b/ld/configure.in index d0b8b94a0bd..df5d2e22984 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 96c98bf0e04..2e934761168 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2012-11-05 Alan Modra + + * configure.in: Apply 2012-09-10 change to config.in here. + 2012-09-18 Kyrylo Tkachov * 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 cb5a0488d11..12d31c2ed83 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]) -- 2.47.2