powerpc/lib: only build ldstfp.o when CONFIG_PPC_FPU is set

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 <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 17fce37..eebc782 100644 (file)
--- 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 32e9199..e388a31 100644 (file)
--- a/arch/powerpc/lib/ldstfp.S
+++ b/arch/powerpc/lib/ldstfp.S
@@ -18,8 +18,6 @@
 #include <asm/asm-compat.h>
 #include <linux/errno.h>
 
-#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 */