- Fix the truncated path issue for HAVE_GCC_PLUGINS test in Kconfig
- Move -Wunsligned-access to W=1 builds to avoid sprinkling warnings for the latest Clang - Fix missing fclose() in Kconfig - Fix Kconfig to touch dep headers correctly when KCONFIG_AUTOCONFIG is overridden. -----BEGIN PGP SIGNATURE----- iQJJBAABCgAzFiEEbmPs18K1szRHjPqEPYsBB53g2wYFAmIJNo4VHG1hc2FoaXJv eUBrZXJuZWwub3JnAAoJED2LAQed4NsGfkcQAJy0r6+XHQj/s/avH/KiicyFuPhl VHDFqVjVsfhgrtw3+gbgP7J9piNPwf2H9vcbjD+HOqEGWPLMZh+pi5PxEhVSZ1AD IgYM38xaLdGD5FPVFgFW7IpUOJ06c1CeYZkXWUEQm2vSbY9A9aJWFdAgNqlJfyS2 ApiVQybTaBMZoF/MPhpMeeW9IlBYzupfw4cNTkMx7wwi582DZharypxxyyKwsgW2 2T7e8luSTBWK4Qee6PDs1M3CtTSEITARGjQCrY38IU72pGsY45/if0BkK9XIBqCM j1JA9339ceKYK9qG0vGLmTbP4q2vfWXoW//UFZYxAr5LvPUgA5ILKjXUT7nfMwYw sWFbD0cMOnakC+FBnKdd+uYSr7aZul93+QkLXgLtHh7eJvFWbtd+e6oNaayTs0b1 e28Sme0zG6h1L/YeGTEFI0uBiB17FmSG7iU5JK0ech948AnF7IAtvO/xRZ4hNC/l 0eDACv+sMyVRjQdniKytXWpKq3KLB1KjSnxJZ85yQqAXhNwm5xafWUdIOAyvHz5Z xiaEdD5Ac1q1AEORqUh19x4mAzxnvijF3iZnsZr7+ipE1RWdTXVVmWhyOeh1kx0f 4kJfI1IYbHyZUYcN6KT5Lusi6GZA3nbQTfFkjo9J328xivPrBTBYJQrk9R13MqI2 a6dpCAmbVtfPXGU7 =AOMt -----END PGP SIGNATURE----- Merge tag 'kbuild-fixes-v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild Pull Kbuild fixes from Masahiro Yamada: - Fix the truncated path issue for HAVE_GCC_PLUGINS test in Kconfig - Move -Wunsligned-access to W=1 builds to avoid sprinkling warnings for the latest Clang - Fix missing fclose() in Kconfig - Fix Kconfig to touch dep headers correctly when KCONFIG_AUTOCONFIG is overridden. * tag 'kbuild-fixes-v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kconfig: fix failing to generate auto.conf kconfig: fix missing fclose() on error paths Makefile.extrawarn: Move -Wunaligned-access to W=1 kconfig: let 'shell' return enough output for deep path names
This commit is contained in:
commit
e89d3a4671
@ -51,6 +51,7 @@ KBUILD_CFLAGS += -Wno-sign-compare
|
|||||||
KBUILD_CFLAGS += -Wno-format-zero-length
|
KBUILD_CFLAGS += -Wno-format-zero-length
|
||||||
KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast)
|
KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast)
|
||||||
KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare
|
KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare
|
||||||
|
KBUILD_CFLAGS += $(call cc-disable-warning, unaligned-access)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -979,10 +979,10 @@ static int conf_write_autoconf_cmd(const char *autoconf_name)
|
|||||||
|
|
||||||
fprintf(out, "\n$(deps_config): ;\n");
|
fprintf(out, "\n$(deps_config): ;\n");
|
||||||
|
|
||||||
if (ferror(out)) /* error check for all fprintf() calls */
|
ret = ferror(out); /* error check for all fprintf() calls */
|
||||||
return -1;
|
|
||||||
|
|
||||||
fclose(out);
|
fclose(out);
|
||||||
|
if (ret)
|
||||||
|
return -1;
|
||||||
|
|
||||||
if (rename(tmp, name)) {
|
if (rename(tmp, name)) {
|
||||||
perror("rename");
|
perror("rename");
|
||||||
@ -994,14 +994,19 @@ static int conf_write_autoconf_cmd(const char *autoconf_name)
|
|||||||
|
|
||||||
static int conf_touch_deps(void)
|
static int conf_touch_deps(void)
|
||||||
{
|
{
|
||||||
const char *name;
|
const char *name, *tmp;
|
||||||
struct symbol *sym;
|
struct symbol *sym;
|
||||||
int res, i;
|
int res, i;
|
||||||
|
|
||||||
strcpy(depfile_path, "include/config/");
|
|
||||||
depfile_prefix_len = strlen(depfile_path);
|
|
||||||
|
|
||||||
name = conf_get_autoconfig_name();
|
name = conf_get_autoconfig_name();
|
||||||
|
tmp = strrchr(name, '/');
|
||||||
|
depfile_prefix_len = tmp ? tmp - name + 1 : 0;
|
||||||
|
if (depfile_prefix_len + 1 > sizeof(depfile_path))
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
strncpy(depfile_path, name, depfile_prefix_len);
|
||||||
|
depfile_path[depfile_prefix_len] = 0;
|
||||||
|
|
||||||
conf_read_simple(name, S_DEF_AUTO);
|
conf_read_simple(name, S_DEF_AUTO);
|
||||||
sym_calc_value(modules_sym);
|
sym_calc_value(modules_sym);
|
||||||
|
|
||||||
@ -1093,10 +1098,10 @@ static int __conf_write_autoconf(const char *filename,
|
|||||||
print_symbol(file, sym);
|
print_symbol(file, sym);
|
||||||
|
|
||||||
/* check possible errors in conf_write_heading() and print_symbol() */
|
/* check possible errors in conf_write_heading() and print_symbol() */
|
||||||
if (ferror(file))
|
ret = ferror(file);
|
||||||
return -1;
|
|
||||||
|
|
||||||
fclose(file);
|
fclose(file);
|
||||||
|
if (ret)
|
||||||
|
return -1;
|
||||||
|
|
||||||
if (rename(tmp, filename)) {
|
if (rename(tmp, filename)) {
|
||||||
perror("rename");
|
perror("rename");
|
||||||
|
@ -141,7 +141,7 @@ static char *do_lineno(int argc, char *argv[])
|
|||||||
static char *do_shell(int argc, char *argv[])
|
static char *do_shell(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
FILE *p;
|
FILE *p;
|
||||||
char buf[256];
|
char buf[4096];
|
||||||
char *cmd;
|
char *cmd;
|
||||||
size_t nread;
|
size_t nread;
|
||||||
int i;
|
int i;
|
||||||
|
Loading…
Reference in New Issue
Block a user