4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This reverts commit ac3d021048be9edb825f0794da5b42f04fefecef which is commit 71e7673dadfdae0605d4c1f66ecb4b045c79fe0f upstream. kbuild reports that this causes build regressions in 4.14.y, so drop it. Reported-by: kbuild test robot <lkp@xxxxxxxxx> Reported-by: "Hao, Shun" <shun.hao@xxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Michal Simek <michal.simek@xxxxxxxxxx> Cc: Guenter Roeck <linux@xxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/microblaze/Makefile | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -36,21 +36,16 @@ endif CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_DIV) += -mno-xl-soft-div CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_BARREL) += -mxl-barrel-shift CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR) += -mxl-pattern-compare - -ifdef CONFIG_CPU_BIG_ENDIAN -KBUILD_CFLAGS += -mbig-endian -KBUILD_AFLAGS += -mbig-endian -LD += -EB -else -KBUILD_CFLAGS += -mlittle-endian -KBUILD_AFLAGS += -mlittle-endian -LD += -EL -endif +CPUFLAGS-$(CONFIG_BIG_ENDIAN) += -mbig-endian +CPUFLAGS-$(CONFIG_LITTLE_ENDIAN) += -mlittle-endian CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER)) # r31 holds current when in kernel mode -KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-y) $(CPUFLAGS-1) $(CPUFLAGS-2) +KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2) + +LDFLAGS := +LDFLAGS_vmlinux := head-y := arch/microblaze/kernel/head.o libs-y += arch/microblaze/lib/