From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1519 invoked by alias); 6 Jun 2006 18:35:49 -0000 Received: (qmail 1506 invoked by uid 22791); 6 Jun 2006 18:35:48 -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; Tue, 06 Jun 2006 18:35:44 +0000 Received: (qmail 14904 invoked from network); 6 Jun 2006 18:35:42 -0000 Received: from unknown (HELO localhost) (carlos@127.0.0.2) by mail.codesourcery.com with ESMTPA; 6 Jun 2006 18:35:42 -0000 Date: Tue, 06 Jun 2006 18:42:00 -0000 From: Carlos O'Donell To: binutils@sourceware.org, DJ Delorie Subject: [PATCH] Sync Makefile* configure* Message-ID: <20060606183411.GO20279@lios> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11+cvs20060126 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-06/txt/msg00064.txt.bz2 dj, Sync from gcc. Ok to commit? Tested in i686-pc-linux-gnu without regressions. Cheers, Carlos. -- Carlos O'Donell CodeSourcery carlos@codesourcery.com (650) 331-3385 x716 2006-06-06 Carlos O'Donell Sync from gcc: 2006-06-05 Paolo Bonzini PR 27674 * Makefile.tpl (configure-[+prefix+][+module+], all-[+prefix+][+module+]): Depend on stage_current if bootstrapping. Remove rule to unstage bootstrapped modules. (stage_current): New. * Makefile.in: Regenerate. 2006-05-20 John David Anglin Andreas Tobler * configure.in: Enable libgcj for hppa*-hp-hpux11*. * configure: Rebuilt. Revert 2006-01-31 Richard Guenther Paolo Bonzini * Makefile.def (target_modules): Add libgcc-math target module. * configure.in (target_libraries): Add libgcc-math target library. (--enable-libgcc-math): New configure switch. * Makefile.in: Re-generate. * configure: Re-generate. Index: Makefile.def =================================================================== RCS file: /cvs/src/src/Makefile.def,v retrieving revision 1.68 diff -u -p -r1.68 Makefile.def --- Makefile.def 31 May 2006 15:14:34 -0000 1.68 +++ Makefile.def 6 Jun 2006 18:24:28 -0000 @@ -117,7 +117,6 @@ host_modules= { module= gnattools; }; target_modules = { module= libstdc++-v3; lib_path=.libs; raw_cxx=true; }; target_modules = { module= libmudflap; lib_path=.libs; }; target_modules = { module= libssp; lib_path=.libs; }; -target_modules = { module= libgcc-math; lib_path=.libs; }; target_modules = { module= newlib; }; target_modules = { module= libgfortran; }; target_modules = { module= libobjc; }; Index: Makefile.tpl =================================================================== RCS file: /cvs/src/src/Makefile.tpl,v retrieving revision 1.161 diff -u -p -r1.161 Makefile.tpl --- Makefile.tpl 25 May 2006 08:01:03 -0000 1.161 +++ Makefile.tpl 6 Jun 2006 18:24:28 -0000 @@ -720,14 +720,12 @@ TAGS: do-TAGS [+ DEFINE configure +] .PHONY: configure-[+prefix+][+module+] maybe-configure-[+prefix+][+module+] maybe-configure-[+prefix+][+module+]: +@if gcc-bootstrap +configure-[+prefix+][+module+]: stage_current +@endif gcc-bootstrap @if [+prefix+][+module+] maybe-configure-[+prefix+][+module+]: configure-[+prefix+][+module+] -configure-[+prefix+][+module+]: [+ IF bootstrap +] -@endif [+prefix+][+module+] -@if [+prefix+][+module+]-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif [+prefix+][+module+]-bootstrap -@if [+prefix+][+module+][+ ELSE bootstrap +] +configure-[+prefix+][+module+]: [+ IF bootstrap +][+ ELSE +] @: $(MAKE); $(unstage)[+ ENDIF bootstrap +] @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -811,16 +809,14 @@ configure-stage[+id+]-[+prefix+][+module [+ DEFINE all +] .PHONY: all-[+prefix+][+module+] maybe-all-[+prefix+][+module+] maybe-all-[+prefix+][+module+]: +@if gcc-bootstrap +all-[+prefix+][+module+]: stage_current +@endif gcc-bootstrap @if [+prefix+][+module+] TARGET-[+prefix+][+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +] maybe-all-[+prefix+][+module+]: all-[+prefix+][+module+] -all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +] -@endif [+prefix+][+module+] -@if [+prefix+][+module+]-bootstrap - @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi -@endif [+prefix+][+module+]-bootstrap -@if [+prefix+][+module+][+ ELSE bootstrap +] +all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +][+ ELSE +] @: $(MAKE); $(unstage)[+ ENDIF bootstrap +] @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -1429,6 +1425,11 @@ do-distclean: distclean-stage1 stage_last: $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble +# Same as unstage, but not phony and defaulting to stage1-start. We place +# it in the dependency so that for example `make -j3 all-gcc' works. +stage_current: + @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi + .PHONY: restrap restrap: @: $(MAKE); $(stage) Index: configure.in =================================================================== RCS file: /cvs/src/src/configure.in,v retrieving revision 1.306 diff -u -p -r1.306 configure.in --- configure.in 24 May 2006 13:55:10 -0000 1.306 +++ configure.in 6 Jun 2006 18:24:28 -0000 @@ -148,7 +148,6 @@ target_libraries="target-libiberty \ target-libstdc++-v3 \ target-libmudflap \ target-libssp \ - target-libgcc-math \ target-libgfortran \ ${libgcj} \ target-libobjc \ @@ -313,18 +312,6 @@ AC_ARG_ENABLE(libssp, ENABLE_LIBSSP=$enableval, ENABLE_LIBSSP=yes) -# Set the default so we build libgcc-math for ix86 and x86_64 -AC_ARG_ENABLE(libgcc-math, -[ --enable-libgcc-math Builds libgcc-math directory],, -[ -case "${target}" in - i?86-* | x86_64-* ) - enable_libgcc_math=yes ;; - *) - enable_libgcc_math=no ;; -esac -]) - # Save it here so that, even in case of --enable-libgcj, if the Java # front-end isn't enabled, we still get libgcj disabled. libgcj_saved=$libgcj @@ -584,6 +571,9 @@ case "${target}" in hppa*64*-*-*) noconfigdirs="$noconfigdirs ${libgcj}" ;; + hppa*-hp-hpux11*) + noconfigdirs="$noconfigdirs ld shellutils" + ;; hppa*-*-*) # According to Alexandre Oliva , libjava won't # build on HP-UX 10.20.