From patchwork Sat Jul 19 06:52:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cody P Schafer X-Patchwork-Id: 371776 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AE575140139 for ; Sat, 19 Jul 2014 17:17:03 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=t1QFZYmvyAAgr4FFHhsczawRSVq+xE9 y/tWrCRdT0sJyWLI/ZvPqGH83HXoLXgImfdVy+cy0s8De1dxIH1m3zIuMd2/MvXQ EXcu9w+DVtPXCq9S73QXW2QZ3VuQgmqWeIQjnUhB8ZsmQvQDDDkNR78LJ+3JmpdA 8eqzfkcTRfEM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=UTyrq+HjgbY1wDsQfXPavOkg3pc=; b=si/TG /HNxW1cNKjyJh74Pn2Ff9Au5hnDGNbQ2vZbsWlQWJ22mIek+8lWFDzGvg919/+LS qntDTD2Ow5dLtHqlA3EVFAxM247OTKEeoml0T0Uekz2noAt5FvGKFNlw/Sk9oMGU BmskGvd7MenpjAd1R7ZK5FpxLpzfWE37rgd0Hw= Received: (qmail 18654 invoked by alias); 19 Jul 2014 07:16:30 -0000 Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org Received: (qmail 18596 invoked by uid 89); 19 Jul 2014 07:16:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qa0-f54.google.com Received: from mail-qa0-f54.google.com (HELO mail-qa0-f54.google.com) (209.85.216.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sat, 19 Jul 2014 07:16:29 +0000 Received: by mail-qa0-f54.google.com with SMTP id k15so3748237qaq.27 for ; Sat, 19 Jul 2014 00:16:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yw96PyVz6FCSx0GwFeZgMb7FGwRM6MFE4LuFMZhA+70=; b=mgenbvFC+tYtM2yMuT9HCUq4I1ayww5/6wo8/HsBHVpESbf2IUkP8/mK5og+jySvmE EnECaMUGTGd+nJYejOrOVZwgVLQt+2K9QsdKrTwrWdDqfi3pF3qHfLiOeDreNLeOw3kS rTLyOUPl9tq7z0Xo4NrwND77SwFxoz72UN4GlVNbzKwUKVYuLsHeYHXAA6gPtvGaKOuS zE46NA0IGYEVtarXD4URwMu9+6MUh2x0iDPivVVySKHN4U6dj2CMtVAtudS9YGhc6lKx yqkxoIdXwucmbTIAYW4EDE6yGDVmh+l8RRay8rhrb8BpzN6XqUUJTPmjRMw9d09Svt/1 2LTg== X-Gm-Message-State: ALoCoQlfPLbv3ZDYVPPTLqicv5piAw41byPuiQHcnuTymTJ1RkYziBNOQaMDydV8PHRKbR4LM1IS X-Received: by 10.224.168.13 with SMTP id s13mr1820934qay.80.1405754187237; Sat, 19 Jul 2014 00:16:27 -0700 (PDT) Received: from localhost (c-73-38-182-133.hsd1.ma.comcast.net. [73.38.182.133]) by mx.google.com with ESMTPSA id 97sm8716496qgl.45.2014.07.19.00.16.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jul 2014 00:16:26 -0700 (PDT) From: Cody P Schafer To: crossgcc@sourceware.org Cc: Cody P Schafer Subject: [PATCH 3/3] scripts/addToolVersion: simpily gcc handling and fix for gcc-4.9.X (and later) Date: Sat, 19 Jul 2014 02:52:08 -0400 Message-Id: <1405752728-18966-3-git-send-email-dev@codyps.com> In-Reply-To: <1405752728-18966-1-git-send-email-dev@codyps.com> References: <1405752728-18966-1-git-send-email-dev@codyps.com> Signed-off-by: Cody P Schafer --- scripts/addToolVersion.sh | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh index fe67c2d..34f42eb 100755 --- a/scripts/addToolVersion.sh +++ b/scripts/addToolVersion.sh @@ -111,20 +111,8 @@ addToolVersion() { # Extract 'M'ajor and 'm'inor from version string ver_M=$(getVersionField "${version}" . 1) ver_m=$(getVersionField "${version}" . 2) - if [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 8 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_8" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 7 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_7" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 6 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_6" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 5 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_5" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 4 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_4" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 3 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_3" - elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 2 \) ]; then - SedExpr1="${SedExpr1}\n select CC_GCC_4_2" + if [ ${ver_M} -ge 4 ] && [ ${ver_m} -ge 2 ]; then + SedExpr1="${SedExpr1}\n select CC_GCC_${ver_M}_${ver_m}" fi ;; binutils)