Commit 3266b5bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v4.16-2' of... 

Merge tag 'kbuild-fixes-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - make fixdep parse kconfig.h to fix missing rebuild

 - replace hyphens with underscores in builtin DTB label names

 - fix typos

* tag 'kbuild-fixes-v4.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: Handle builtin dtb file names containing hyphens
  scripts/bloat-o-meter: fix typos in help
  fixdep: do not ignore kconfig.h
  fixdep: remove some false CONFIG_ matches
  fixdep: remove stale references to uml-config.h
parents 23b33acc 55fe6da9

scripts/Makefile.lib

+4 −4
Original line number Diff line number Diff line
@@ -297,11 +297,11 @@ cmd_dt_S_dtb= \ 
	echo '\#include <asm-generic/vmlinux.lds.h>'; 	\

	echo '.section .dtb.init.rodata,"a"';		\

	echo '.balign STRUCT_ALIGNMENT';		\

	echo '.global __dtb_$(*F)_begin';		\

	echo '__dtb_$(*F)_begin:';			\

	echo '.global __dtb_$(subst -,_,$(*F))_begin';	\

	echo '__dtb_$(subst -,_,$(*F))_begin:';		\

	echo '.incbin "$<" ';				\

	echo '__dtb_$(*F)_end:';			\

	echo '.global __dtb_$(*F)_end';			\

	echo '__dtb_$(subst -,_,$(*F))_end:';		\

	echo '.global __dtb_$(subst -,_,$(*F))_end';	\

	echo '.balign STRUCT_ALIGNMENT'; 		\

) > $@

scripts/basic/fixdep.c

+5 −10
Original line number Diff line number Diff line
@@ -93,14 +93,6 @@ 
 * (Note: it'd be easy to port over the complete mkdep state machine,

 *  but I don't think the added complexity is worth it)

 */

/*

 * Note 2: if somebody writes HELLO_CONFIG_BOOM in a file, it will depend onto

 * CONFIG_BOOM. This could seem a bug (not too hard to fix), but please do not

 * fix it! Some UserModeLinux files (look at arch/um/) call CONFIG_BOOM as

 * UML_CONFIG_BOOM, to avoid conflicts with /usr/include/linux/autoconf.h,

 * through arch/um/include/uml-config.h; this fixdep "bug" makes sure that

 * those files will have correct dependencies.

 */



#include <sys/types.h>

#include <sys/stat.h>
@@ -233,8 +225,13 @@ static int str_ends_with(const char *s, int slen, const char *sub) 
static void parse_config_file(const char *p)

{

	const char *q, *r;

	const char *start = p;



	while ((p = strstr(p, "CONFIG_"))) {

		if (p > start && (isalnum(p[-1]) || p[-1] == '_')) {

			p += 7;

			continue;

		}

		p += 7;

		q = p;

		while (*q && (isalnum(*q) || *q == '_'))
@@ -286,8 +283,6 @@ static int is_ignored_file(const char *s, int len) 
{

	return str_ends_with(s, len, "include/generated/autoconf.h") ||

	       str_ends_with(s, len, "include/generated/autoksyms.h") ||

	       str_ends_with(s, len, "arch/um/include/uml-config.h") ||

	       str_ends_with(s, len, "include/linux/kconfig.h") ||

	       str_ends_with(s, len, ".ver");

}

scripts/bloat-o-meter

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ signal(SIGPIPE, SIG_DFL) 
if len(sys.argv) < 3:

    sys.stderr.write("usage: %s [option] file1 file2\n" % sys.argv[0])

    sys.stderr.write("The options are:\n")

    sys.stderr.write("-c	cateogrize output based on symbole type\n")

    sys.stderr.write("-c	categorize output based on symbol type\n")

    sys.stderr.write("-d	Show delta of Data Section\n")

    sys.stderr.write("-t	Show delta of text Section\n")

    sys.exit(-1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE