Merge tag 'gvt-next-2017-12-14' of https://github.com/intel/gvt-linux into drm-intel...

[sfrench/cifs-2.6.git] / arch / arm / Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 817e5cfef83a933e8d66bfd62a7c908a1af92f2c..80351e505fd57aeb0413a80e61214e341a3e2f48 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -16,11 +16,11 @@ LDFLAGS             :=
 LDFLAGS_vmlinux        :=-p --no-undefined -X --pic-veneer
 ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)
 LDFLAGS_vmlinux        += --be8
-LDFLAGS_MODULE += --be8
+KBUILD_LDFLAGS_MODULE  += --be8
 endif
 
 ifeq ($(CONFIG_ARM_MODULE_PLTS),y)
-LDFLAGS_MODULE += -T $(srctree)/arch/arm/kernel/module.lds
+KBUILD_LDFLAGS_MODULE  += -T $(srctree)/arch/arm/kernel/module.lds
 endif
 
 GZFLAGS                :=-9
@@ -44,10 +44,12 @@ endif
 
 ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
 KBUILD_CPPFLAGS        += -mbig-endian
+CHECKFLAGS     += -D__ARMEB__
 AS             += -EB
 LD             += -EB
 else
 KBUILD_CPPFLAGS        += -mlittle-endian
+CHECKFLAGS     += -D__ARMEL__
 AS             += -EL
 LD             += -EL
 endif
@@ -120,7 +122,7 @@ CFLAGS_ISA  :=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN)
 AFLAGS_ISA     :=$(CFLAGS_ISA) -Wa$(comma)-mthumb
 # Work around buggy relocation from gas if requested:
 ifeq ($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y)
-CFLAGS_MODULE  +=-fno-optimize-sibling-calls
+KBUILD_CFLAGS_MODULE   +=-fno-optimize-sibling-calls
 endif
 else
 CFLAGS_ISA     :=$(call cc-option,-marm,)
@@ -147,6 +149,7 @@ textofs-$(CONFIG_SA1111) := 0x00208000
 endif
 textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
 textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
+textofs-$(CONFIG_ARCH_MESON) := 0x00208000
 textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
 
 # Machine directory name.  This list is sorted alphanumerically