diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2012-11-05 12:26:11 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2012-11-05 12:26:11 +0000 |
| commit | 47dbf5b634b955c2db1221715d15751e1281546a (patch) | |
| tree | 8f2335f2311b768e04443e4293a7f4247383fe8b | |
| parent | 99a64a087ce6200b218937dfa1407c5c16becf4f (diff) | |
| download | binutils-47dbf5b634b955c2db1221715d15751e1281546a.tar.gz | |
* configure.in: Apply 2012-09-10 change to config.in here. Add
__CONFIG_H__ check.
* config.in: Regenerate.
| -rw-r--r-- | binutils/ChangeLog | 6 | ||||
| -rw-r--r-- | binutils/config.in | 3 | ||||
| -rw-r--r-- | binutils/configure.in | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 2f08dcc5a..3fed79334 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 bcabbba79..f5f3298a1 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 e9852de44..b4e493ecb 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.) |