Commit 762fb1dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kbuild changes from Michal Marek:
 - LTO fixes, but the kallsyms part had to be reverted
 - Pass -Werror=implicit-int and -Werror=strict-prototypes to the
   compiler by default
 - snprintf fix in modpost
 - remove GREP_OPTIONS from the environment to be immune against exotic
   grep option settings

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kallsyms: Revert back to 128 max symbol length
  Kbuild: Ignore GREP_OPTIONS env variable
  scripts: kallsyms: Use %zu to print 'size_t'
  scripts/bloat-o-meter: use .startswith rather than fragile slicing
  scripts/bloat-o-meter: ignore changes in the size of linux_banner
  kbuild: replace unbounded sprintf call in modpost
  kbuild, bloat-o-meter: fix static detection
  Kbuild: Handle longer symbols in kallsyms.c
  kbuild: Increase kallsyms max symbol length
  Makefile: enable -Werror=implicit-int and -Werror=strict-prototypes by default
parents f13399f0 480f439c

Makefile

+9 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ LC_COLLATE=C 
LC_NUMERIC=C

export LC_COLLATE LC_NUMERIC



# Avoid interference with shell env settings

unexport GREP_OPTIONS



# We are using a recursive build, so we need to do a little thinking

# to get the ordering right.

#
@@ -659,6 +662,12 @@ KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow) 
# conserve stack if available

KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)



# disallow errors like 'EXPORT_GPL(foo);' with missing header

KBUILD_CFLAGS   += $(call cc-option,-Werror=implicit-int)



# require functions to have arguments in prototypes, not empty 'int foo()'

KBUILD_CFLAGS   += $(call cc-option,-Werror=strict-prototypes)



# use the deterministic mode of AR if available

KBUILD_ARFLAGS := $(call ar-option,D)

scripts/bloat-o-meter

+4 −3
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ def getsizes(file): 
        size, type, name = l[:-1].split()

        if type in "tTdDbBrR":

            # strip generated symbols

            if name[:6] == "__mod_": continue

            # function names begin with '.' on 64-bit powerpc

            if "." in name[1:]: name = "static." + name.split(".")[0]

            if name.startswith("__mod_"): continue

            if name == "linux_banner": continue

            # statics and some other optimizations adds random .NUMBER

            name = re.sub(r'\.[0-9]+', '', name)

            sym[name] = sym.get(name, 0) + int(size, 16)

    return sym

scripts/kallsyms.c

+6 −0
Original line number Diff line number Diff line
@@ -115,6 +115,12 @@ static int read_symbol(FILE *in, struct sym_entry *s) 
			fprintf(stderr, "Read error or end of file.\n");

		return -1;

	}

	if (strlen(str) > KSYM_NAME_LEN) {

		fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n"

                                "Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n",

			str, strlen(str), KSYM_NAME_LEN);

		return -1;

	}



	sym = str;

	/* skip prefix char */

scripts/mod/sumversion.c

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen) 
		basename = strrchr(modname, '/') + 1;

	else

		basename = modname;

	sprintf(filelist, "%s/%.*s.mod", modverdir,

	snprintf(filelist, sizeof(filelist), "%s/%.*s.mod", modverdir,

		(int) strlen(basename) - 2, basename);



	file = grab_file(filelist, &len);

CRA Git | Maintained and supported by SUSTech CRA and CCSE