From patchwork Tue Jul 16 08:03:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 259366 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 8255C2C0183 for ; Tue, 16 Jul 2013 18:04:03 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CB508935BB; Tue, 16 Jul 2013 08:03:54 +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 8ECwY-VD8opa; Tue, 16 Jul 2013 08:03:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1A8E693570; Tue, 16 Jul 2013 08:03:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 958B11BFA04 for ; Tue, 16 Jul 2013 08:03:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6FAB69439C for ; Tue, 16 Jul 2013 08:03:35 +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 ROBfIXntgMj9 for ; Tue, 16 Jul 2013 08:03:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.35.102]) by fraxinus.osuosl.org (Postfix) with ESMTP id B78F08BDC8 for ; Tue, 16 Jul 2013 08:03:34 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 2AC4B780; Tue, 16 Jul 2013 10:03:34 +0200 (CEST) Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 9DB41733 for ; Tue, 16 Jul 2013 10:03:33 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Tue, 16 Jul 2013 10:03:17 +0200 Message-Id: <1373961805-3901-7-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1373961805-3901-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1373961805-3901-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCHv3 06/14] toolchain: remove the old BR2_VFP_FLOAT option 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 Now that we have a much better way of selecting between the various VFP versions and capabilities, the BR2_VFP_FLOAT version no longer makes sense. This commit gets rid of it, and adds the appropriate Config.in.legacy code. Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 9 +++++++++ toolchain/toolchain-buildroot/Config.in.2 | 12 ------------ toolchain/toolchain-external/ext-tool.mk | 5 ----- toolchain/toolchain-external/ext-toolchain-wrapper.c | 3 --- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 01bf900..b92b656 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -76,6 +76,15 @@ config BR2_ELF2FLT BR2_PACKAGE_HOST_ELF2FLT due to the conversion of elf2flt to the package infrastructure. +config BR2_VFP_FLOAT + bool "the ARM VFP floating point option has been renamed" + select BR2_LEGACY + help + Due to a major refactoring of the floating-point handling of + the ARM architecture support, the BR2_VFP_FLOAT option has + been replaced with a choice of options that allows to select + between various VFP versions/capabilities. + ############################################################################### comment "Legacy options removed in 2013.05" diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2 index e223d9d..a9c102f 100644 --- a/toolchain/toolchain-buildroot/Config.in.2 +++ b/toolchain/toolchain-buildroot/Config.in.2 @@ -28,16 +28,4 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP source "package/elf2flt/Config.in.host" -config BR2_VFP_FLOAT - bool "Use ARM Vector Floating Point unit" - depends on !BR2_SOFT_FLOAT - depends on BR2_arm || BR2_armeb - help - Setting this option will enable the "-mfpu=vfp" option. - If your ARM CPU has a Vector Floating Point Unit (VFP) - and the toolchain supports the option, then the - code can be optimized. - - Most people will answer N. - endif diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index 9d3dec4..67fc40d 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -196,11 +196,6 @@ TOOLCHAIN_EXTERNAL_CFLAGS += -msoft-float TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_SOFTFLOAT=1 endif -ifeq ($(BR2_VFP_FLOAT),y) -TOOLCHAIN_EXTERNAL_CFLAGS += -mfpu=vfp -TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_VFPFLOAT=1 -endif - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted endif diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c index f81aed4..afca6fa 100644 --- a/toolchain/toolchain-external/ext-toolchain-wrapper.c +++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c @@ -47,9 +47,6 @@ static char *predef_args[] = { #ifdef BR_SOFTFLOAT "-msoft-float", #endif /* BR_SOFTFLOAT */ -#ifdef BR_VFPFLOAT - "-mfpu=vfp", -#endif /* BR_VFPFLOAT */ #ifdef BR_64 "-m64", #endif