summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-07-18 02:07:47 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2018-07-30 11:45:50 +0100
commit35f5a6acfb5be94e0b9df21c2a5ba934237c1ca3 (patch)
tree9d3297f0f13581087b778db480296361d578e491
parent14459ce2bd980f74bc9c36f3ef42e7ba645e5dfe (diff)
downloadop-kernel-dev-35f5a6acfb5be94e0b9df21c2a5ba934237c1ca3.zip
op-kernel-dev-35f5a6acfb5be94e0b9df21c2a5ba934237c1ca3.tar.gz
ARM: 8782/1: vfp: clean up arch/arm/vfp/Makefile
Since commit 799c43415442 ("kbuild: thin archives make default for all archs"), $(AR) is used instead of $(LD) to combine object files. The following code in arch/arm/vfp/Makefile: LDFLAGS +=--no-warn-mismatch ... is no longer used. Also, arch/arm/Makefile already guards arch/arm/vfp/ by a boolean symbol, CONFIG_VFP, like this: core-$(CONFIG_VFP) += arch/arm/vfp/ So, $(CONFIG_VFP) is always evaluated to y in arch/arm/vfp/Makefile. There is no point to use pseudo object, vfp.o, which never becomes a module. Add all objects to obj-y directly. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--arch/arm/vfp/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/vfp/Makefile b/arch/arm/vfp/Makefile
index a81404c..94516c4 100644
--- a/arch/arm/vfp/Makefile
+++ b/arch/arm/vfp/Makefile
@@ -8,8 +8,5 @@
# asflags-y := -DDEBUG
KBUILD_AFLAGS :=$(KBUILD_AFLAGS:-msoft-float=-Wa,-mfpu=softvfp+vfp -mfloat-abi=soft)
-LDFLAGS +=--no-warn-mismatch
-obj-y += vfp.o
-
-vfp-$(CONFIG_VFP) += vfpmodule.o entry.o vfphw.o vfpsingle.o vfpdouble.o
+obj-y += vfpmodule.o entry.o vfphw.o vfpsingle.o vfpdouble.o
OpenPOWER on IntegriCloud