From patchwork Tue Jan 11 13:32:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 49857 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1E80338A940B for ; Tue, 11 Jan 2022 13:58:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E80338A940B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1641909485; bh=+s3x5hzvsbAEC5tf6G259FxfUdFGJBAepdkeqZd1wyA=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=a7Ik165MEvfrcBv13wFUilOdBiXB0jjjd9JzLM3mpTrjqv07/q/y7ns7p2rAUuu8A R5efiFEpwQr2g70W2/j78KjqpU4tT6s4W5aYOSdFA0gznUpXfuzewDOG/hAtQUrhJb PdXzIVX9uI3hWTR3w0X5zN2iv9hAGdliWQ9EjGY4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id 0459038A9417 for ; Tue, 11 Jan 2022 13:32:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0459038A9417 Received: by mail-wr1-x431.google.com with SMTP id t28so26238010wrb.4 for ; Tue, 11 Jan 2022 05:32:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=+s3x5hzvsbAEC5tf6G259FxfUdFGJBAepdkeqZd1wyA=; b=mkmoqio1IVZvr7m8Okg714rKd198RZIEEv+/yBTLe7Ji0Bnxx5YzSugcPzf297Y5S9 DwWvMwv7zbnRADCXPTWR2n+OUP0z32aRaTDAClomB4gO7cajJlF3kzSWtAWs9fKoG8pR 0cG1CJa+OmaeKifcnJmGBmiM+bPEhabBb6gNjQ2M7vXMDQqWWFNm1vbSjBsdu/KLR6M3 fimrCkZmAcPKGzE99mta45O/iwaC2g5eHeKYjVryoUJZxc0yGHQQ+AAlP5Ov7T7lvI4t TBKNWkrhQG3XGKlaTW/30hPdM1o60aNyoUTk+p85PZZOOESwVjseihX4Hbz6udYGWFqr jeTQ== X-Gm-Message-State: AOAM530x3X7X2iyWkDG57PfdO2b2PTYC2GCQML3BYAGIU1t6aZqumzUI WGh99YHR/d6fap+CKCjYcgsZ0hIiq5JRtQ== X-Google-Smtp-Source: ABdhPJztXdek1U9kYJQfuxp7k6vKO9dXtQ+ggIVPXsIOoh7phrrF2ea3d1C1HhiN9FRX1RCZssCFNA== X-Received: by 2002:adf:ce12:: with SMTP id p18mr3699866wrn.225.1641907944083; Tue, 11 Jan 2022 05:32:24 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id 9sm11981567wrz.90.2022.01.11.05.32.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 05:32:23 -0800 (PST) Date: Tue, 11 Jan 2022 13:32:22 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] PR ada/79724 Message-ID: <20220111133222.GA748798@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Fix handling of e.g. gcc-11 in Osint.Program_Name. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ PR ada/79724 * osint.adb (Program_Name): Fix handling of suffixes. diff --git a/gcc/ada/osint.adb b/gcc/ada/osint.adb --- a/gcc/ada/osint.adb +++ b/gcc/ada/osint.adb @@ -2279,8 +2279,6 @@ package body Osint is Find_Program_Name; - Start_Of_Suffix := Name_Len + 1; - -- Find the target prefix if any, for the cross compilation case. -- For instance in "powerpc-elf-gcc" the target prefix is -- "powerpc-elf-" @@ -2304,9 +2302,7 @@ package body Osint is end if; end loop; - if End_Of_Prefix > 1 then - Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1; - end if; + Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1; -- Create the new program name