From nobody Sun May 19 21:02:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1575497632; cv=none; d=zohomail.com; s=zohoarc; b=fjKwpK8ZZKu0LfBxnwpf2kWeZX46RRw4RDZleIDu59N7a4YhW6wVn9DzLG/ZV5+SCn8JHUYouMKmw1hCxzoo5PcQXdKr5bI3W3CRW+yQ6tmuAJkFk02b5S7zC5+8h1RCGXMifszhfqCkTxg9cTh4jmirRkX0ExLEzvtAQ7tdAf4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575497632; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=oisQGT+zu/XqbpDrQdC6TgXtb67Tncg2LO7THUXe4cw=; b=TtyzD0VNVQmf6H16rn2cNCGM4wercNggpsvU918b+3rekh8746Ry1eVtnGHZjdp+woppYuyegV+K7uElYUazAxwS6PBW+k2R0CsFcG/7pTLkigVG5adgi637L+03GwZImeKRvEeEW3Svam4PI+0gky7BweLP4D/WqzUY+aCmwAQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575497632351224.30927633352417; Wed, 4 Dec 2019 14:13:52 -0800 (PST) Received: from localhost ([::1]:47624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iccu6-0002Pn-IB for importer@patchew.org; Wed, 04 Dec 2019 17:13:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48014) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icct8-0001sg-ET for qemu-devel@nongnu.org; Wed, 04 Dec 2019 17:12:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icct3-000282-Uu for qemu-devel@nongnu.org; Wed, 04 Dec 2019 17:12:48 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:47053 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iccsz-0001yZ-P5 for qemu-devel@nongnu.org; Wed, 04 Dec 2019 17:12:43 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-119-D4cGCC1xPViPnRjRH8TJ1g-1; Wed, 04 Dec 2019 17:12:38 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F144801E76 for ; Wed, 4 Dec 2019 22:12:35 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-76.brq.redhat.com [10.40.205.76]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E31A95D9C5; Wed, 4 Dec 2019 22:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575497559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oisQGT+zu/XqbpDrQdC6TgXtb67Tncg2LO7THUXe4cw=; b=feLFmfNCS/WUtGMQZdwg72h4kic8O0K54kHbm6KOy5Q6Aqxh847fzTKdbWwYt7Uf27sKJ7 DRlhpomY/hpNfThPJ7aMJ4cJVlN7tO6gG0qErjvew4E2hLv+0J/I+AKileXQ9nNu7ACGDr JVp8Lr++tWc4WozCM/mkN5m5zqtM7SE= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.0] roms/edk2-funcs.sh: Use available GCC for ARM/Aarch64 targets Date: Wed, 4 Dec 2019 23:12:29 +0100 Message-Id: <20191204221229.30612-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: D4cGCC1xPViPnRjRH8TJ1g-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Centos 7.7 only provides cross GCC 4.8.5, but the script forces us to use GCC5. Since the same machinery is valid to check the GCC version, remove the $emulation_target check. $ cat /etc/redhat-release CentOS Linux release 7.7.1908 (Core) $ aarch64-linux-gnu-gcc -v 2>&1 | tail -1 gcc version 4.8.5 20150623 (Red Hat 4.8.5-16) (GCC) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Patch to review with --ignore-all-space --- roms/edk2-funcs.sh | 48 +++++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/roms/edk2-funcs.sh b/roms/edk2-funcs.sh index 3f4485b201..a455611c0d 100644 --- a/roms/edk2-funcs.sh +++ b/roms/edk2-funcs.sh @@ -135,35 +135,27 @@ qemu_edk2_get_toolchain() return 1 fi =20 - case "$emulation_target" in - (arm|aarch64) - printf 'GCC5\n' + if ! cross_prefix=3D$(qemu_edk2_get_cross_prefix "$emulation_target"); t= hen + return 1 + fi + + gcc_version=3D$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print $3}= ') + # Run "git-blame" on "OvmfPkg/build.sh" in edk2 for more information on + # the mapping below. + case "$gcc_version" in + ([1-3].*|4.[0-7].*) + printf '%s: unsupported gcc version "%s"\n' \ + "$program_name" "$gcc_version" >&2 + return 1 ;; - - (i386|x86_64) - if ! cross_prefix=3D$(qemu_edk2_get_cross_prefix "$emulation_target"= ); then - return 1 - fi - - gcc_version=3D$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print= $3}') - # Run "git-blame" on "OvmfPkg/build.sh" in edk2 for more information= on - # the mapping below. - case "$gcc_version" in - ([1-3].*|4.[0-7].*) - printf '%s: unsupported gcc version "%s"\n' \ - "$program_name" "$gcc_version" >&2 - return 1 - ;; - (4.8.*) - printf 'GCC48\n' - ;; - (4.9.*|6.[0-2].*) - printf 'GCC49\n' - ;; - (*) - printf 'GCC5\n' - ;; - esac + (4.8.*) + printf 'GCC48\n' + ;; + (4.9.*|6.[0-2].*) + printf 'GCC49\n' + ;; + (*) + printf 'GCC5\n' ;; esac } --=20 2.21.0