From patchwork Thu Mar 8 12:14:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 883089 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vanguardiasur.com.ar Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=vanguardiasur-com-ar.20150623.gappssmtp.com header.i=@vanguardiasur-com-ar.20150623.gappssmtp.com header.b="mJy2jctW"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxqGM3Cfbz9sWj for ; Thu, 8 Mar 2018 23:15:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AAC2387B77; Thu, 8 Mar 2018 12:15:21 +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 fd_a1NzLd1Ie; Thu, 8 Mar 2018 12:15:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 02DD687B78; Thu, 8 Mar 2018 12:15:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 9480A1CF0A1 for ; Thu, 8 Mar 2018 12:15:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9189C87B78 for ; Thu, 8 Mar 2018 12:15:20 +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 ZiupuneMOdyJ for ; Thu, 8 Mar 2018 12:15:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-vk0-f65.google.com (mail-vk0-f65.google.com [209.85.213.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 580FE87B77 for ; Thu, 8 Mar 2018 12:15:19 +0000 (UTC) Received: by mail-vk0-f65.google.com with SMTP id s1so3469437vke.5 for ; Thu, 08 Mar 2018 04:15:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=E/t3OhQdiN/R4tT9skXlAawRb1gFmycDAqHacIFfO2c=; b=mJy2jctWa62Gv4cA+Pa55VtEHiXVRyPLYf+3YFogWxuactXignP4kZ6jkHU+BINqn2 42XwO91Heydjju9Acfa6/k5iqMU0OoHBTqy/NzGwps6dGoh9ttH8UwZsStgcTcT98omO q6f4ZsnUtwPgWLNk9N8fIGpWgdpbs6l08TwbPnOWDhtybQIaWrifzT9usMPurBgYpefX wC8PDMlyslhc5QQi1SQ/fuN/dDvaw4vYIwaQ2f1NAV/k/tf3iTd19Mn3R6h/az//ploW kSmDpQ1keb+8rRd4cR+oVd4YCsR6HtDdTeBit1zaQ5qYXRYX/b8CUJTvkDexj8BcWveC 07+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=E/t3OhQdiN/R4tT9skXlAawRb1gFmycDAqHacIFfO2c=; b=jbxyBrNEScGV938pfdnA2aU/I3db7xB0L6lUqElFLngsmd8VFrbK5gzgYymTUFep7j ToJD80VLI6v0CW0Gf94//riGD3UYTTVCA8j/gsT5vl6n0qSnLBn+9sQICvcCVHhtoyzN 2Xkmf+HwavtSwE5yBuYcQvs/XjytSWJWVGpqVapf1IDf4ssMjaV7xxfNszfFVOjF91zR oQMj8T6MFSkK7r0tDLxwjStcGvUBa143Z5seSM4rzikCS20xNS4ApQLKg3SkIwPrOrDz G6sFws2CN/2Wkr2neKPFgkqb3PphBgMBAIHdbnB6alTBK5qCLln1kVWdqgD/wAExE6qi qV+g== X-Gm-Message-State: APf1xPARnxztqbrbDJkuz3HzJbeYPFK321biKQFsqRVPTfldyMkciA55 xR4wK0nUk2NActnisI7ET9oaSWSS X-Google-Smtp-Source: AG47ELuQEw0Wf0dFvHG6Y6l6PTObXX9C3njyANX45txKJx/XjGyXVM7Z7cPU0B1TsaSt2ApLpQkzMA== X-Received: by 10.31.190.198 with SMTP id o189mr18243543vkf.12.1520511317596; Thu, 08 Mar 2018 04:15:17 -0800 (PST) Received: from localhost.localdomain ([190.210.56.45]) by smtp.gmail.com with ESMTPSA id c131sm4337177vke.26.2018.03.08.04.15.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Mar 2018 04:15:16 -0800 (PST) From: Ezequiel Garcia To: buildroot@uclibc.org Date: Thu, 8 Mar 2018 09:14:30 -0300 Message-Id: <20180308121430.20013-1-ezequiel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.16.2 Subject: [Buildroot] [PATCH RESEND] toolchain: use -ffp-contract=off on MIPS in the wrapper when needed X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Johannes Schmitz MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Johannes Schmitz This fix is necessary for to build for MIPS, for example for the MIPS XBurst architecture used on ci20 boards. GCC has replaced (no)mfused-madd with ffp-contract. Find more details and a long discussion at https://gcc.gnu.org/ml/gcc-patches/2015-06/msg00876.html Signed-off-by: Johannes Schmitz Tested-by: Ezequiel Garcia --- Ci20 builds are currently broken without this patch. toolchain/toolchain-wrapper.c | 3 --- toolchain/toolchain-wrapper.mk | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index 2928ea42d0e6..04b263199547 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -79,9 +79,6 @@ static char *predef_args[] = { #ifdef BR_OMIT_LOCK_PREFIX "-Wa,-momit-lock-prefix=yes", #endif -#ifdef BR_NO_FUSED_MADD - "-mno-fused-madd", -#endif #ifdef BR_BINFMT_FLAT "-Wl,-elf2flt", #endif diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index 7f72a0cadec9..7faa033f605c 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -28,8 +28,12 @@ endif # Avoid FPU bug on XBurst CPUs ifeq ($(BR2_mips_xburst),y) +ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_6),y) +TOOLCHAIN_WRAPPER_ARGS += -DBR_FP_CONTRACT_OFF +else TOOLCHAIN_WRAPPER_ARGS += -DBR_NO_FUSED_MADD endif +endif ifeq ($(BR2_CCACHE_USE_BASEDIR),y) TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"'