From patchwork Mon Mar 19 16:41:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 147578 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 326FFB6FC9 for ; Tue, 20 Mar 2012 03:42:07 +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=1332780129; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Date:From:To:Cc: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=31E51JJ+LMEQeFggJE/z WqywU/U=; b=nPMikfSuNvZdSygBabf9IsA4MdQnmKnGde195GdoHyhRPHhXY/Hv MvyAVC7xUfGPf8BzrecNQu/8T8lVUbrZV3tnbmeiP/aYVSskHH8btIx3EKDi4vYa 8v75e9fCTbX8Zbp1kyNNXugPHRjSwzza+iGwkI42ueYtU3cA6/50iUg= 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:Received:Received:Received:Date:From:To:Cc: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; b=eoeJMNaC24338cE1CA2SKDMA9c1ryW5XO5Srnnf19He0C1wiV2+xnmnHiiKXtP +KonAqzN6pRI796s4TUSBnsbWtc5zAA3Anqge0W462BHXkS2rWHGX1J6oalDwkpZ ORZnGl5YSL8O3K3ejPkVaF0QUuyPijHnv7nx/K43zKB8M=; Received: (qmail 22295 invoked by alias); 19 Mar 2012 16:42:04 -0000 Received: (qmail 22285 invoked by uid 22791); 19 Mar 2012 16:42:04 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, SUBJ_OBFU_PUNCT_FEW, TW_RG X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 19 Mar 2012 16:41:39 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 57B2C1C6877; Mon, 19 Mar 2012 12:41:39 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id uKJ-oR5JHeis; Mon, 19 Mar 2012 12:41:39 -0400 (EDT) Received: from kwai.gnat.com (kwai.gnat.com [205.232.38.4]) by rock.gnat.com (Postfix) with ESMTP id 33D641C6857; Mon, 19 Mar 2012 12:41:39 -0400 (EDT) Received: by kwai.gnat.com (Postfix, from userid 4192) id 326083FEE8; Mon, 19 Mar 2012 12:41:39 -0400 (EDT) Date: Mon, 19 Mar 2012 12:41:39 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Vincent Celier Subject: [Ada] gnatmake crashes with -cargs -m -margs -m Message-ID: <20120319164139.GA24632@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) 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 This patch ensures that gnatmake no longer crashes when there are -m switches after -cargs and after -margs on the command line. Tested on x86_64-pc-linux-gnu, committed on trunk 2012-03-19 Vincent Celier * make.adb (Scan_Make_Arg): Make sure all significant -m switches on the command line are counted. Index: make.adb =================================================================== --- make.adb (revision 185520) +++ make.adb (working copy) @@ -7423,6 +7423,16 @@ Add_Switch (Argv, Program_Args, And_Save => And_Save); + -- Make sure that all significant switches -m on the command line + -- are counted. + + if Argv'Length > 2 + and then Argv (1 .. 2) = "-m" + and then Argv /= "-mieee" + then + N_M_Switch := N_M_Switch + 1; + end if; + -- Handle non-default compiler, binder, linker, and handle --RTS switch elsif Argv'Length > 2 and then Argv (1 .. 2) = "--" then