Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dc831aa authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc: Fix compiling a BE kernel with a powerpc64le toolchain 



GCC can compile with either endian, but the default ABI version is set
based on the default endianness of the toolchain. Alan Modra says:

  you need both -mbig and -mabi=elfv1 to make a powerpc64le gcc
  generate powerpc64 code

The opposite is true for powerpc64 when generating -mlittle it
requires -mabi=elfv2 to generate v2 ABI, which we were already doing.

This change adds ABI annotations together with endianness for all cases,
LE and BE. This fixes the case of building a BE kernel with a toolchain
that is LE by default.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Tested-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent a6d8a215

arch/powerpc/Makefile

+10 −1
Original line number Diff line number Diff line
@@ -72,8 +72,15 @@ GNUTARGET := powerpc 
MULTIPLEWORD	:= -mmultiple

endif



cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mbig-endian)

ifdef CONFIG_PPC64

cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mabi=elfv1)

cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mcall-aixdesc)

aflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mabi=elfv1)

aflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -mabi=elfv2

endif



cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -mlittle-endian

cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mbig-endian)

ifneq ($(cc-name),clang)

  cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -mno-strict-align

endif
@@ -113,7 +120,9 @@ ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y) 
CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc))

AFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv2)

else

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv1)

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcall-aixdesc)

AFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mabi=elfv1)

endif

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcmodel=medium,$(call cc-option,-mminimal-toc))

CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mno-pointers-to-nested-functions)