Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d02b490 authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

Kbuild, lto: Drop .number postfixes in modpost 



LTO turns all global symbols effectively into statics. This
has the side effect that they all have a .NUMBER postfix to make
them unique. In modpost drop this postfix because it confuses
it.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1391846481-31491-8-git-send-email-ak@linux.intel.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 77ab21ad

scripts/mod/modpost.c

+14 −1
Original line number Diff line number Diff line
@@ -1684,6 +1684,19 @@ static void check_sec_ref(struct module *mod, const char *modname, 
	}

}



static char *remove_dot(char *s)

{

	char *end;

	int n = strcspn(s, ".");



	if (n > 0 && s[n] != 0) {

		strtoul(s + n + 1, &end, 10);

		if  (end > s + n + 1 && (*end == '.' || *end == 0))

			s[n] = 0;

	}

	return s;

}



static void read_symbols(char *modname)

{

	const char *symname;
@@ -1722,7 +1735,7 @@ static void read_symbols(char *modname) 
	}



	for (sym = info.symtab_start; sym < info.symtab_stop; sym++) {

		symname = info.strtab + sym->st_name;

		symname = remove_dot(info.strtab + sym->st_name);



		handle_modversions(mod, &info, sym, symname);

		handle_moddevtable(mod, &info, sym, symname);

scripts/mod/modpost.h

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ struct elf_info { 
	Elf_Section  export_gpl_sec;

	Elf_Section  export_unused_gpl_sec;

	Elf_Section  export_gpl_future_sec;

	const char   *strtab;

	char         *strtab;

	char	     *modinfo;

	unsigned int modinfo_len;