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

Commit 55bb239e authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[PATCH] powerpc: remove arch/powerpc/include hack for 64 bit 



With the removal of include/asm-powerpc, we no longer need
arch/powerpc/include/asm for the 64 bit build.  We also do not need
-Iarch/powerpc for the 64 bit build either.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 91f14480

arch/powerpc/Makefile

+10 −6
Original line number Diff line number Diff line
@@ -61,15 +61,17 @@ endif 
LDFLAGS_vmlinux	:= -Bstatic



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

CPPFLAGS	+= -Iarch/$(ARCH) -Iarch/$(ARCH)/include

AFLAGS		+= -Iarch/$(ARCH)

CFLAGS		+= -Iarch/$(ARCH) -msoft-float -pipe

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

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

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

CFLAGS-$(CONFIG_PPC32)	:= -ffixed-r2 -mmultiple

CFLAGS		+= $(CFLAGS-y)

CFLAGS-$(CONFIG_PPC32)	:= -Iarch/$(ARCH) -ffixed-r2 -mmultiple

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    += -Iarch/$(ARCH)/include

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

LINUXINCLUDE    += $(LINUXINCLUDE-y)



CHECKFLAGS	+= -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__
@@ -173,11 +175,13 @@ archclean: 


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.