Re: [PATCH 4.14 41/80] Revert "microblaze: fix endian handling"

From: Guenter Roeck
Date: Fri Apr 27 2018 - 12:25:35 EST


On Fri, Apr 27, 2018 at 03:58:34PM +0200, Greg Kroah-Hartman wrote:
> 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.
>

I don't know about kbuild, but with this revert applied all Microblaze
builds fail. There are endless

warning: #warning inconsistent configuration, needs CONFIG_CPU_BIG_ENDIAN [-Wcpp]

followed by

lib/find_bit.c:185:15: error: redefinition of âfind_next_bit_leâ

I have to revert this revert to get successful builds.

Guenter

> 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/
>
>