From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2561 invoked by alias); 24 May 2006 14:28:51 -0000 Received: (qmail 2549 invoked by uid 22791); 24 May 2006 14:28:50 -0000 X-Spam-Check-By: sourceware.org Received: from intranet.codesourcery.com (HELO mail.codesourcery.com) (65.74.133.6) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 24 May 2006 14:28:47 +0000 Received: (qmail 6684 invoked from network); 24 May 2006 14:06:54 -0000 Received: from unknown (HELO ?10.0.0.101?) (shinwell@127.0.0.2) by mail.codesourcery.com with ESMTPA; 24 May 2006 14:06:54 -0000 Message-ID: <44746877.7000209@codesourcery.com> Date: Wed, 24 May 2006 17:09:00 -0000 From: Mark Shinwell User-Agent: Thunderbird 1.5 (Macintosh/20051201) MIME-Version: 1.0 To: binutils@sourceware.org CC: gcc-patches@gcc.gnu.org Subject: Re: [PATCH] enabling gprof for cross builds References: <445F9A15.7000103@codesourcery.com> <20060508234927.GA19926@ozlabs.au.ibm.com> <4460CFE9.3090106@codesourcery.com> <44740A1D.70007@codesourcery.com> <20060524125100.GA25587@nevyn.them.org> In-Reply-To: <20060524125100.GA25587@nevyn.them.org> Content-Type: multipart/mixed; boundary="------------090709050200040600030806" X-IsSubscribed: yes Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2006-05/txt/msg00438.txt.bz2 This is a multi-part message in MIME format. --------------090709050200040600030806 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 412 Daniel Jacobowitz wrote: > On Wed, May 24, 2006 at 08:24:13AM +0100, Mark Shinwell wrote: >> Could I ping on this one please. > > I'm sufficiently convinced. With a changelog entry, this is OK. Be > sure to (A) commit it to both gcc and src, and (B) regenerate the top > level configure script with the correct version of autoconf. Committed to both gcc and src. (Patches attached for completeness.) Mark --------------090709050200040600030806 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="gcc-gprof.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="gcc-gprof.patch" Content-length: 3480 Index: ChangeLog =================================================================== --- ChangeLog (revision 114021) +++ ChangeLog (working copy) @@ -1,3 +1,8 @@ +2006-05-24 Mark Shinwell + + * configure.in: Enable gprof for cross builds. + * configure: Regenerate. + 2006-05-22 Richard Guenther Revert Index: configure =================================================================== --- configure (revision 114021) +++ configure (working copy) @@ -1013,7 +1013,7 @@ esac # Some tools are only suitable for building in a "native" situation. # Remove these if host!=target. -native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" +native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" # Similarly, some are only suitable for cross toolchains. # Remove these if host=target. @@ -7290,15 +7290,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; ex # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. Index: configure.in =================================================================== --- configure.in (revision 114021) +++ configure.in (working copy) @@ -226,7 +226,7 @@ esac # Some tools are only suitable for building in a "native" situation. # Remove these if host!=target. -native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" +native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" # Similarly, some are only suitable for cross toolchains. # Remove these if host=target. --------------090709050200040600030806 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="src-gprof.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="src-gprof.patch" Content-length: 1575 Index: configure =================================================================== RCS file: /cvs/src/src/configure,v retrieving revision 1.218 diff -r1.218 configure 1025c1025 < native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" --- > native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" Index: ChangeLog =================================================================== RCS file: /cvs/src/src/ChangeLog,v retrieving revision 1.650 diff -r1.650 ChangeLog 0a1,5 > 2006-05-24 Mark Shinwell > > * configure.in: Enable gprof for cross builds. > * configure: Regenerate. > Index: configure.in =================================================================== RCS file: /cvs/src/src/configure.in,v retrieving revision 1.305 diff -r1.305 configure.in 230c230 < native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" --- > native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" --------------090709050200040600030806--