From patchwork Mon May 11 20:53:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 471028 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 3542E140D16 for ; Tue, 12 May 2015 06:53:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D709289D76; Mon, 11 May 2015 20:53:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yvbjEZW6PBNt; Mon, 11 May 2015 20:53:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DCDAD89EE6; Mon, 11 May 2015 20:53:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 53D421C0709 for ; Mon, 11 May 2015 20:53:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4F0F095B01 for ; Mon, 11 May 2015 20:53:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uQr4MlQVVZSw for ; Mon, 11 May 2015 20:53:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by hemlock.osuosl.org (Postfix) with ESMTP id 3B1F695E87 for ; Mon, 11 May 2015 20:53:46 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 056E36E7; Mon, 11 May 2015 22:53:47 +0200 (CEST) Received: from localhost (AToulouse-657-1-1122-176.w92-156.abo.wanadoo.fr [92.156.36.176]) by mail.free-electrons.com (Postfix) with ESMTPSA id B060B162; Mon, 11 May 2015 22:53:47 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Mon, 11 May 2015 22:53:41 +0200 Message-Id: <1431377621-2446-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.1.0 Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH] qemu: fix build on sh4a and sh4aeb X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Qemu doesn't understand sh4a and sh4aeb as separate architectures, it only knows about sh4 and sh4eb. However, it does support sh4a, since it emulates the SH7785 CPU which is a SH4A. Therefore, with this commit, sh4a/sh4aeb are translated as sh4/sh4eb for Qemu. Fixes: http://autobuild.buildroot.org/results/8f9/8f99a776f35d4ab0841d9fd2db509850ef603bd4/ and many previous similar build failures Signed-off-by: Thomas Petazzoni --- package/qemu/qemu.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index d565c88..04df79f 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -38,8 +38,8 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p # sh2a not supported # sh4 sh4 # sh4eb sh4eb -# sh4a ? -# sh4aeb ? +# sh4a sh4 +# sh4aeb sh4eb # sh64 not supported # sparc sparc @@ -56,6 +56,12 @@ endif ifeq ($(HOST_QEMU_ARCH),powerpc) HOST_QEMU_ARCH = ppc endif +ifeq ($(HOST_QEMU_ARCH),sh4a) +HOST_QEMU_ARCH = sh4 +endif +ifeq ($(HOST_QEMU_ARCH),sh4aeb) +HOST_QEMU_ARCH = sh4eb +endif HOST_QEMU_TARGETS = $(HOST_QEMU_ARCH)-linux-user ifeq ($(BR2_PACKAGE_HOST_QEMU),y)