diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-08-17 02:52:39 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-08-22 23:47:33 -0400 |
commit | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (patch) | |
tree | 16f385942f09fd7897619de5a1990b968b4dc00d /arch/powerpc/Makefile | |
parent | 33d71d26ba982f99b8cb76b86b2e1e0a0964a8ac (diff) |
[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: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/Makefile')
-rw-r--r-- | arch/powerpc/Makefile | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 8e59c0c405a..6015a92bc2a 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile | |||
@@ -63,8 +63,7 @@ endif | |||
63 | 63 | ||
64 | LDFLAGS_vmlinux := -Bstatic | 64 | LDFLAGS_vmlinux := -Bstatic |
65 | 65 | ||
66 | # The -Iarch/$(ARCH)/include is temporary while we are merging | 66 | CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) |
67 | CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -Iarch/$(ARCH)/include | ||
68 | AFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) | 67 | AFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) |
69 | CFLAGS-$(CONFIG_PPC64) := -mminimal-toc -mtraceback=none -mcall-aixdesc | 68 | CFLAGS-$(CONFIG_PPC64) := -mminimal-toc -mtraceback=none -mcall-aixdesc |
70 | CFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -ffixed-r2 -mmultiple | 69 | CFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -ffixed-r2 -mmultiple |
@@ -72,9 +71,6 @@ CPPFLAGS += $(CPPFLAGS-y) | |||
72 | AFLAGS += $(AFLAGS-y) | 71 | AFLAGS += $(AFLAGS-y) |
73 | CFLAGS += -msoft-float -pipe $(CFLAGS-y) | 72 | CFLAGS += -msoft-float -pipe $(CFLAGS-y) |
74 | CPP = $(CC) -E $(CFLAGS) | 73 | CPP = $(CC) -E $(CFLAGS) |
75 | # Temporary hack until we have migrated to asm-powerpc | ||
76 | LINUXINCLUDE-$(CONFIG_PPC32) := -Iarch/$(ARCH)/include | ||
77 | LINUXINCLUDE += $(LINUXINCLUDE-y) | ||
78 | 74 | ||
79 | CHECKFLAGS += -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__ | 75 | CHECKFLAGS += -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__ |
80 | 76 | ||
@@ -172,19 +168,8 @@ install: | |||
172 | archclean: | 168 | archclean: |
173 | $(Q)$(MAKE) $(clean)=$(boot) | 169 | $(Q)$(MAKE) $(clean)=$(boot) |
174 | 170 | ||
175 | archmrproper: | ||
176 | $(Q)rm -rf arch/$(ARCH)/include | ||
177 | |||
178 | archprepare: checkbin | 171 | archprepare: checkbin |
179 | 172 | ||
180 | ifeq ($(CONFIG_PPC32),y) | ||
181 | # Temporary hack until we have migrated to asm-powerpc | ||
182 | include/asm: arch/$(ARCH)/include/asm | ||
183 | arch/$(ARCH)/include/asm: FORCE | ||
184 | $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi | ||
185 | $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm | ||
186 | endif | ||
187 | |||
188 | # Use the file '.tmp_gas_check' for binutils tests, as gas won't output | 173 | # Use the file '.tmp_gas_check' for binutils tests, as gas won't output |
189 | # to stdout and these checks are run even on install targets. | 174 | # to stdout and these checks are run even on install targets. |
190 | TOUT := .tmp_gas_check | 175 | TOUT := .tmp_gas_check |