aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2012-11-05 12:26:11 +0000
committerAlan Modra <amodra@gmail.com>2012-11-05 12:26:11 +0000
commite6f881072feacde4d554ea882335967884209089 (patch)
tree76b03a75ab1bddd47d50e79f0e53d05124337458 /binutils
parentd17dce55671e34440a65ad06713db7c3ad4114dd (diff)
downloadgdb-e6f881072feacde4d554ea882335967884209089.zip
gdb-e6f881072feacde4d554ea882335967884209089.tar.gz
gdb-e6f881072feacde4d554ea882335967884209089.tar.bz2
* configure.in: Apply 2012-09-10 change to config.in here. Add
__CONFIG_H__ check. * config.in: Regenerate.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/config.in3
-rw-r--r--binutils/configure.in5
3 files changed, 11 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 2f08dcc..3fed793 100644
--- 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 bcabbba..f5f3298 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__)
+#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 e9852de..b4e493e 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.)