From patchwork Tue Jan 8 22:36:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan-Benedict Glaw X-Patchwork-Id: 210553 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 91E732C00AC for ; Wed, 9 Jan 2013 09:36:33 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1358289393; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Date: From:To:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=0S9jrdWwVtxZ3QT3fXe9VNbnZWA=; b=saCT29ESgCkOzkF MH9HCwxqcKRiPVhZ7AabKTJEs8o3+X1jTTe17LR3qt3iRTnaSr+kXr9WlzsZ0sze saqhd+vajzkSncEGvgTt5a2YlS/f+Fl5Yux/AjYCaKBqFem8pn8gqsztNWnKgbUY TWJe6Vgi+NZAsfkrx2mggsDcVpQs= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Date:From:To:Subject:Message-ID:MIME-Version:Content-Type:Content-Disposition:X-gpg-fingerprint:X-gpg-key:X-Echelon-Enable:X-TKUeV:User-Agent:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=YYAao1LvDF0q9uCbnksxwX8e4tVAYYziacyE2cj3FfZUzvrgC0t/j9AEhhf4Wc JFI3TcT/Ch8luXjcVIABQ17fvCBgF/15lQSfoBOjlpPEqGu6CdSu0DGqqIngMpeK w61eUbjiHGmUSgV00i3DD0LVpbjAmUw8es0WbSvHzRFqI=; Received: (qmail 18452 invoked by alias); 8 Jan 2013 22:36:27 -0000 Received: (qmail 18368 invoked by uid 22791); 8 Jan 2013 22:36:26 -0000 X-SWARE-Spam-Status: No, hits=-3.9 required=5.0 tests=AWL, BAYES_20, KHOP_PGP_SIGNED, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from lug-owl.de (HELO lug-owl.de) (195.71.106.12) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 08 Jan 2013 22:36:20 +0000 Received: by lug-owl.de (Postfix, from userid 1001) id 221F4F0105; Tue, 8 Jan 2013 23:36:19 +0100 (CET) Date: Tue, 8 Jan 2013 23:36:19 +0100 From: Jan-Benedict Glaw To: gcc-patches@gcc.gnu.org Subject: [PATCH] Merge Makefile.{def,in} from Binutils Message-ID: <20130108223619.GI2849@lug-owl.de> MIME-Version: 1.0 Content-Disposition: inline X-gpg-fingerprint: 250D 3BCF 7127 0D8C A444 A961 1DBD 5E75 8399 E1BB X-gpg-key: wwwkeys.de.pgp.net X-Echelon-Enable: howto poison arsenous mail psychological biological nuclear warfare test the bombastical terror of flooding the spy listeners explosion sex drugs and rock'n'roll X-TKUeV: howto poison arsenous mail psychological biological nuclear warfare test the bombastical terror of flooding the spy listeners explosion sex drugs and rock'n'roll User-Agent: Mutt/1.5.20 (2009-06-14) X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Hi! I merged this patch from Binutils, which defines a dep on gas for various other Binutils components: 2013-01-07 Jan-Benedict Glaw * Makefile.def: Merge from binutils. * Makefile.in: Dito. MfG, JBG Index: Makefile.in =================================================================== --- Makefile.in (revision 195037) +++ Makefile.in (working copy) @@ -45910,6 +45910,14 @@ all-stage4-binutils: maybe-all-stage4-intl all-stageprofile-binutils: maybe-all-stageprofile-intl all-stagefeedback-binutils: maybe-all-stagefeedback-intl +all-binutils: maybe-all-gas + +all-stage1-binutils: maybe-all-stage1-gas +all-stage2-binutils: maybe-all-stage2-gas +all-stage3-binutils: maybe-all-stage3-gas +all-stage4-binutils: maybe-all-stage4-gas +all-stageprofile-binutils: maybe-all-stageprofile-gas +all-stagefeedback-binutils: maybe-all-stagefeedback-gas install-binutils: maybe-install-opcodes install-strip-binutils: maybe-install-strip-opcodes install-opcodes: maybe-install-bfd @@ -45959,6 +45967,7 @@ all-gprof: maybe-all-bfd all-gprof: maybe-all-opcodes all-gprof: maybe-all-intl +all-gprof: maybe-all-gas configure-ld: maybe-configure-intl configure-stage1-ld: maybe-configure-stage1-intl @@ -46015,6 +46024,14 @@ all-stage4-ld: maybe-all-stage4-intl all-stageprofile-ld: maybe-all-stageprofile-intl all-stagefeedback-ld: maybe-all-stagefeedback-intl +all-ld: maybe-all-gas + +all-stage1-ld: maybe-all-stage1-gas +all-stage2-ld: maybe-all-stage2-gas +all-stage3-ld: maybe-all-stage3-gas +all-stage4-ld: maybe-all-stage4-gas +all-stageprofile-ld: maybe-all-stageprofile-gas +all-stagefeedback-ld: maybe-all-stagefeedback-gas install-ld: maybe-install-gold install-strip-ld: maybe-install-strip-gold configure-gold: maybe-configure-intl @@ -46057,6 +46074,14 @@ all-stage4-gold: maybe-all-build-bison all-stageprofile-gold: maybe-all-build-bison all-stagefeedback-gold: maybe-all-build-bison +all-gold: maybe-all-gas + +all-stage1-gold: maybe-all-stage1-gas +all-stage2-gold: maybe-all-stage2-gas +all-stage3-gold: maybe-all-stage3-gas +all-stage4-gold: maybe-all-stage4-gas +all-stageprofile-gold: maybe-all-stageprofile-gas +all-stagefeedback-gold: maybe-all-stagefeedback-gas check-gold: maybe-all-binutils check-stage1-gold: maybe-all-stage1-binutils Index: Makefile.def =================================================================== --- Makefile.def (revision 195037) +++ Makefile.def (working copy) @@ -373,6 +373,9 @@ dependencies = { module=configure-opcodes; on=configure-libiberty; hard=true; }; dependencies = { module=all-opcodes; on=all-libiberty; }; +// We must build gas before binutils, gprof, ld and gold to avoid race +// condition in the prev-gcc/as script during bootstrap of combined tree +// with GCC and binutils. See PR gas/14899 for details. dependencies = { module=configure-binutils; on=configure-intl; }; dependencies = { module=all-binutils; on=all-libiberty; }; dependencies = { module=all-binutils; on=all-opcodes; }; @@ -380,6 +383,7 @@ dependencies = { module=all-binutils; on=all-build-flex; }; dependencies = { module=all-binutils; on=all-build-bison; }; dependencies = { module=all-binutils; on=all-intl; }; +dependencies = { module=all-binutils; on=all-gas; }; // We put install-opcodes before install-binutils because the installed // binutils might be on PATH, and they might need the shared opcodes @@ -401,6 +405,7 @@ dependencies = { module=all-gprof; on=all-bfd; }; dependencies = { module=all-gprof; on=all-opcodes; }; dependencies = { module=all-gprof; on=all-intl; }; +dependencies = { module=all-gprof; on=all-gas; }; dependencies = { module=configure-ld; on=configure-intl; }; dependencies = { module=all-ld; on=all-libiberty; }; dependencies = { module=all-ld; on=all-bfd; }; @@ -408,6 +413,7 @@ dependencies = { module=all-ld; on=all-build-bison; }; dependencies = { module=all-ld; on=all-build-flex; }; dependencies = { module=all-ld; on=all-intl; }; +dependencies = { module=all-ld; on=all-gas; }; dependencies = { module=install-ld; on=install-gold; }; dependencies = { module=install-strip-ld; on=install-strip-gold; }; dependencies = { module=configure-gold; on=configure-intl; }; @@ -415,6 +421,7 @@ dependencies = { module=all-gold; on=all-intl; }; dependencies = { module=all-gold; on=all-bfd; }; dependencies = { module=all-gold; on=all-build-bison; }; +dependencies = { module=all-gold; on=all-gas; }; dependencies = { module=check-gold; on=all-binutils; }; dependencies = { module=check-gold; on=all-gas; };