Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 LTO changes from Peter Anvin:
 "More infrastructure work in preparation for link-time optimization
  (LTO).  Most of these changes is to make sure symbols accessed from
  assembly code are properly marked as visible so the linker doesn't
  remove them.

  My understanding is that the changes to support LTO are still not
  upstream in binutils, but are on the way there.  This patchset should
  conclude the x86-specific changes, and remaining patches to actually
  enable LTO will be fed through the Kbuild tree (other than keeping up
  with changes to the x86 code base, of course), although not
  necessarily in this merge window"

* 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (25 commits)
  Kbuild, lto: Handle basic LTO in modpost
  Kbuild, lto: Disable LTO for asm-offsets.c
  Kbuild, lto: Add a gcc-ld script to let run gcc as ld
  Kbuild, lto: add ld-version and ld-ifversion macros
  Kbuild, lto: Drop .number postfixes in modpost
  Kbuild, lto, workaround: Don't warn for initcall_reference in modpost
  lto: Disable LTO for sys_ni
  lto: Handle LTO common symbols in module loader
  lto, workaround: Add workaround for initcall reordering
  lto: Make asmlinkage __visible
  x86, lto: Disable LTO for the x86 VDSO
  initconst, x86: Fix initconst mistake in ts5500 code
  initconst: Fix initconst mistake in dcdbas
  asmlinkage: Make trace_hardirqs_on/off_caller visible
  asmlinkage, x86: Fix 32bit memcpy for LTO
  asmlinkage Make __stack_chk_failed and memcmp visible
  asmlinkage: Mark rwsem functions that can be called from assembler asmlinkage
  asmlinkage: Make main_extable_sort_needed visible
  asmlinkage, mutex: Mark __visible
  asmlinkage: Make trace_hardirq visible
  ...

2 files changed, 24 insertions, 3 deletions

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 99a45fdc1bbf..066355673930 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -623,7 +623,10 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
 
         switch (sym->st_shndx) {
         case SHN_COMMON:
-                warn("\"%s\" [%s] is COMMON symbol\n", symname, mod->name);
+                if (!strncmp(symname, "__gnu_lto_", sizeof("__gnu_lto_")-1)) {
+                        /* Should warn here, but modpost runs before the linker */
+                } else
+                        warn("\"%s\" [%s] is COMMON symbol\n", symname, mod->name);
                 break;
         case SHN_UNDEF:
                 /* undefined symbol */
@@ -849,6 +852,7 @@ static const char *section_white_list[] =
         ".xt.lit",         /* xtensa */
         ".arcextmap*",                  /* arc */
         ".gnu.linkonce.arcext*",        /* arc : modules */
+        ".gnu.lto*",
         NULL
 };
 
@@ -1455,6 +1459,10 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf,
                 to = find_elf_symbol(elf, r->r_addend, sym);
                 tosym = sym_name(elf, to);
 
+                if (!strncmp(fromsym, "reference___initcall",
+                                sizeof("reference___initcall")-1))
+                        return;
+
                 /* check whitelist - we may ignore it */
                 if (secref_whitelist(mismatch,
                                         fromsec, fromsym, tosec, tosym)) {
@@ -1693,6 +1701,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;
@@ -1731,7 +1752,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);
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 51207e4d5f8b..168b43dc0a59 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -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;