Commit e89d3a46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v5.17-2' of... 

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
parents c5d714aa 1b9e740a

scripts/Makefile.extrawarn

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ KBUILD_CFLAGS += -Wno-sign-compare 
KBUILD_CFLAGS += -Wno-format-zero-length

KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast)

KBUILD_CFLAGS += -Wno-tautological-constant-out-of-range-compare

KBUILD_CFLAGS += $(call cc-disable-warning, unaligned-access)

endif



endif

scripts/kconfig/confdata.c

+15 −10
Original line number Diff line number Diff line
@@ -979,10 +979,10 @@ static int conf_write_autoconf_cmd(const char *autoconf_name) 


	fprintf(out, "\n$(deps_config): ;\n");



	if (ferror(out)) /* error check for all fprintf() calls */

		return -1;



	ret = ferror(out); /* error check for all fprintf() calls */

	fclose(out);

	if (ret)

		return -1;



	if (rename(tmp, name)) {

		perror("rename");
@@ -994,14 +994,19 @@ static int conf_write_autoconf_cmd(const char *autoconf_name) 


static int conf_touch_deps(void)

{

	const char *name;

	const char *name, *tmp;

	struct symbol *sym;

	int res, i;



	strcpy(depfile_path, "include/config/");

	depfile_prefix_len = strlen(depfile_path);



	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);

	sym_calc_value(modules_sym);
@@ -1093,10 +1098,10 @@ static int __conf_write_autoconf(const char *filename, 
			print_symbol(file, sym);



	/* check possible errors in conf_write_heading() and print_symbol() */

	if (ferror(file))

		return -1;



	ret = ferror(file);

	fclose(file);

	if (ret)

		return -1;



	if (rename(tmp, filename)) {

		perror("rename");

scripts/kconfig/preprocess.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static char *do_lineno(int argc, char *argv[]) 
static char *do_shell(int argc, char *argv[])

{

	FILE *p;

	char buf[256];

	char buf[4096];

	char *cmd;

	size_t nread;

	int i;