diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-07-11 05:07:56 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-08-23 12:38:49 +0200 |
| commit | 3c86889b0584be3e0243c22bf0901f12dfebac9a (patch) | |
| tree | d843fbd383378a56d02ccc0dfc1d72a53504f785 /arch | |
| parent | ARM: 8875/1: Kconfig: default to AEABI w/ Clang (diff) | |
| download | linux-3c86889b0584be3e0243c22bf0901f12dfebac9a.tar.xz linux-3c86889b0584be3e0243c22bf0901f12dfebac9a.zip | |
ARM: 8876/1: fix O= building with CONFIG_FPE_FASTFPE
To use Fastfpe, a user is supposed to enable CONFIG_FPE_FASTFPE
and put downstream source files into arch/arm/fastfpe/.
It is not working for O= build because $(wildcard arch/arm/fastfpe)
checks if it exists in $(objtree), not in $(srctree).
Add the $(srctree)/ prefix to fix it.
While I was here, I slightly refactored the code.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index c3624ca6c0bc..505167936c06 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -270,14 +270,9 @@ endif export TEXT_OFFSET GZFLAGS MMUEXT -# Do we have FASTFPE? -FASTFPE :=arch/arm/fastfpe -ifeq ($(FASTFPE),$(wildcard $(FASTFPE))) -FASTFPE_OBJ :=$(FASTFPE)/ -endif - core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ -core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) +# Put arch/arm/fastfpe/ to use this. +core-$(CONFIG_FPE_FASTFPE) += $(patsubst $(srctree)/%,%,$(wildcard $(srctree)/arch/arm/fastfpe/)) core-$(CONFIG_VFP) += arch/arm/vfp/ core-$(CONFIG_XEN) += arch/arm/xen/ core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/ |