From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8504 invoked by alias); 5 Nov 2012 12:27:37 -0000 Received: (qmail 8483 invoked by uid 22791); 5 Nov 2012 12:27:36 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,KHOP_RCVD_TRUST,RCVD_IN_DNSWL_LOW,RCVD_IN_HOSTKARMA_YE,URIBL_BLACK X-Spam-Check-By: sourceware.org Received: from mail-da0-f41.google.com (HELO mail-da0-f41.google.com) (209.85.210.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 05 Nov 2012 12:27:31 +0000 Received: by mail-da0-f41.google.com with SMTP id i14so2819000dad.0 for ; Mon, 05 Nov 2012 04:27:31 -0800 (PST) Received: by 10.66.77.39 with SMTP id p7mr28115452paw.8.1352118451027; Mon, 05 Nov 2012 04:27:31 -0800 (PST) Received: from bubble.grove.modra.org ([101.166.26.37]) by mx.google.com with ESMTPS id pv7sm10511801pbc.20.2012.11.05.04.27.29 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Nov 2012 04:27:30 -0800 (PST) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id D41D2EA341E; Mon, 5 Nov 2012 22:57:25 +1030 (CST) Date: Mon, 05 Nov 2012 12:27:00 -0000 From: Alan Modra To: Matthias Klose , binutils Development Subject: Re: Release 2.23 Message-ID: <20121105122725.GH31965@bubble.grove.modra.org> Mail-Followup-To: Matthias Klose , binutils Development References: <504CA3A0.4020901@ubuntu.com> <20120909144833.GB3159@bubble.grove.modra.org> <504E0372.2050607@ubuntu.com> <20120910223331.GG3159@bubble.grove.modra.org> <20121105104801.GG31965@bubble.grove.modra.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20121105104801.GG31965@bubble.grove.modra.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2012-11/txt/msg00045.txt.bz2 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