Commit 4385e12b authored Aug 02, 2008 by Paul Mundt

sh: Revert the location change of auto-generated asm/machtypes.h



This ended up causing build breakage on O= builds, as reported by Adrian:

<--  snip  -->

...
  CC      init/main.o
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/irq.h:4,
                 from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/irq.h:23,
                 from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/hardirq.h:5,
                 from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/hardirq.h:7,
                 from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/asm-generic/local.h:5,
                 from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/local.h:4,
                 from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/module.h:19,
                 from /home/bunk/linux/kernel-2.6/git/linux-2.6/init/main.c:13:
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/machvec.h:15:27:
error: asm/machtypes.h: No such file or directory
make[2]: *** [init/main.o] Error 1

<--  snip  -->

So we simply move machtypes.h back to its original place. asm-offsets.h is
still generated there regardless, until such a time that we find a better place
to stash auto-generated files.

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

parent 26a8ef53

arch/sh/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ KBUILD_AFLAGS += $(cflags-y)
		PHONY += maketools FORCE

		maketools: include/linux/version.h FORCE
		$(Q)$(MAKE) $(build)=arch/sh/tools arch/sh/include/asm/machtypes.h
		$(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h

		all: $(KBUILD_IMAGE)

		@@ -215,4 +215,4 @@ arch/sh/lib64/syscalltab.h: arch/sh/kernel/syscalls_64.S
		$(call filechk,gen-syscalltab)

		CLEAN_FILES += arch/sh/lib64/syscalltab.h \
		arch/sh/include/asm/machtypes.h
		include/asm-sh/machtypes.h

arch/sh/tools/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		# Shamelessly cloned from ARM.
		#

		arch/sh/include/asm/machtypes.h: $(src)/gen-mach-types $(src)/mach-types
		include/asm-sh/machtypes.h: $(src)/gen-mach-types $(src)/mach-types
		@echo ' Generating $@'
		$(Q)if [ ! -d arch/sh/include/asm ]; then mkdir -p arch/sh/include/asm; fi
		$(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
		$(Q)$(AWK) -f $^ > $@ \|\| { rm -f $@; /bin/false; }

Admin message