Commit b35b7072 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

[PATCH] powerpc: Move include3 to arch/$(ARCH)/include 



This is less troublesome and makes more sense.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 35797132

arch/ppc/Makefile

+9 −7
Original line number Diff line number Diff line
@@ -21,13 +21,14 @@ CC := $(CC) -m32 
endif



LDFLAGS_vmlinux	:= -Ttext $(KERNELLOAD) -Bstatic

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

# 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 \

		-ffixed-r2 -mmultiple

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

# Temporary hack until we have migrated to asm-powerpc

LINUXINCLUDE    += -Iinclude3

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



CHECKFLAGS	+= -D__powerpc__
@@ -103,15 +104,16 @@ endef 


archclean:

	$(Q)$(MAKE) $(clean)=arch/ppc/boot

	$(Q)rm -rf include3

	# Temporary hack until we have migrated to asm-powerpc

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



prepare: checkbin



# Temporary hack until we have migrated to asm-powerpc

include/asm: include3/asm

include3/asm:

	$(Q)if [ ! -d include3 ]; then mkdir -p include3; fi

	$(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm

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

arch/$(ARCH)/include/asm:

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

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



# 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.

arch/ppc64/Makefile

+7 −6
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ LDFLAGS_vmlinux := -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD) 
CFLAGS		+= -msoft-float -pipe -mminimal-toc -mtraceback=none \

		   -mcall-aixdesc

# Temporary hack until we have migrated to asm-powerpc

CPPFLAGS	+= -Iinclude3

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



GCC_VERSION     := $(call cc-version)

GCC_BROKEN_VEC	:= $(shell if [ $(GCC_VERSION) -lt 0400 ] ; then echo "y"; fi ;)
@@ -115,14 +115,15 @@ all: $(KBUILD_IMAGE) 


archclean:

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

	$(Q)rm -rf include3

	# Temporary hack until we have migrated to asm-powerpc

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





# Temporary hack until we have migrated to asm-powerpc

include/asm: include3/asm

include3/asm:

	$(Q)if [ ! -d include3 ]; then mkdir -p include3; fi;

	$(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm

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

arch/$(ARCH)/include/asm:

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

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



define archhelp

  echo  '  zImage.vmode        - Compressed kernel image (arch/$(ARCH)/boot/zImage.vmode)'