From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19696 invoked by alias); 28 Dec 2002 16:24:18 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 19682 invoked from network); 28 Dec 2002 16:24:17 -0000 Received: from unknown (HELO lacrosse.corp.redhat.com) (66.187.233.200) by 209.249.29.67 with SMTP; 28 Dec 2002 16:24:17 -0000 Received: from free.redhat.lsd.ic.unicamp.br (aoliva2.cipe.redhat.com [10.0.1.156]) by lacrosse.corp.redhat.com (8.11.6/8.9.3) with ESMTP id gBSGO1Y18508; Sat, 28 Dec 2002 11:24:01 -0500 Received: from free.redhat.lsd.ic.unicamp.br (localhost.localdomain [127.0.0.1]) by free.redhat.lsd.ic.unicamp.br (8.12.6/8.12.6) with ESMTP id gBSGO0MK021039; Sat, 28 Dec 2002 14:24:00 -0200 Received: (from aoliva@localhost) by free.redhat.lsd.ic.unicamp.br (8.12.6/8.12.6/Submit) id gBSGO0xC021035; Sat, 28 Dec 2002 14:24:00 -0200 To: Nathanael Nerode Cc: gcc-patches@gcc.gnu.org, gdb-patches@sources.redhat.com, binutils@sources.redhat.com, kazu@cs.umass.edu Subject: Re: (toplevel) Fix dramatic breakage for ordinary crosses (related to program_transform_name) References: <20021228093127.GA455@doctormoo> From: Alexandre Oliva Organization: GCC Team, Red Hat Date: Sat, 28 Dec 2002 08:33:00 -0000 In-Reply-To: <20021228093127.GA455@doctormoo> Message-ID: User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-SW-Source: 2002-12/txt/msg00717.txt.bz2 --=-=-= Content-length: 357 On Dec 28, 2002, Nathanael Nerode wrote: > Unfortunately, I really have to go to sleep now. :-( Fair enough. Hope you had a good night :-) > Please feel free to make this change on your own; it's obviously > correct as far as I'm concerned. Done. While at that, I fixed a few other fallouts. I'm checking in the patch below. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=makefiles.patch Content-length: 4892 Index: ChangeLog from Alexandre Oliva * Makefile.tpl ($(NOTPARALLEL)): Move to the end. Bring uses of program_transform_name to standard idiom. (AUTOGEN, AUTOCONF): Define. (Makefile.in): Use $(AUTOGEN). (Makefile): Depend on config.status, and use autoconf-style rule to build it. Move original commands to... (config.status): ... this new target. (configure): Add $(srcdir). Depend on config/acx.m4. Use $(AUTOCONF). * Makefile.in: Rebuilt. Index: Makefile.tpl =================================================================== RCS file: /cvs/gcc/gcc/Makefile.tpl,v retrieving revision 1.25 diff -u -p -r1.25 Makefile.tpl --- Makefile.tpl 28 Dec 2002 09:12:19 -0000 1.25 +++ Makefile.tpl 28 Dec 2002 16:21:54 -0000 @@ -23,12 +23,6 @@ in # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# Tell GNU make 3.79 not to run the top level in parallel. This -# prevents contention for $builddir/$target/config.cache, as well -# as minimizing scatter in file system caches. -NOTPARALLEL = .NOTPARALLEL -$(NOTPARALLEL): - VPATH=@srcdir@ links=@configlinks@ @@ -282,7 +276,7 @@ USUAL_AS_FOR_TARGET = ` \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ echo $(AS); \ else \ - t='$(program_transform_name)'; echo as | sed -e $$t ; \ + echo as | sed '$(program_transform_name)' ; \ fi; \ fi` @@ -296,7 +290,7 @@ USUAL_LD_FOR_TARGET = ` \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ echo $(LD); \ else \ - t='$(program_transform_name)'; echo ld | sed -e $$t ; \ + echo ld | sed '$(program_transform_name)' ; \ fi; \ fi` @@ -308,7 +302,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ echo $(DLLTOOL); \ else \ - t='$(program_transform_name)'; echo dlltool | sed -e $$t ; \ + echo dlltool | sed '$(program_transform_name)' ; \ fi; \ fi` @@ -320,7 +314,7 @@ USUAL_WINDRES_FOR_TARGET = ` \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ echo $(WINDRES); \ else \ - t='$(program_transform_name)'; echo windres | sed -e $$t ; \ + echo windres | sed '$(program_transform_name)' ; \ fi; \ fi` @@ -332,7 +326,7 @@ USUAL_AR_FOR_TARGET = ` \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ echo $(AR); \ else \ - t='$(program_transform_name)'; echo ar | sed -e $$t ; \ + echo ar | sed '$(program_transform_name)' ; \ fi; \ fi` @@ -348,7 +342,7 @@ USUAL_RANLIB_FOR_TARGET = ` \ echo ranlib; \ fi; \ else \ - t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \ + echo ranlib | sed '$(program_transform_name)' ; \ fi; \ fi` @@ -362,7 +356,7 @@ USUAL_NM_FOR_TARGET = ` \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ echo $(NM); \ else \ - t='$(program_transform_name)'; echo nm | sed -e $$t ; \ + echo nm | sed '$(program_transform_name)' ; \ fi; \ fi` @@ -1414,19 +1408,30 @@ multilib.ts: maybe-all-gcc echo timestamp > multilib.ts # Rebuilding Makefile.in, using autogen. +AUTOGEN = autogen $(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def - cd $(srcdir) && autogen Makefile.def + cd $(srcdir) && $(AUTOGEN) Makefile.def # Rebuilding Makefile. -Makefile: Makefile.in configure $(gcc_version_trigger) +Makefile: $(srcdir)/Makefile.in config.status + CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + +config.status: configure $(gcc_version_trigger) $(SHELL) ./config.status --recheck # Rebuilding configure. -configure: configure.in - cd $(srcdir) && autoconf +AUTOCONF = autoconf +$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/config/acx.m4 + cd $(srcdir) && $(AUTOCONF) # .NOEXPORT: MAKEOVERRIDES= + +# Tell GNU make 3.79 not to run the top level in parallel. This +# prevents contention for $builddir/$target/config.cache, as well +# as minimizing scatter in file system caches. +NOTPARALLEL = .NOTPARALLEL +$(NOTPARALLEL): # end of Makefile.in Index: contrib/ChangeLog from Alexandre Oliva * gcc_update (configure): Depend on config/acx.m4 as well. Index: contrib/gcc_update =================================================================== RCS file: /cvs/gcc/gcc/contrib/gcc_update,v retrieving revision 1.39 diff -u -p -r1.39 gcc_update --- contrib/gcc_update 28 Dec 2002 13:21:17 -0000 1.39 +++ contrib/gcc_update 28 Dec 2002 16:21:54 -0000 @@ -106,7 +106,7 @@ libjava/libltdl/configure: libjava/liblt libjava/libltdl/stamp-h.in: libjava/libltdl/configure.in libjava/libltdl/aclocal.m4 libjava/libltdl/acconfig.h # Top level Makefile.in: Makefile.tpl Makefile.def -configure: configure.in +configure: configure.in config/acx.m4 EOF } --=-=-= Content-length: 289 -- Alexandre Oliva Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/ Red Hat GCC Developer aoliva@{redhat.com, gcc.gnu.org} CS PhD student at IC-Unicamp oliva@{lsd.ic.unicamp.br, gnu.org} Free Software Evangelist Professional serial bug killer --=-=-=--