From patchwork Mon Sep 15 13:01:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 120264 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 776A53857823 for ; Mon, 15 Sep 2025 13:12:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 776A53857823 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=CjiGkOYm X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by sourceware.org (Postfix) with ESMTPS id D3D25385C418 for ; Mon, 15 Sep 2025 13:01:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D3D25385C418 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D3D25385C418 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757941316; cv=none; b=bVL4cL+bAA/4ltWoBcWCCOlJYZBoQ0fWcV98w/+jKzmM7pCd4qpVDYNoIFvyPDHotlEGRqBLGvh7/8+FlWDM6Zr7yRZW9RyJcePhCsJxuq9XLsaEhjuErYVtxPUvJRjhY14Jxb1/sl+510ytVX3nn37AwC4QhsXRpZ+sVHZNG3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757941316; c=relaxed/simple; bh=Ikg/ey+uVnPoYrIdJIlPOEhFDvD6vtV5sWaT6og8LWc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=nHKr0kLPag02nSknA0xxoszHL4GeNzqg/cWcek5qNunj741NBUxJYuEIENbFFMxU8WxAjmPOuzR9SpuPbuLS/Is2KXq+Y/j26hjYnb+HSVm1wnU6Gski5Zmc1wgn/F79Mn0QH+O9MLW08Q/jAK7vAnrmb6+xKTvb8t1b5d3ClWs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D3D25385C418 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-45f2a69d876so8780345e9.0 for ; Mon, 15 Sep 2025 06:01:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1757941314; x=1758546114; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hP/USY90gzQYvGkpLVVoyUcJGF9hA8kH8WAJD2gS4/E=; b=CjiGkOYm2AKQ7l3rIicEo8o8uWjwJcBNemARr3gf0NJj/i0HkrNMCBrUDlFFEutcWK hmTbLrxyzyHoxXweiMxvKHLbuTVxPTx3oPfP42mjMu5s7G8A3Db/ipdJl3nkCDw+5aXm j1oEVfg+hImcVxHgms54VR7DV8ZEuTXNg5Jp/TfCm0z8M0SCOY57GLpiZNhd7AtH4ABW 35dMbnha5NRu4paSrUvZX23LaeRKQSz5mQiPS5SQ14vak93mEk8J6ZU08vLuty2EftxM CSpzvfgjMdxdOEQ+XJmm+CeQMd/7UyjJG/bnUVwn3Cx5yUpdtR2+m8XPFhW3gm/b/5lu b19Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757941314; x=1758546114; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hP/USY90gzQYvGkpLVVoyUcJGF9hA8kH8WAJD2gS4/E=; b=vkHPjPRNxu19ryXY2z1lKGp7NOTXTp5eWxkm4J6YL2DCd5XLe/ha717plKdRP4FWei 4oW/QI1BecadBVgDGcdkN6zlkxXW5xGnv75dVIG1iTXKft0Iq1Vxbudx663iPCw4WS4y 9niR65s4Gt31yLwQiMl4U5nvkZwVbIh0q1NzuoipbcBj9Vnl8weFDwjLYLYlLtMpWoBy QZOtEhLYK06tG4/ARlQVWoyPzbE7O5Yvei1x7LoccMOVs9Hj/af0soEqDbewHMZmUc1/ f+7Lelpvk65eD0OFRcuhLKKDk5okLFhwOQatxjqyNUf5CHt1/arhMhRrwgApAHS5ahH4 3YeA== X-Gm-Message-State: AOJu0YyQXvzac/KurAr95XzGPfutkPgUozWVKINo6mcJsSCG0W+pL2rq t1gPJkY2dTINWaEv6hAnpgKFS/pxSW9DLhjDyScoDNVhwvmolzom2fapS8d3Rx8tnQfsHkihtk7 1xKY= X-Gm-Gg: ASbGncv5lEHebL4jTCP7mmBjLo5Z83AA5O5hDkcs1JSeeIyMqZJMjLPC42FaitHrj7N ZrEBkzVn44gM+D3QLNsYWqEc9WrOSqDUQ5uM2uD/YyJwn/9o6vzBkxXv6QvLfrsDDuL+HsgWANl I5GvJ+hNNb2k9ZDJVS575wKAfxkp4T12Ur/FPk+bih2ihSTRGN47q3OeoQGzAUF7iIsWUD+uts4 B+nRARHd80VbXJLZJEHcncO/MgZGdFcJv22fqW3kjqkT2Rg73OqBRrRY3s3Qc9M/V7xSTureiCT djeS/2oF2dBh2E14n8sjI2e5mDBVfMgHYT5HLrl0uAG0YS98WKfl06Z4mQdhK+uYyOvG/OV/OlS HGVXwEmsGhuu0O7dikB1fHGs3t7IKSRDswfpBWbhsqRw26QbFRbJ3b4o68krM9A/whC/HDpoMmP D4sBgs/iyPiU0otJUi8ss3KGRtE6Ew98szCofGB28J7kw5JJSd X-Google-Smtp-Source: AGHT+IE0uzKlj8nRBInae4ojq2meqL0uCZ13pdZxoRZemDcaC67pymDJTYShHhUceApeG39+SVQXGA== X-Received: by 2002:a05:600c:6d45:b0:45d:e326:96ca with SMTP id 5b1f17b1804b1-45f21205905mr78567905e9.36.1757941313728; Mon, 15 Sep 2025 06:01:53 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3ea4b52b7fcsm5428733f8f.33.2025.09.15.06.01.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Sep 2025 06:01:53 -0700 (PDT) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Sebastian Poeplau Subject: [COMMITTED 06/27] ada: Recommend GPR's Toolchain_Name for GNAT LLVM more prominently Date: Mon, 15 Sep 2025 15:01:12 +0200 Message-ID: <20250915130135.2720894-6-poulhies@adacore.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250915130135.2720894-1-poulhies@adacore.com> References: <20250915130135.2720894-1-poulhies@adacore.com> MIME-Version: 1.0 X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org From: Sebastian Poeplau gcc/ada/ChangeLog: * doc/gnat_ugn/building_executable_programs_with_gnat.rst: Move recommendation of Toolchain_Name up. * gnat_ugn.texi: Regenerate. Tested on x86_64-pc-linux-gnu, committed on master. --- ...building_executable_programs_with_gnat.rst | 26 ++++++++-------- gcc/ada/gnat_ugn.texi | 30 +++++++++---------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst index fdf19481a6fc..2a26e4659b8b 100644 --- a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst +++ b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst @@ -8116,20 +8116,18 @@ We provide two options that you can use to build code with GNAT LLVM: * ``gprbuild`` can detect and use GNAT LLVM when it is installed. - ``gprbuild`` uses the first applicable compiler on the executable - search path, including GNAT LLVM. An easy way to build with GNAT - LLVM is to make it available on the operating system's search path - before any other Ada compiler (such as the GCC version of GNAT). To - avoid accidentally using a different compiler than the one you want - to use, we recommend generating an explicit toolchain configuration - file with ``gprconfig`` and using it with ``gprbuild``; see the - *GPRbuild and GPR Companion Tools User's Guide* for details. You - can determine from the first line of the :file:`.ali` file - which version of GNAT built that file because it contains either - :code:`GNAT` or :code:`GNAT-LLVM`. - - You can also explicitly select GNAT LLVM in your existing GPR project - file by adding :code:`for Toolchain_Name("Ada") use "GNAT_LLVM";` + ``gprbuild`` uses the first applicable compiler on the executable search + path, including GNAT LLVM. An easy way to build with GNAT LLVM is to make + it available on the operating system's search path before any other Ada + compiler (such as the GCC version of GNAT). To avoid accidentally using a + different compiler than the one you want to use, we recommend explicitly + selecting GNAT LLVM in your existing GPR project file by adding + :code:`for Toolchain_Name ("Ada") use "GNAT_LLVM";`. You can also + generate an explicit toolchain configuration file with ``gprconfig`` and + use it with ``gprbuild``; see the *GPRbuild and GPR Companion Tools + User's Guide* for details. You can determine from the first line of the + :file:`.ali` file which version of GNAT built that file because it + contains either :code:`GNAT` or :code:`GNAT-LLVM`. .. only:: PRO diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index 48958f89256e..e0c2d2571f61 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -19,7 +19,7 @@ @copying @quotation -GNAT User's Guide for Native Platforms , Sep 05, 2025 +GNAT User's Guide for Native Platforms , Sep 12, 2025 AdaCore @@ -17653,20 +17653,18 @@ version of GNAT. @item @code{gprbuild} can detect and use GNAT LLVM when it is installed. -@code{gprbuild} uses the first applicable compiler on the executable -search path, including GNAT LLVM. An easy way to build with GNAT -LLVM is to make it available on the operating system’s search path -before any other Ada compiler (such as the GCC version of GNAT). To -avoid accidentally using a different compiler than the one you want -to use, we recommend generating an explicit toolchain configuration -file with @code{gprconfig} and using it with @code{gprbuild}; see the -`GPRbuild and GPR Companion Tools User’s Guide' for details. You -can determine from the first line of the @code{.ali} file -which version of GNAT built that file because it contains either -@code{GNAT} or @code{GNAT-LLVM}. - -You can also explicitly select GNAT LLVM in your existing GPR project -file by adding @code{for Toolchain_Name("Ada") use "GNAT_LLVM";} +@code{gprbuild} uses the first applicable compiler on the executable search +path, including GNAT LLVM. An easy way to build with GNAT LLVM is to make +it available on the operating system’s search path before any other Ada +compiler (such as the GCC version of GNAT). To avoid accidentally using a +different compiler than the one you want to use, we recommend explicitly +selecting GNAT LLVM in your existing GPR project file by adding +@code{for Toolchain_Name ("Ada") use "GNAT_LLVM";}. You can also +generate an explicit toolchain configuration file with @code{gprconfig} and +use it with @code{gprbuild}; see the `GPRbuild and GPR Companion Tools +User’s Guide' for details. You can determine from the first line of the +@code{.ali} file which version of GNAT built that file because it +contains either @code{GNAT} or @code{GNAT-LLVM}. @end itemize @@ -30297,8 +30295,8 @@ to permit their use in free software. @printindex ge -@anchor{gnat_ugn/gnat_utility_programs switches-related-to-project-files}@w{ } @anchor{d2}@w{ } +@anchor{gnat_ugn/gnat_utility_programs switches-related-to-project-files}@w{ } @c %**end of body @bye