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

Commit 2f6c9d96 authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] Stop include asm-ppc when building ARCH=powerpc for ppc32 



We no longer have any dependancies on include/asm-ppc so we can get ride
of the makefile hacks to include it in the build process.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 33d71d26

arch/powerpc/Makefile

+1 −16
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ endif 


LDFLAGS_vmlinux	:= -Bstatic



# The -Iarch/$(ARCH)/include is temporary while we are merging

CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -Iarch/$(ARCH)/include

CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH)

AFLAGS-$(CONFIG_PPC32)	:= -Iarch/$(ARCH)

CFLAGS-$(CONFIG_PPC64)	:= -mminimal-toc -mtraceback=none  -mcall-aixdesc

CFLAGS-$(CONFIG_PPC32)	:= -Iarch/$(ARCH) -ffixed-r2 -mmultiple
@@ -72,9 +71,6 @@ CPPFLAGS += $(CPPFLAGS-y) 
AFLAGS		+= $(AFLAGS-y)

CFLAGS		+= -msoft-float -pipe $(CFLAGS-y)

CPP		= $(CC) -E $(CFLAGS)

# Temporary hack until we have migrated to asm-powerpc

LINUXINCLUDE-$(CONFIG_PPC32)	:= -Iarch/$(ARCH)/include

LINUXINCLUDE    += $(LINUXINCLUDE-y)



CHECKFLAGS	+= -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__
@@ -172,19 +168,8 @@ install: 
archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



archmrproper:

	$(Q)rm -rf arch/$(ARCH)/include



archprepare: checkbin



ifeq ($(CONFIG_PPC32),y)

# Temporary hack until we have migrated to asm-powerpc

include/asm: arch/$(ARCH)/include/asm

arch/$(ARCH)/include/asm: FORCE

	$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi

	$(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm

endif



# Use the file '.tmp_gas_check' for binutils tests, as gas won't output

# to stdout and these checks are run even on install targets.

TOUT	:= .tmp_gas_check