From ba8436b687f12db8ae579d8911fb4e2a2ad5e5cb Mon Sep 17 00:00:00 2001
From: Nico Huber <nico.h@gmx.de>
Date: Sun, 12 Mar 2017 23:12:49 +0100
Subject: [PATCH] UPSTREAM: buildgcc: Relax GNAT version checks

Compiling the GNAT frontend of GCC seems to have stabilized since GCC
4.9.0. So build it by default if GNAT >= 4.9 is installed.

TEST=Bootstrapped all GCC versions from 4.9.0 to 6.2 and built the
     i386 cross toolchain with each.

Change-Id: Ib35953853caf2ffe5f36fb9463ddbc87ecc61d1e
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: d5829e9bdb1f23263d63b6fb033a5737f9d13f7c
Original-Change-Id: I9d1127595dc6b9bcece9c5e5cc7e45f467744ab9
Original-Signed-off-by: Nico Huber <nico.h@gmx.de>
Original-Reviewed-on: https://review.coreboot.org/18777
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Original-Reviewed-by: Philippe Mathieu-Daud <philippe.mathieu.daude@gmail.com>
Original-Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/459657
---
 util/crossgcc/buildgcc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index b8d4746f7b..3ebde85892 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -241,14 +241,12 @@ ada_requested() {
 
 check_gnat() {
 	if hostcc_has_gnat1; then
-		if [ \( "$(hostcc_major)" -lt "$(buildcc_major)" -o \
-			\( "$(hostcc_major)" -eq "$(buildcc_major)" -a \
-			   "$(hostcc_minor)" -lt "$(buildcc_minor)" \) \) \
-			-a \
-			"${BOOTSTRAP}" != "1" ]; \
+		if [ \( "$(hostcc_major)" -lt 4 -o \
+			\( "$(hostcc_major)" -eq 4 -a "$(hostcc_minor)" -lt 9 \) \) -a \
+		     "${BOOTSTRAP}" != "1" ];
 		then
 			printf "\n${RED}ERROR:${red} Building the Ada compiler (gnat $(buildcc_version)) "
-			printf "with an older host compiler\n       version ($(hostcc_version)) "
+			printf "with a host compiler older\n       than 4.9.x (yours $(hostcc_version)) "
 			printf "requires bootstrapping (-b).${NC}\n\n"
 			HALT_FOR_TOOLS=1
 		fi
@@ -953,7 +951,9 @@ elif [ $UNAME = "NetBSD" ]; then
 fi
 if [ -z "${LANGUAGES}" ]; then
 	if hostcc_has_gnat1 && \
-		[ "$(hostcc_version)" = "$(buildcc_version)" -o "${BOOTSTRAP}" = "1" ];
+		[ "$(hostcc_major)" -ge 5 -o \
+		  \( "$(hostcc_major)" -eq 4 -a "$(hostcc_minor)" -ge 9 \) -o \
+		  "${BOOTSTRAP}" = "1" ];
 	then
 		printf "\nFound compatible Ada compiler, enabling Ada support by default.\n\n"
 		LANGUAGES="ada,${DEFAULT_LANGUAGES}"