iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kconfig: call env_write_dep() right after yyparse()

Browse Source 
This allows preprocess.c to free up all of its resources when the parse
stage is finished. It also ensures conf_write_autoconf_cmd() produces
consistent results even if called multiple times for any reason.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2024-02-03 00:58:05 +09:00
parent 526396b723
commit 56e634b06f
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/kconfig/confdata.c
View File

@ -994,14 +994,10 @@ static int conf_write_autoconf_cmd(const char *autoconf_name)
return -1;
}
fprintf(out, "autoconfig := %s\n", autoconf_name);
fputs(str_get(&autoconf_cmd), out);
fprintf(out, "\n%s: $(deps_config)\n\n", autoconf_name);
env_write_dep(out, autoconf_name);
fprintf(out, "\n$(deps_config): ;\n");
fflush(out);
ret = ferror(out); /* error check for all fprintf() calls */
fclose(out);

2
scripts/kconfig/lkc_proto.h
View File

@ -46,7 +46,7 @@ enum variable_flavor {
VAR_RECURSIVE,
VAR_APPEND,
};
void env_write_dep(FILE *f, const char *auto_conf_name);
void env_write_dep(struct gstr *gs);
void variable_add(const char *name, const char *value,
enum variable_flavor flavor);
void variable_all_del(void);

9
scripts/kconfig/parser.y
View File

@ -482,7 +482,7 @@ void conf_parse(const char *name)
autoconf_cmd = str_new();
str_printf(&autoconf_cmd, "deps_config := \\\n");
str_printf(&autoconf_cmd, "\ndeps_config := \\\n");
zconf_initscan(name);
@ -492,6 +492,13 @@ void conf_parse(const char *name)
yydebug = 1;
yyparse();
str_printf(&autoconf_cmd,
"\n"
"$(autoconfig): $(deps_config)\n"
"$(deps_config): ;\n");
env_write_dep(&autoconf_cmd);
/* Variables are expanded in the parse phase. We can free them here. */
variable_all_del();

11
scripts/kconfig/preprocess.c
View File

@ -87,14 +87,17 @@ static char *env_expand(const char *name)
return xstrdup(value);
}
void env_write_dep(FILE *f, const char *autoconfig_name)
void env_write_dep(struct gstr *s)
{
struct env *e, *tmp;
list_for_each_entry_safe(e, tmp, &env_list, node) {
fprintf(f, "ifneq \"$(%s)\" \"%s\"\n", e->name, e->value);
fprintf(f, "%s: FORCE\n", autoconfig_name);
fprintf(f, "endif\n");
str_printf(s,
"\n"
"ifneq \"$(%s)\" \"%s\"\n"
"$(autoconfig): FORCE\n"
"endif\n",
e->name, e->value);
env_del(e);
}
}