tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by Stephen Rothwell and committed by Paul Mackerras 55bb239e 91f14480

+10 -6
unified split
+10 -6
arch/powerpc/Makefile
··· 61 61 LDFLAGS_vmlinux := -Bstatic 62 62 63 63 # The -Iarch/$(ARCH)/include is temporary while we are merging 64 - CPPFLAGS += -Iarch/$(ARCH) -Iarch/$(ARCH)/include 65 - AFLAGS += -Iarch/$(ARCH) 66 - CFLAGS += -Iarch/$(ARCH) -msoft-float -pipe 64 + CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -Iarch/$(ARCH)/include 65 + AFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) 67 66 CFLAGS-$(CONFIG_PPC64) := -mminimal-toc -mtraceback=none -mcall-aixdesc 68 - CFLAGS-$(CONFIG_PPC32) := -ffixed-r2 -mmultiple 69 - CFLAGS += $(CFLAGS-y) 67 + CFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -ffixed-r2 -mmultiple 68 + CPPFLAGS += $(CPPFLAGS-y) 69 + AFLAGS += $(AFLAGS-y) 70 + CFLAGS += -msoft-float -pipe $(CFLAGS-y) 70 71 CPP = $(CC) -E $(CFLAGS) 71 72 # Temporary hack until we have migrated to asm-powerpc 72 - LINUXINCLUDE += -Iarch/$(ARCH)/include 73 + LINUXINCLUDE-$(CONFIG_PPC32) := -Iarch/$(ARCH)/include 74 + LINUXINCLUDE += $(LINUXINCLUDE-y) 73 75 74 76 CHECKFLAGS += -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__ 75 77 ··· 175 173 176 174 archprepare: checkbin 177 175 176 + ifeq ($(CONFIG_PPC32),y) 178 177 # Temporary hack until we have migrated to asm-powerpc 179 178 include/asm: arch/$(ARCH)/include/asm 180 179 arch/$(ARCH)/include/asm: FORCE 181 180 $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi 182 181 $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm 182 + endif 183 183 184 184 # Use the file '.tmp_gas_check' for binutils tests, as gas won't output 185 185 # to stdout and these checks are run even on install targets.