All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Mundt <lethal@linux-sh.org>
To: Adrian Bunk <bunk@kernel.org>
Cc: sam@ravnborg.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: sh O= builds broken
Date: Fri, 01 Aug 2008 21:53:38 +0000	[thread overview]
Message-ID: <20080801215338.GC13448@linux-sh.org> (raw)
In-Reply-To: <20080801212728.GF19682@cs181140183.pp.htv.fi>

On Sat, Aug 02, 2008 at 12:27:28AM +0300, Adrian Bunk wrote:
> Most likely caused by the headers move:
> 
> <--  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  -->
> 
Ok, so this is what I get for moving the auto-generated header outside of
include/asm-sh.. it seemed like a good idea at the time.

---

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 25659ce..7b70cfd 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -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
diff --git a/arch/sh/tools/Makefile b/arch/sh/tools/Makefile
index b5d202b..567516b 100644
--- a/arch/sh/tools/Makefile
+++ b/arch/sh/tools/Makefile
@@ -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; }

WARNING: multiple messages have this Message-ID (diff)
From: Paul Mundt <lethal@linux-sh.org>
To: Adrian Bunk <bunk@kernel.org>
Cc: sam@ravnborg.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: sh O= builds broken
Date: Sat, 2 Aug 2008 06:53:38 +0900	[thread overview]
Message-ID: <20080801215338.GC13448@linux-sh.org> (raw)
In-Reply-To: <20080801212728.GF19682@cs181140183.pp.htv.fi>

On Sat, Aug 02, 2008 at 12:27:28AM +0300, Adrian Bunk wrote:
> Most likely caused by the headers move:
> 
> <--  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  -->
> 
Ok, so this is what I get for moving the auto-generated header outside of
include/asm-sh.. it seemed like a good idea at the time.

---

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 25659ce..7b70cfd 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -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
diff --git a/arch/sh/tools/Makefile b/arch/sh/tools/Makefile
index b5d202b..567516b 100644
--- a/arch/sh/tools/Makefile
+++ b/arch/sh/tools/Makefile
@@ -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; }

  reply	other threads:[~2008-08-01 21:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-01 21:27 sh O= builds broken Adrian Bunk
2008-08-01 21:27 ` Adrian Bunk
2008-08-01 21:53 ` Paul Mundt [this message]
2008-08-01 21:53   ` Paul Mundt
2008-08-01 22:03   ` Adrian Bunk
2008-08-01 22:03     ` Adrian Bunk
2008-08-01 22:12   ` Sam Ravnborg
2008-08-01 22:12     ` Sam Ravnborg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080801215338.GC13448@linux-sh.org \
    --to=lethal@linux-sh.org \
    --cc=bunk@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=sam@ravnborg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.