Release 2.23

Alan Modra amodra@gmail.com
Mon Nov 5 12:27:00 GMT 2012


On Mon, Nov 05, 2012 at 09:18:01PM +1030, Alan Modra wrote:
> On Tue, Sep 11, 2012 at 08:03:31AM +0930, Alan Modra wrote:
> > On Mon, Sep 10, 2012 at 05:12:50PM +0200, Matthias Klose wrote:
> > > On 09.09.2012 16:48, Alan Modra wrote:
> > > > On Sun, Sep 09, 2012 at 04:11:44PM +0200, Matthias Klose wrote:
> > > >> a quick fix for this is to disable this safety check on kfreebsd by checking
> > > >> that the __FreeBSD_kernel__ macro isn't defined.
> > > > 
> > > > The patch is OK with suitable ChangeLog entries.
> > > 
> > > attached (this time with the diff for ChangeLog's as well). please check it in.
> > 
> > Applied.
> 
> Oops.  config.in is a generated file..

Sigh, and I missed binutils/configure.in and gold/configure.ac
because config.in had already been regenerated in binutils and I
wasn't building gold.  I also don't see why the binutils directory
should have a different test (not allowing multiple inclusion of
config.h) to the others.

binutils/
	* configure.in: Apply 2012-09-10 change to config.in here.  Add
	__CONFIG_H__ check.
	* config.in: Regenerate.
gold/
	* configure.ac: Apply 2012-09-10 change to config.in here.
	* configure: Regenerate.

Index: binutils/configure.in
===================================================================
RCS file: /cvs/src/src/binutils/configure.in,v
retrieving revision 1.114
diff -u -p -r1.114 configure.in
--- binutils/configure.in	30 Oct 2012 12:44:54 -0000	1.114
+++ binutils/configure.in	5 Nov 2012 12:09:53 -0000
@@ -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.)
Index: gold/configure.ac
===================================================================
RCS file: /cvs/src/src/gold/configure.ac,v
retrieving revision 1.78
diff -u -p -r1.78 configure.ac
--- gold/configure.ac	15 Sep 2012 17:11:28 -0000	1.78
+++ gold/configure.ac	5 Nov 2012 12:09:56 -0000
@@ -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])

-- 
Alan Modra
Australia Development Lab, IBM



More information about the Binutils mailing list