Commit 45e2a6e4 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[PATCH] Create include/asm-powerpc 



The ppc and ppc64 trees are hopefully going to merge over time, so this
patch begins the process by creating a place for the merging of the
header files.

Create include/asm-powerpc (and move linkage.h into it from
asm-{ppc,ppc64} since we don't like empty directories).  Modify the
ppc and ppc64 Makefiles to cope.

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

arch/ppc/Makefile

+10 −1
Original line number Diff line number Diff line
@@ -21,11 +21,13 @@ CC := $(CC) -m32 
endif



LDFLAGS_vmlinux	:= -Ttext $(KERNELLOAD) -Bstatic

CPPFLAGS	+= -Iarch/$(ARCH)

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

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



CHECKFLAGS	+= -D__powerpc__
@@ -101,6 +103,7 @@ endef 


archclean:

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

	$(Q)rm -rf include3



prepare: include/asm-$(ARCH)/offsets.h checkbin
@@ -110,6 +113,12 @@ arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ 
include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s

	$(call filechk,gen-asm-offsets)



# 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



# 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

arch/ppc64/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ LDFLAGS := -m elf64ppc 
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



GCC_VERSION     := $(call cc-version)

GCC_BROKEN_VEC	:= $(shell if [ $(GCC_VERSION) -lt 0400 ] ; then echo "y"; fi ;)
@@ -112,6 +114,7 @@ all: $(KBUILD_IMAGE) 


archclean:

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

	$(Q)rm -rf include3



prepare: include/asm-ppc64/offsets.h
@@ -121,6 +124,12 @@ arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \ 
include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s

	$(call filechk,gen-asm-offsets)



# 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



define archhelp

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

  echo  '  zImage.initrd- Compressed kernel image with initrd attached,'

include/asm-ppc64/linkage.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __ASM_LINKAGE_H

#define __ASM_LINKAGE_H



/* Nothing to see here... */



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE