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

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

powerpc/kbuild: Remove CROSS32 defines from top level powerpc Makefile 



Switch VDSO32 build over to use CROSS32_COMPILE directly, and have
it pass in -m32 after the standard c_flags. This allows endianness
overrides to be removed and the endian and bitness flags moved into
standard flags variables.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 4bf4f42a

arch/powerpc/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -17,13 +17,8 @@ HAS_BIARCH := $(call cc-option-yn, -m32) 
# Set default 32 bits cross compilers for vdso and boot wrapper

CROSS32_COMPILE ?=



CROSS32CC		:= $(CROSS32_COMPILE)gcc

CROSS32AR		:= $(CROSS32_COMPILE)ar



ifeq ($(HAS_BIARCH),y)

ifeq ($(CROSS32_COMPILE),)

CROSS32CC	:= $(CC) -m32

KBUILD_ARFLAGS	+= --target=elf32-powerpc

ifdef CONFIG_PPC32

# These options will be overridden by any -mcpu option that the CPU

# or platform code sets later on the command line, but they are needed
@@ -35,8 +30,6 @@ endif 
endif

endif



export CROSS32CC CROSS32AR



ifeq ($(CROSS_COMPILE),)

KBUILD_DEFCONFIG := $(shell uname -m)_defconfig

else

arch/powerpc/boot/Makefile

+11 −5
Original line number Diff line number Diff line
@@ -23,19 +23,23 @@ all: $(obj)/zImage 
compress-$(CONFIG_KERNEL_GZIP) := CONFIG_KERNEL_GZIP

compress-$(CONFIG_KERNEL_XZ)   := CONFIG_KERNEL_XZ



ifdef CROSS32_COMPILE

    BOOTCC := $(CROSS32_COMPILE)gcc

    BOOTAR := $(CROSS32_COMPILE)ar

else

    BOOTCC := $(CC)

    BOOTAR := $(AR)

endif



BOOTCFLAGS    := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

		 -fno-strict-aliasing -Os -msoft-float -pipe \

		 -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \

		 -D$(compress-y)



BOOTCC := $(CC)

ifdef CONFIG_PPC64_BOOT_WRAPPER

BOOTCFLAGS	+= -m64

else

BOOTCFLAGS	+= -m32

ifdef CROSS32_COMPILE

    BOOTCC := $(CROSS32_COMPILE)gcc

endif

endif



BOOTCFLAGS	+= -isystem $(shell $(BOOTCC) -print-file-name=include)
@@ -49,6 +53,8 @@ endif 


BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc



BOOTARFLAGS	:= -cr$(KBUILD_ARFLAGS)



ifdef CONFIG_DEBUG_INFO

BOOTCFLAGS	+= -g

endif
@@ -202,7 +208,7 @@ quiet_cmd_bootas = BOOTAS $@ 
      cmd_bootas = $(BOOTCC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<



quiet_cmd_bootar = BOOTAR  $@

      cmd_bootar = $(CROSS32AR) -cr$(KBUILD_ARFLAGS) $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@

      cmd_bootar = $(BOOTAR) $(BOOTARFLAGS) $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@



$(obj-libfdt): $(obj)/%.o: $(srctree)/scripts/dtc/libfdt/%.c FORCE

	$(call if_changed_dep,bootcc)

arch/powerpc/kernel/vdso32/Makefile

+11 −4
Original line number Diff line number Diff line
@@ -8,8 +8,15 @@ obj-vdso32 = sigtramp.o gettimeofday.o datapage.o cacheflush.o note.o \ 


# Build rules



ifeq ($(CONFIG_PPC32),y)

CROSS32CC := $(CC)

ifdef CROSS32_COMPILE

    VDSOCC := $(CROSS32_COMPILE)gcc

else

    VDSOCC := $(CC)

endif



CC32FLAGS :=

ifdef CONFIG_PPC64

CC32FLAGS += -m32

endif



targets := $(obj-vdso32) vdso32.so vdso32.so.dbg
@@ -45,9 +52,9 @@ $(obj-vdso32): %.o: %.S FORCE 


# actual build commands

quiet_cmd_vdso32ld = VDSO32L $@

      cmd_vdso32ld = $(CROSS32CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)

      cmd_vdso32ld = $(VDSOCC) $(c_flags) $(CC32FLAGS) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)

quiet_cmd_vdso32as = VDSO32A $@

      cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $<

      cmd_vdso32as = $(VDSOCC) $(a_flags) $(CC32FLAGS) -c -o $@ $<



# install commands for the unstripped file

quiet_cmd_vdso_install = INSTALL $@