linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michal Marek <mmarek@suse.cz>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
	linux-kbuild <linux-kbuild@vger.kernel.org>,
	linux arch <linux-arch@vger.kernel.org>,
	Arnd Bergmann <arnd@arndb.de>,
	Guan Xuetao <guanxuetao@mprc.pku.edu.cn>
Subject: Re: [PATCH 1/2] kbuild: asm-generic support
Date: Fri, 14 Jan 2011 15:43:54 +0100	[thread overview]
Message-ID: <20110114144354.GA23611@sepie.suse.cz> (raw)
In-Reply-To: <20110113170131.GA28377@merkur.ravnborg.org>

On Thu, Jan 13, 2011 at 06:01:31PM +0100, Sam Ravnborg wrote:
> On Thu, Jan 13, 2011 at 05:14:05PM +0100, Michal Marek wrote:
> > On 9.1.2011 20:29, Sam Ravnborg wrote:
> > > diff --git a/scripts/asm-generic.sh b/scripts/asm-generic.sh
> > > new file mode 100644
> > > index 0000000..d28127f
> > > --- /dev/null
> > > +++ b/scripts/asm-generic.sh
> > > @@ -0,0 +1,33 @@
> > > +#!/bin/sh
> > > +#
> > > +# include/asm-generic contains a lot of files that are used
> > > +# verbatim by several architectures.
> > > +#
> > > +# This scripts read the file arch/$(ARCH)/include/asm/Kbuild
> > > +# and for each file listed in this file with generic-y create
> > > +# a small wrapper file in arch/$(ARCH)/include/generated/
> > > +
> > > +# read list of header files form Kbuild
> > > +# The file has make syntax which looks like this:
> > > +#
> > > +# generic-y += <filename>
> > > +
> > > +srcdir=${srctree}/arch/$1/include/asm
> > > +gendir=arch/$1/include/generated/asm
> > > +
> > > +# Read the list of files (note that the list uses make syntax)
> > > +files=$( cat ${srcdir}/Kbuild | \
> > > +          grep -v ^# | grep generic-y | cut -d '=' -f 2)
> > 
> > Now that the list of required generic headers is in a Kbuild file, it
> > would be better to let make parse it, instead of enforcing one way to
> > construct the list (it is the preferred way, but C files that do not
> > conform to Documentation/CodingStyle are not rejected by the compiler
> > either). I will post a patch when I'm back online in the evening.
> Would be great!
> 
> Guan also pointed out a less than minor issue...
> I overwrite the files each time so that I force a rebuild.

Hi,

this should do the trick (the deletion of scripts/asm-generic.sh is left
out for brevity). I initially wanted to use this also from
Makefile.headersinst, but there we only want to export headers listed in
header-y, so I gave up on this idea.

Michal

diff --git a/Makefile b/Makefile
index 5a29426..6ede051 100644
--- a/Makefile
+++ b/Makefile
@@ -416,7 +416,7 @@ endif
 # Support for using generic headers in asm-generic
 PHONY += asm-generic
 asm-generic:
-	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/asm-generic.sh $(SRCARCH)
+	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic obj=arch/$(SRCARCH)/include/generated/asm
 
 # To make sure we do not include .config for any of the *config targets
 # catch them early, and hand them over to scripts/kconfig/Makefile
diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic
new file mode 100644
index 0000000..b4f2547
--- /dev/null
+++ b/scripts/Makefile.asm-generic
@@ -0,0 +1,26 @@
+# include/asm-generic contains a lot of files that are used
+# verbatim by several architectures.
+#
+# This Makefile reads the file arch/$(SRCARCH)/include/asm/Kbuild
+# and for each file listed in this file with generic-y creates
+# a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/asm)
+
+kbuild-file := $(srctree)/arch/$(SRCARCH)/include/asm/Kbuild
+include $(kbuild-file)
+
+include scripts/Kbuild.include
+
+
+ifneq ($(KBUILD_SRC),)
+# Create output directory if not already present
+_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
+endif
+
+quiet_cmd_wrap = WRAP    $@
+cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@
+
+all: $(patsubst %, $(obj)/%, $(generic-y))
+
+$(obj)/%.h:
+	$(call cmd,wrap)
+

  parent reply	other threads:[~2011-01-14 14:43 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-08 13:03 [RFC] kbuild: generic support for asm-generic Sam Ravnborg
2011-01-08 13:03 ` Sam Ravnborg
2011-01-08 13:04 ` [PATCH 1/2] kbuild: asm-generic support Sam Ravnborg
2011-01-08 13:04   ` Sam Ravnborg
2011-01-08 13:45   ` Stephen Rothwell
2011-01-08 14:03     ` Sam Ravnborg
2011-01-08 14:03       ` Sam Ravnborg
2011-01-08 14:10   ` Guan Xuetao
2011-01-08 14:10     ` Guan Xuetao
2011-01-08 13:05 ` [EXAMPLE PATCH 2/2] x86: start to utilize kbuild " Sam Ravnborg
2011-01-08 13:05   ` Sam Ravnborg
2011-01-08 20:53 ` [RFC] kbuild: generic support for asm-generic Arnd Bergmann
2011-01-08 21:33   ` Sam Ravnborg
2011-01-08 21:33     ` Sam Ravnborg
2011-01-09  0:15     ` Arnd Bergmann
2011-01-09  8:28 ` [RFC v2] " Sam Ravnborg
2011-01-09  8:28   ` Sam Ravnborg
2011-01-09  8:31   ` [PATCH 1/2] kbuild: asm-generic support Sam Ravnborg
2011-01-09  8:31     ` Sam Ravnborg
2011-01-09 14:03     ` Arnd Bergmann
2011-01-09 15:10       ` Sam Ravnborg
2011-01-09 16:13         ` Arnd Bergmann
2011-01-09 16:13           ` Arnd Bergmann
2011-01-09  8:32   ` [EXAMPLE PATCH 2/2] x86: start to utilize kbuild " Sam Ravnborg
2011-01-09  8:32     ` Sam Ravnborg
2011-01-09 19:27 ` [RFC v3] kbuild: generic support for asm-generic Sam Ravnborg
2011-01-09 19:27   ` Sam Ravnborg
2011-01-09 19:29   ` [PATCH 1/2] kbuild: asm-generic support Sam Ravnborg
2011-01-09 19:29     ` Sam Ravnborg
2011-01-09 20:31     ` Arnd Bergmann
2011-01-09 20:31       ` Arnd Bergmann
2011-01-09 21:24       ` Sam Ravnborg
2011-01-09 21:24         ` Sam Ravnborg
2011-01-10 13:14     ` Guan Xuetao
2011-01-10 13:14       ` Guan Xuetao
2011-01-10 16:26       ` Sam Ravnborg
2011-01-10 16:26         ` Sam Ravnborg
2011-01-11  1:39         ` Guan Xuetao
2011-01-10 13:31     ` Guan Xuetao
2011-01-10 13:31       ` Guan Xuetao
2011-01-13 16:14     ` Michal Marek
2011-01-13 17:01       ` Sam Ravnborg
2011-01-13 17:01         ` Sam Ravnborg
2011-01-14 14:43         ` Michal Marek [this message]
2011-04-22 15:53           ` [PATCH v3] " Sam Ravnborg
2011-04-22 15:53             ` Sam Ravnborg
2011-04-25  1:29             ` Guan Xuetao
2011-04-27 19:42               ` Sam Ravnborg
2011-04-27 19:42                 ` Sam Ravnborg
2011-04-27 19:46                 ` [PATCH v4] " Sam Ravnborg
2011-04-27 19:46                   ` Sam Ravnborg
2011-04-27 19:52                   ` Arnd Bergmann
2011-04-27 19:52                     ` Arnd Bergmann
2011-04-27 20:29                     ` [PATCH v5] " Sam Ravnborg
2011-04-27 20:29                       ` Sam Ravnborg
2011-04-28 16:16                       ` Michal Marek
2011-01-09 19:29   ` [EXAMPLE PATCH 2/2] x86: start to utilize kbuild " Sam Ravnborg
2011-01-09 19:29     ` 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=20110114144354.GA23611@sepie.suse.cz \
    --to=mmarek@suse.cz \
    --cc=arnd@arndb.de \
    --cc=guanxuetao@mprc.pku.edu.cn \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).