From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <sayle@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1251)
 id 142C13858D39; Mon,  1 Aug 2022 10:41:58 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 142C13858D39
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Roger Sayle <sayle@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-1915] Update configure to check for a recent gnat Ada
 compiler.
X-Act-Checkin: gcc
X-Git-Author: Roger Sayle <roger@nextmovesoftware.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 5d8637208d35f78b51f8cff38c984836ab2c860f
X-Git-Newrev: 71f068a9b3332a2179dfc807cf9138f691d77461
Message-Id: <20220801104158.142C13858D39@sourceware.org>
Date: Mon,  1 Aug 2022 10:41:58 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Aug 2022 10:41:58 -0000

https://gcc.gnu.org/g:71f068a9b3332a2179dfc807cf9138f691d77461

commit r13-1915-g71f068a9b3332a2179dfc807cf9138f691d77461
Author: Roger Sayle <roger@nextmovesoftware.com>
Date:   Mon Aug 1 11:36:23 2022 +0100

    Update configure to check for a recent gnat Ada compiler.
    
    GCC fails to bootstrap when configured with --enable-languages=all on
    machines that have older versions of GNAT installed as the system Ada
    compiler.  In configure, it's not sufficient to check whether gnat is
    available, but whether a sufficiently recent version of GNAT is
    installed.  This patch tweaks config/acx.m4 so that conftest.adb also
    contains a reference to System.CRTL.int64 as required by the current
    version of gcc/ada/osint.adb.  This fixes the build when the system
    Ada is GNAT v4.8.5 (on Redhat 7) by disabling ada, but continues to
    work fine when the system Ada is GNAT v11.3.1.
    
    2022-08-01  Roger Sayle  <roger@nextmovesoftware.com>
                Arnaud Charlet  <charlet@adacore.com>
    
    config/ChangeLog
            * acx.m4 (AC_PROG_GNAT): Update conftest.adb to include
            features required of the host gnat compiler.
    
    ChangeLog
            * configure: Regenerate.

Diff:
---
 config/acx.m4 | 6 +++++-
 configure     | 8 ++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/config/acx.m4 b/config/acx.m4
index b86c4f9e51d..7efe98aaf96 100644
--- a/config/acx.m4
+++ b/config/acx.m4
@@ -393,9 +393,13 @@ AC_DEFUN([ACX_PROG_GNAT],
 AC_REQUIRE([AC_PROG_CC])
 AC_CHECK_TOOL(GNATBIND, gnatbind, no)
 AC_CHECK_TOOL(GNATMAKE, gnatmake, no)
-AC_CACHE_CHECK([whether compiler driver understands Ada],
+AC_CACHE_CHECK([whether compiler driver understands Ada and is recent enough],
 		 acx_cv_cc_gcc_supports_ada,
 [cat >conftest.adb <<EOF
+pragma Warnings (Off);
+with System.CRTL;
+pragma Warnings (On);
+use type System.CRTL.int64;
 procedure conftest is begin null; end conftest;
 EOF
 acx_cv_cc_gcc_supports_ada=no
diff --git a/configure b/configure
index 65d7078dbe7..11539d7f01e 100755
--- a/configure
+++ b/configure
@@ -5602,12 +5602,16 @@ else
   GNATMAKE="$ac_cv_prog_GNATMAKE"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler driver understands Ada" >&5
-$as_echo_n "checking whether compiler driver understands Ada... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler driver understands Ada and is recent enough" >&5
+$as_echo_n "checking whether compiler driver understands Ada and is recent enough... " >&6; }
 if ${acx_cv_cc_gcc_supports_ada+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.adb <<EOF
+pragma Warnings (Off);
+with System.CRTL;
+pragma Warnings (On);
+use type System.CRTL.int64;
 procedure conftest is begin null; end conftest;
 EOF
 acx_cv_cc_gcc_supports_ada=no