| Message ID | 1307479931-10424-1-git-send-email-lacombar@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Wed, Jun 8, 2011 at 11:38 AM, Michal Marek <mmarek@suse.cz> wrote: > On Wed, Jun 08, 2011 at 01:03:28AM -0400, Arnaud Lacombe wrote: >> Hi Michal, >> >> Here is some update concerning the parser generation merge. I do not repost the >> whole serie as it may be overkill. You can find the latest branch at: >> >> git://github.com/lacombar/linux-2.6.git kbuild-implicit-parser-rule >> >> So let't get it done the safe way... >> >> Changes since v4: >> [...] > > > Hi, I found now what my problem with genksyms was. I use O= and you > removed the -I$(src) for the lexer (which is a generated file, but needs > genksyms.h from the source directory). With the following patch, > everything should work again (test builds still running, but they built > genksyms already): > yes, I spotted that yesterday, this is fixed in v5. - Arnaud > diff --git a/scripts/genksyms/Makefile b/scripts/genksyms/Makefile > index 0b883e3..ee1071f 100644 > --- a/scripts/genksyms/Makefile > +++ b/scripts/genksyms/Makefile > @@ -6,6 +6,7 @@ genksyms-objs := genksyms.o parse.tab.o lex.lex.o > > # -I needed for generated C source (shipped source) > HOSTCFLAGS_parse.tab.o := -Wno-uninitialized -I$(src) > +HOSTCFLAGS_lex.lex.o := -I$(src) > > $(obj)/parse.tab.o: $(obj)/parse.tab.c $(obj)/parse.tab.h > > Michal > -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Wed, Jun 8, 2011 at 4:34 PM, Michal Marek <mmarek@suse.cz> wrote: > Dne 8.6.2011 18:11, Arnaud Lacombe napsal(a): >> Hi, >> >> On Wed, Jun 8, 2011 at 11:38 AM, Michal Marek <mmarek@suse.cz> wrote: >>> On Wed, Jun 08, 2011 at 01:03:28AM -0400, Arnaud Lacombe wrote: >>>> Hi Michal, >>>> >>>> Here is some update concerning the parser generation merge. I do not repost the >>>> whole serie as it may be overkill. You can find the latest branch at: >>>> >>>> git://github.com/lacombar/linux-2.6.git kbuild-implicit-parser-rule >>>> >>>> So let't get it done the safe way... >>>> >>>> Changes since v4: >>>> [...] >>> >>> >>> Hi, I found now what my problem with genksyms was. I use O= and you >>> removed the -I$(src) for the lexer (which is a generated file, but needs >>> genksyms.h from the source directory). With the following patch, >>> everything should work again (test builds still running, but they built >>> genksyms already): >>> >> yes, I spotted that yesterday, this is fixed in v5. > > Then please push it to github :) > @#$... I should stop sending stuff at 1 a.m. This is now fixed. New head is c51572047d18641be2350d188f9493f6a39f6b26. Btw, as a small remainder, none of the patch are Signed-off. When you'll be happy with the branch, I'll post the serie for final review. - Arnaud > $ git ls-remote git://github.com/lacombar/linux-2.6.git | grep > kbuild-implicit-parser-rule > a483784894fcbba51be58afc4a2ff1373ed96ca0 > refs/heads/kbuild-implicit-parser-rule > $ git show > a483784894fcbba51be58afc4a2ff1373ed96ca0:scripts/genksyms/Makefile | > grep FLAGS > HOSTCFLAGS_parse.tab.o := -Wno-uninitialized -I$(src) > $ > > Michal > -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 8.6.2011 23:10, Arnaud Lacombe wrote: > @#$... I should stop sending stuff at 1 a.m. This is now fixed. New > head is c51572047d18641be2350d188f9493f6a39f6b26. > > Btw, as a small remainder, none of the patch are Signed-off. When > you'll be happy with the branch, I'll post the serie for final review. Thanks, this looks perfect now, please add your signoffs and push once more. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Thu, Jun 9, 2011 at 8:09 AM, Michal Marek <mmarek@suse.cz> wrote: > On 8.6.2011 23:10, Arnaud Lacombe wrote: >> >> @#$... I should stop sending stuff at 1 a.m. This is now fixed. New >> head is c51572047d18641be2350d188f9493f6a39f6b26. >> >> Btw, as a small remainder, none of the patch are Signed-off. When >> you'll be happy with the branch, I'll post the serie for final review. > > Thanks, this looks perfect now, please add your signoffs and push once more. > Done, The following changes since commit 55922c9d1b84b89cb946c777fddccb3247e7df2c: Linux 3.0-rc1 (2011-05-29 17:43:36 -0700) are available in the git repository at: git@github.com:lacombar/linux-2.6.git kbuild-implicit-parser-rule Arnaud Lacombe (14): kbuild: add `baseprereq' kbuild: add implicit rules for parser generation kbuild: simplify the %_shipped rule genksyms: pass hash and lookup functions name and target language though the input file genksyms: drop -Wno-uninitialized from HOSTCFLAGS_parse.tab.o genksyms: migrate parser to implicit rules genksym: regen parser kconfig: constify `kconf_id_lookup' kconfig: kill no longer needed reference to YYDEBUG kconfig/zconf.l: do not ask to generate backup kconfig: migrate parser to implicit rules kconfig: regen parser dtc: migrate parser to implicit rules dtc: regen parser scripts/Kbuild.include | 4 + scripts/Makefile.lib | 40 +++- scripts/dtc/Makefile | 28 +-- scripts/dtc/dtc-lexer.lex.c_shipped | 59 +--- scripts/dtc/dtc-parser.tab.c_shipped | 116 +------ scripts/dtc/dtc-parser.tab.h_shipped | 11 +- scripts/genksyms/.gitignore | 7 +- scripts/genksyms/Makefile | 48 +--- scripts/genksyms/keywords.gperf | 3 + ...{keywords.c_shipped => keywords.hash.c_shipped} | 96 +++--- scripts/genksyms/lex.l | 4 +- .../genksyms/{lex.c_shipped => lex.lex.c_shipped} | 359 +------------------- .../{parse.c_shipped => parse.tab.c_shipped} | 198 +---------- .../{parse.h_shipped => parse.tab.h_shipped} | 7 +- scripts/kconfig/.gitignore | 2 +- scripts/kconfig/Makefile | 34 +-- scripts/kconfig/lkc.h | 2 - scripts/kconfig/zconf.gperf | 2 +- scripts/kconfig/zconf.hash.c_shipped | 273 +++++++++------- scripts/kconfig/zconf.l | 8 +- .../{lex.zconf.c_shipped => zconf.lex.c_shipped} | 26 +-- scripts/kconfig/zconf.tab.c_shipped | 68 ++-- scripts/kconfig/zconf.y | 18 +- 23 files changed, 370 insertions(+), 1043 deletions(-) rename scripts/genksyms/{keywords.c_shipped => keywords.hash.c_shipped} (94%) rename scripts/genksyms/{lex.c_shipped => lex.lex.c_shipped} (89%) rename scripts/genksyms/{parse.c_shipped => parse.tab.c_shipped} (92%) rename scripts/genksyms/{parse.h_shipped => parse.tab.h_shipped} (96%) rename scripts/kconfig/{lex.zconf.c_shipped => zconf.lex.c_shipped} (98%) - Arnaud -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 9.6.2011 20:16, Arnaud Lacombe wrote: > Hi, > > On Thu, Jun 9, 2011 at 8:09 AM, Michal Marek <mmarek@suse.cz> wrote: >> On 8.6.2011 23:10, Arnaud Lacombe wrote: >>> >>> @#$... I should stop sending stuff at 1 a.m. This is now fixed. New >>> head is c51572047d18641be2350d188f9493f6a39f6b26. >>> >>> Btw, as a small remainder, none of the patch are Signed-off. When >>> you'll be happy with the branch, I'll post the serie for final review. >> >> Thanks, this looks perfect now, please add your signoffs and push once more. >> > Done, > > The following changes since commit 55922c9d1b84b89cb946c777fddccb3247e7df2c: > > Linux 3.0-rc1 (2011-05-29 17:43:36 -0700) > > are available in the git repository at: > git@github.com:lacombar/linux-2.6.git kbuild-implicit-parser-rule Merged now, sorry for the delay. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index f76d9ba..ad062b7 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -161,10 +161,12 @@ modname-multi = $(sort $(foreach m,$(multi-used),\ $(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=)))) ifdef REGENERATE_PARSERS + # GPERF # --------------------------------------------------------------------------- quiet_cmd_gperf = GPERF $@ cmd_gperf = gperf -t --output-file $@ -a -C -E -g -k 1,3,$$ -p -t $< + $(src)/%.hash.c_shipped: $(src)/%.gperf $(call cmd,gperf) @@ -180,10 +182,10 @@ $(src)/%.lex.c_shipped: $(src)/%.l # --------------------------------------------------------------------------- quiet_cmd_bison = YACC $@ cmd_bison = bison -o$@ -d -t -l -p $(if $(YACC_PREFIX_${baseprereq}),$(YACC_PREFIX_${baseprereq}),yy) $< -$(src)/%.tab.c_shipped: $(src)/%.y + +$(src)/%.tab.c_shipped $(src)/%.tab.h_shipped: $(src)/%.y $(call cmd,bison) -$(src)/%.tab.h_shipped: $(src)/%.tab.c_shipped endif # Shipped files @@ -192,20 +194,9 @@ endif quiet_cmd_shipped = SHIPPED $@ cmd_shipped = cat $< > $@ -$(obj)/%.tab.c: $(src)/%.tab.c_shipped - $(call cmd,shipped) - -$(obj)/%.tab.h: $(src)/%.tab.h_shipped +$(obj)/%: $(src)/%_shipped $(call cmd,shipped) -$(obj)/%.lex.c: $(src)/%.lex.c_shipped - $(call cmd,shipped) - -$(obj)/%.hash.c: $(src)/%.hash.c_shipped - $(call cmd,shipped) - -$(obj)/%:: $(src)/%_shipped - # Commands useful for building a boot image # =========================================================================== # diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile index 5bac1cb..a957ab4 100644 --- a/scripts/dtc/Makefile +++ b/scripts/dtc/Makefile @@ -26,7 +26,6 @@ HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC) # dependencies on generated files need to be listed explicitly $(obj)/dtc-parser.tab.o: $(obj)/dtc-parser.tab.c $(obj)/dtc-parser.tab.h -$(obj)/dtc-lexer.lex.o: $(obj)/dtc-lexer.lex.c $(obj)/dtc-parser.tab.h -targets += dtc-parser.tab.c dtc-lexer.lex.c +$(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.c $(obj)/dtc-parser.tab.h diff --git a/scripts/genksyms/Makefile b/scripts/genksyms/Makefile index fdaf764..0b883e3 100644 --- a/scripts/genksyms/Makefile +++ b/scripts/genksyms/Makefile @@ -7,5 +7,8 @@ genksyms-objs := genksyms.o parse.tab.o lex.lex.o # -I needed for generated C source (shipped source) HOSTCFLAGS_parse.tab.o := -Wno-uninitialized -I$(src) -$(obj)/lex.lex.o: $(obj)/parse.tab.h $(obj)/keywords.hash.c +$(obj)/parse.tab.o: $(obj)/parse.tab.c $(obj)/parse.tab.h + +$(obj)/lex.lex.o: $(obj)/keywords.hash.c +$(obj)/lex.lex.o: $(obj)/parse.tab.c $(obj)/parse.tab.h diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index 98aad53..ddee5fc 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l @@ -1,5 +1,5 @@ -%option backup nostdinit noyywrap never-interactive full ecs -%option 8bit backup nodefault perf-report perf-report +%option nostdinit noyywrap never-interactive full ecs +%option 8bit nodefault perf-report perf-report %option noinput %x COMMAND HELP STRING PARAM %{ diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index f661b4c..c38cc5a 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -499,10 +499,8 @@ void conf_parse(const char *name) modules_sym->flags |= SYMBOL_AUTO; rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); -#if YYDEBUG if (getenv("ZCONF_DEBUG")) zconfdebug = 1; -#endif zconfparse(); if (zconfnerrs) exit(1);
Hi Michal, Here is some update concerning the parser generation merge. I do not repost the whole serie as it may be overkill. You can find the latest branch at: git://github.com/lacombar/linux-2.6.git kbuild-implicit-parser-rule For the record, I did full test build in the following environment: % cat allno.config CONFIG_SCSI=y CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_AIC7XXX=y CONFIG_SCSI_AIC79XX=y CONFIG_AIC7XXX_REG_PRETTY_PRINT=y CONFIG_AIC79XX_REG_PRETTY_PRINT=y CONFIG_NETDEVICES=y CONFIG_NET=y CONFIG_HDLC=y CONFIG_EISA=y CONFIG_PCI=y CONFIG_VT=y CONFIG_HW_CONSOLE=y CONFIG_WAN=y CONFIG_WANXL=y % gmake CONFIG_DTC=y CONFIG_MODVERSIONS=y REGENERATE_PARSERS=1 \ scripts allnoconfig vmlinux finalize without error. Then, re-started after having updated the parsers: % touch scripts/*/*.[ly] finalized without error. Then, various combinaison of: % git clean -fdx scripts/ % rm -f $(find . -name *_shipped | sed 's/_shipped//') % rm -f $(find scripts/ -name '*_shipped') scripts/dtc/dtc-parser.tab.* scripts/genksyms/parse.tab.* All build finalized without error. You'll find an updated diff between v3 and v4 below. Changes since v3: - fix the %_shipped implicit rule - attempt to tweak the relation between `$(src)/%.tab.c_shipped' and `$(src)/%.tab.h_shipped' to make it more robust. This is _very_ delicate as gmake has trouble to properly generate `$(obj)/%.tab.h' from `$(src)/%.tab.h_shipped' if it is missing and requires `$(src)/%.tab.c_shipped' to be created. This now survives a full deletion of the %_shipped files. - a few spacing nits - removes a few useless explicit dependency - do not degerate extra `lex.debug' file when regenerating kconfig's parser - removed missed occurences of YYDEBUG Changes since v2: - allow a parser to specify the prefix to be used. This will allow for multiple parser to use the implicit rules, which was not previously possible, as it was using the `yy' default. - drop the zconf prefix changes - add a `baseprereq' global to kbuild, which mimics `basetarget' - rebase on top of v3.0-rc1 Changes since v1: - include scripts/dtc/' parser in the scope of the patchset - do not rename any parser source - make lexer file name consistent, ie. name it %.lex.c, not lex.%.c - rebase on top of v2.6.39 Regards, - Arnaud Arnaud Lacombe (13): kbuild: add `baseprereq' kbuild: add implicit rules for parser generation kbuild: simplify the %_shipped rule genksyms: pass hash and lookup functions name and target language though the input file genksyms: migrate parser to implicit rules genksym: regen parser kconfig: constify `kconf_id_lookup' kconfig: kill no longer needed reference to YYDEBUG kconfig/zconf.l: do not ask to generate backup kconfig: migrate parser to implicit rules kconfig: regen parser dtc: migrate parser to implicit rules dtc: regen parser --- scripts/Makefile.lib | 19 +++++-------------- scripts/dtc/Makefile | 3 +-- scripts/genksyms/Makefile | 5 ++++- scripts/kconfig/zconf.l | 4 ++-- scripts/kconfig/zconf.y | 2 -- 5 files changed, 12 insertions(+), 21 deletions(-)