Merge tag 'for-5.18/drivers-2022-04-01' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / powerpc / Makefile

diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 5f16ac1..eb541e7 100644 (file)
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -171,7 +171,7 @@ else
 CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,$(call cc-option,-mtune=power5))
 CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mcpu=power5,-mcpu=power4)
 endif
-else
+else ifdef CONFIG_PPC_BOOK3E_64
 CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
 endif
 
@@ -213,7 +213,7 @@ CHECKFLAGS  += -m$(BITS) -D__powerpc__ -D__powerpc$(BITS)__
 ifdef CONFIG_CPU_BIG_ENDIAN
 CHECKFLAGS     += -D__BIG_ENDIAN__
 else
-CHECKFLAGS     += -D__LITTLE_ENDIAN__
+CHECKFLAGS     += -D__LITTLE_ENDIAN__ -D_CALL_ELF=2
 endif
 
 ifdef CONFIG_476FPE_ERR46
@@ -421,9 +421,9 @@ ifeq ($(KBUILD_EXTMOD),)
 prepare: vdso_prepare
 vdso_prepare: prepare0
        $(if $(CONFIG_VDSO32),$(Q)$(MAKE) \
-               $(build)=arch/powerpc/kernel/vdso32 include/generated/vdso32-offsets.h)
+               $(build)=arch/powerpc/kernel/vdso include/generated/vdso32-offsets.h)
        $(if $(CONFIG_PPC64),$(Q)$(MAKE) \
-               $(build)=arch/powerpc/kernel/vdso64 include/generated/vdso64-offsets.h)
+               $(build)=arch/powerpc/kernel/vdso include/generated/vdso64-offsets.h)
 endif
 
 archprepare: checkbin