Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp4987201yba; Mon, 13 May 2019 03:26:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqypVSlSkVRrNaZVDxkSdDJRgKiPsvvPDCrhOkoUwAZjBMxiiaWW3XsHb5CJghLkbgmkaL7F X-Received: by 2002:a62:ed09:: with SMTP id u9mr32918395pfh.23.1557743209406; Mon, 13 May 2019 03:26:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557743209; cv=none; d=google.com; s=arc-20160816; b=hxcjw2iCSaRzpVrmurwAV4IG0yAKYFKs1vZQGhuk7hMblSCarEYha+4AecWiZwjDmY vyHdu16pE8aEBdNZZrE/Ygy8D5gTyRJCz7xVFNbpu862u9NYd5Ec486GlAJeuGDVZW6G N0IUANW1Da6DGVfqFu1WeBxG9stWo5S+ocKGcp4s6eqjqbbGo3/Wke0lI7k6UKap7QOy 6EaxNJvB4FFx2hkdSZuUfT2YEsN4Z+819HHl925c33pNEbV9uTfg92hgdl0rvV+wwz/N KK+EpjB2D5UfRUPN+IWzcvKjKH10rrNu61bzNkn1pKYI46c6qqZEmWAn6fs7SNTd/HJ/ 5o9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=pt848MYhMrnfLmquFYiuTx2kZFGt5w9tP2p2+9ZTMM0=; b=03/AnOD9DiiY8NGAJbL0v3NoTa9L9RBYla0WMIwCtRQJlSR8Z7pxd6E73T1V3KZ6gc VEYDMSf1eeI37/G8edtp7Pa5YhlAZWFG15N1Zlw7+L4cjsournxlGU7qTR7vByc4xFu7 16nMee56wAvosFDAZlYhDuZ4zAE3xqGIqJxawGBG0UFKspjOwRqls3WKU7xnFjs1P0Le SQa2KQRxdWYuWjx5deOL1fRxQ6fgyiO6jUhD1C8edZTXL0zsM6E4aHcKwU0pzEffK9jO J3CNogN0oEITvy5M42B093LOaFRZYPaquqcIHlCurYYDLUwiEEGyd3fdUou7DzIYhnAr geVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Iw78WSCj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ch16si16871036plb.76.2019.05.13.03.26.33; Mon, 13 May 2019 03:26:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=Iw78WSCj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728435AbfEMKAS (ORCPT + 99 others); Mon, 13 May 2019 06:00:18 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:20306 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728029AbfEMKAR (ORCPT ); Mon, 13 May 2019 06:00:17 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 452bsS0Bwkz9v1jM; Mon, 13 May 2019 12:00:12 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=Iw78WSCj; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id xVhwNUTxPomi; Mon, 13 May 2019 12:00:11 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 452bsR67Kjz9v1jV; Mon, 13 May 2019 12:00:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1557741611; bh=pt848MYhMrnfLmquFYiuTx2kZFGt5w9tP2p2+9ZTMM0=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=Iw78WSCj0WS9rFnTnPZ7/I08F2D2+zQBshdaZta0kPpnmmBrjATS/TP/AAqS3jumv RV7DUZZmj/4KHJpWH83ewEtHm4djVZiW/Cg0YPfLtfFi6wUcmAEGX3U3LDW26i9NrM ixPko349KkviJB/BU7Y/OhF3TV3Lnwc3z/itUZDQ= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 756CF8B883; Mon, 13 May 2019 12:00:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id TZycueQ-iAhg; Mon, 13 May 2019 12:00:16 +0200 (CEST) Received: from po16846vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id BFF3A8B8A4; Mon, 13 May 2019 12:00:15 +0200 (CEST) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 5C92C67402; Mon, 13 May 2019 10:00:15 +0000 (UTC) Message-Id: <134ce533030ae76a60b88e3e73839681c1958f8c.1557741292.git.christophe.leroy@c-s.fr> In-Reply-To: <7496da89e027e563cb8e62dc89548525cf53b57e.1557741292.git.christophe.leroy@c-s.fr> References: <7496da89e027e563cb8e62dc89548525cf53b57e.1557741292.git.christophe.leroy@c-s.fr> From: Christophe Leroy Subject: [PATCH 2/2] powerpc/lib: only build ldstfp.o when CONFIG_PPC_FPU is set To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Mon, 13 May 2019 10:00:15 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The entire code in ldstfp.o is enclosed into #ifdef CONFIG_PPC_FPU, so there is no point in building it when this config is not selected. Fixes: cd64d1697cf0 ("powerpc: mtmsrd not defined") Signed-off-by: Christophe Leroy --- arch/powerpc/lib/Makefile | 3 ++- arch/powerpc/lib/ldstfp.S | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 17fce3738d48..eebc782d89a5 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -49,7 +49,8 @@ obj64-$(CONFIG_KPROBES_SANITY_TEST) += test_emulate_step.o \ obj-y += checksum_$(BITS).o checksum_wrappers.o \ string_$(BITS).o -obj-y += sstep.o ldstfp.o +obj-y += sstep.o +obj-$(CONFIG_PPC_FPU) += ldstfp.o obj64-y += quad.o obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o diff --git a/arch/powerpc/lib/ldstfp.S b/arch/powerpc/lib/ldstfp.S index 32e91994b6b2..e388a3127cb6 100644 --- a/arch/powerpc/lib/ldstfp.S +++ b/arch/powerpc/lib/ldstfp.S @@ -18,8 +18,6 @@ #include #include -#ifdef CONFIG_PPC_FPU - #define STKFRM (PPC_MIN_STKFRM + 16) /* Get the contents of frN into *p; N is in r3 and p is in r4. */ @@ -241,5 +239,3 @@ _GLOBAL(conv_dp_to_sp) MTMSRD(r6) isync blr - -#endif /* CONFIG_PPC_FPU */ -- 2.13.3