From patchwork Fri May 30 20:24:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 354335 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id EA7541400CF for ; Sat, 31 May 2014 06:26:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0856F92140; Fri, 30 May 2014 20:26:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H4aKQ2llDWSu; Fri, 30 May 2014 20:26:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3DC249213A; Fri, 30 May 2014 20:26:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 017BE1BF84E for ; Fri, 30 May 2014 20:26:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EED6A32CC0 for ; Fri, 30 May 2014 20:26:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FH430FIHb-bt for ; Fri, 30 May 2014 20:26:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by silver.osuosl.org (Postfix) with ESMTP id A86E42FC8C for ; Fri, 30 May 2014 20:26:53 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id B45E989C; Fri, 30 May 2014 22:26:55 +0200 (CEST) Received: from localhost (AToulouse-651-1-155-50.w92-136.abo.wanadoo.fr [92.136.74.50]) by mail.free-electrons.com (Postfix) with ESMTPSA id 11D699B7; Fri, 30 May 2014 22:24:44 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Fri, 30 May 2014 22:24:39 +0200 Message-Id: <1401481479-23667-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.9.3 Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH] toolchain-external: restrict Musl external toolchain to Microblaze BE X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net As reported by William Welch , the Musl external toolchain provided by the musl-cross project is only Microblaze big-endian. In fact, Musl seems to only support the big endian variant of the Microblaze architecture, with the microblaze-* tuple. This commit makes sure the Musl pre-built external toolchain provided by musl-cross can only be selected for a big-endian Microblaze configuration. Reported-by: William Welch Cc: William Welch Signed-off-by: Thomas Petazzoni --- This is a fix, should be committed to 2014.05. Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/Config.in | 4 ++-- toolchain/toolchain-external/toolchain-external.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 857f26d..f4a5ccf 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -871,7 +871,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64_13_12 config BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS bool "Musl toolchain" depends on (BR2_arm && BR2_ARM_EABI) || (BR2_armeb && BR2_ARM_EABI) || \ - (BR2_i386 && !BR2_x86_i386) || BR2_microblaze || BR2_mips || \ + (BR2_i386 && !BR2_x86_i386) || BR2_microblazebe || BR2_mips || \ BR2_mipsel || (BR2_powerpc && BR2_powerpc_CLASSIC) || BR2_x86_64 depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" select BR2_TOOLCHAIN_EXTERNAL_MUSL @@ -977,7 +977,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX default "arm-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_arm default "armeb-linux-musleabi" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_armeb default "i486-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_i386 - default "microblaze-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_microblaze + default "microblaze-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && BR2_microblazebe default "mips-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && (BR2_mips && !BR2_SOFT_FLOAT) default "mips-sf-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && (BR2_mips && BR2_SOFT_FLOAT) default "mipsel-linux-musl" if BR2_TOOLCHAIN_EXTERNAL_MUSL_CROSS && (BR2_mipsel && !BR2_SOFT_FLOAT) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 34520be..c73cc4a 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -378,7 +378,7 @@ else ifeq ($(BR2_armeb),y) TOOLCHAIN_EXTERNAL_SOURCE = crossx86-armeb-linux-musleabi-1.0.0.tar.xz else ifeq ($(BR2_i386),y) TOOLCHAIN_EXTERNAL_SOURCE = crossx86-i486-linux-musl-1.0.0.tar.xz -else ifeq ($(BR2_microblaze),y) +else ifeq ($(BR2_microblazebe),y) TOOLCHAIN_EXTERNAL_SOURCE = crossx86-microblaze-linux-musl-1.0.0.tar.xz else ifeq ($(BR2_mips),y) ifeq ($(BR2_SOFT_FLOAT),y)