| Message ID | 20211001053253.1223316-10-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/10] kconfig: remove 'const' from the return type of sym_escape_string_value() | expand |
On Fri, Oct 01, 2021 at 02:32:53PM +0900, Masahiro Yamada wrote: > This patch is not intended for the mainline. > > I created this patch for Stephen Rothwell to resolve the merge > conflicts more easily. > > The Rust tree is touching scripts/kconfig/confdata.c to generate > include/generated/rustc_cfg, which would cause complicated conflicts > with changes from the kbuild tree. > > I re-implemented it to produce the equaivalent rustc_cfg. > > I also fixed the memory leak; the original code from the Rust tree > did not free the malloc'ed pointer. > > Stephen: > When you resolve the conflicts in confdata.c, please take this one. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- > > scripts/kconfig/confdata.c | 42 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c > index 9ece2f3b61a6..4767f3810cf4 100644 > --- a/scripts/kconfig/confdata.c > +++ b/scripts/kconfig/confdata.c > @@ -603,6 +603,9 @@ static const struct comment_style comment_style_c = { > > static void conf_write_heading(FILE *fp, const struct comment_style *cs) > { > + if (!cs) /* no heading for rustc_cfg? */ > + return; > + > fprintf(fp, "%s\n", cs->comment_block_begin); > > fprintf(fp, "%s Automatically generated file; DO NOT EDIT.\n", > @@ -750,6 +753,39 @@ static void print_symbol_for_c(FILE *fp, struct symbol *sym) > free(escaped); > } > > +/* rustc configuration */ > +static void print_symbol_for_rustc_cfg(FILE *fp, struct symbol *sym) > +{ > + const char *val; > + char *escaped; > + > + if (sym->type == S_UNKNOWN) > + return; > + > + val = sym_get_string_value(sym); > + escaped = escape_string_value(val); > + > + if (sym->type == S_BOOLEAN || sym->type == S_TRISTATE) { > + if (*val == 'n') > + return; I'd expect a "free(escaped);" here. > + > + /* > + * To have similar functionality to the C macro `IS_ENABLED()` > + * we provide an empty `--cfg CONFIG_X` here in both `y` > + * and `m` cases. > + * > + * Then, the common `fprintf()` below will also give us > + * a `--cfg CONFIG_X="y"` or `--cfg CONFIG_X="m"`, which can > + * be used as the equivalent of `IS_BUILTIN()`/`IS_MODULE()`. > + */ > + fprintf(fp, "--cfg=%s%s\n", CONFIG_, sym->name); > + } > + > + fprintf(fp, "--cfg=%s%s=%s\n", CONFIG_, sym->name, escaped); > + > + free(escaped); > +} > + > /* > * Write out a minimal config. > * All values that has default values are skipped as this is redundant. > @@ -1129,6 +1165,12 @@ int conf_write_autoconf(int overwrite) > if (ret) > return ret; > > + ret = __conf_write_autoconf("include/generated/rustc_cfg", > + print_symbol_for_rustc_cfg, > + NULL); > + if (ret) > + return ret; > + > /* > * Create include/config/auto.conf. This must be the last step because > * Kbuild has a dependency on auto.conf and this marks the successful > -- > 2.30.2 >
On Fri, Oct 1, 2021 at 8:29 PM <n.schier@avm.de> wrote: > > On Fri, Oct 01, 2021 at 02:32:53PM +0900, Masahiro Yamada wrote: > > This patch is not intended for the mainline. > > > > I created this patch for Stephen Rothwell to resolve the merge > > conflicts more easily. > > > > The Rust tree is touching scripts/kconfig/confdata.c to generate > > include/generated/rustc_cfg, which would cause complicated conflicts > > with changes from the kbuild tree. > > > > I re-implemented it to produce the equaivalent rustc_cfg. > > > > I also fixed the memory leak; the original code from the Rust tree > > did not free the malloc'ed pointer. > > > > Stephen: > > When you resolve the conflicts in confdata.c, please take this one. > > > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > > --- > > > > scripts/kconfig/confdata.c | 42 ++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 42 insertions(+) > > > > diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c > > index 9ece2f3b61a6..4767f3810cf4 100644 > > --- a/scripts/kconfig/confdata.c > > +++ b/scripts/kconfig/confdata.c > > @@ -603,6 +603,9 @@ static const struct comment_style comment_style_c = { > > > > static void conf_write_heading(FILE *fp, const struct comment_style *cs) > > { > > + if (!cs) /* no heading for rustc_cfg? */ > > + return; > > + > > fprintf(fp, "%s\n", cs->comment_block_begin); > > > > fprintf(fp, "%s Automatically generated file; DO NOT EDIT.\n", > > @@ -750,6 +753,39 @@ static void print_symbol_for_c(FILE *fp, struct symbol *sym) > > free(escaped); > > } > > > > +/* rustc configuration */ > > +static void print_symbol_for_rustc_cfg(FILE *fp, struct symbol *sym) > > +{ > > + const char *val; > > + char *escaped; > > + > > + if (sym->type == S_UNKNOWN) > > + return; > > + > > + val = sym_get_string_value(sym); > > + escaped = escape_string_value(val); > > + > > + if (sym->type == S_BOOLEAN || sym->type == S_TRISTATE) { > > + if (*val == 'n') > > + return; > > I'd expect a "free(escaped);" here. Thank you for catching it. I just sent v2.
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 9ece2f3b61a6..4767f3810cf4 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -603,6 +603,9 @@ static const struct comment_style comment_style_c = { static void conf_write_heading(FILE *fp, const struct comment_style *cs) { + if (!cs) /* no heading for rustc_cfg? */ + return; + fprintf(fp, "%s\n", cs->comment_block_begin); fprintf(fp, "%s Automatically generated file; DO NOT EDIT.\n", @@ -750,6 +753,39 @@ static void print_symbol_for_c(FILE *fp, struct symbol *sym) free(escaped); } +/* rustc configuration */ +static void print_symbol_for_rustc_cfg(FILE *fp, struct symbol *sym) +{ + const char *val; + char *escaped; + + if (sym->type == S_UNKNOWN) + return; + + val = sym_get_string_value(sym); + escaped = escape_string_value(val); + + if (sym->type == S_BOOLEAN || sym->type == S_TRISTATE) { + if (*val == 'n') + return; + + /* + * To have similar functionality to the C macro `IS_ENABLED()` + * we provide an empty `--cfg CONFIG_X` here in both `y` + * and `m` cases. + * + * Then, the common `fprintf()` below will also give us + * a `--cfg CONFIG_X="y"` or `--cfg CONFIG_X="m"`, which can + * be used as the equivalent of `IS_BUILTIN()`/`IS_MODULE()`. + */ + fprintf(fp, "--cfg=%s%s\n", CONFIG_, sym->name); + } + + fprintf(fp, "--cfg=%s%s=%s\n", CONFIG_, sym->name, escaped); + + free(escaped); +} + /* * Write out a minimal config. * All values that has default values are skipped as this is redundant. @@ -1129,6 +1165,12 @@ int conf_write_autoconf(int overwrite) if (ret) return ret; + ret = __conf_write_autoconf("include/generated/rustc_cfg", + print_symbol_for_rustc_cfg, + NULL); + if (ret) + return ret; + /* * Create include/config/auto.conf. This must be the last step because * Kbuild has a dependency on auto.conf and this marks the successful
This patch is not intended for the mainline. I created this patch for Stephen Rothwell to resolve the merge conflicts more easily. The Rust tree is touching scripts/kconfig/confdata.c to generate include/generated/rustc_cfg, which would cause complicated conflicts with changes from the kbuild tree. I re-implemented it to produce the equaivalent rustc_cfg. I also fixed the memory leak; the original code from the Rust tree did not free the malloc'ed pointer. Stephen: When you resolve the conflicts in confdata.c, please take this one. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- scripts/kconfig/confdata.c | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+)