6 files changed, 78 insertions, 57 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 0e801c3cdaf8..d5d859c80729 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -211,7 +211,8 @@ $(obj)/%.i: $(src)/%.c FORCE
 
 cmd_gensymtypes =                                                           \
     $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
-    $(GENKSYMS) $(if $(1), -T $(2)) -a $(ARCH)                              \
+    $(GENKSYMS) $(if $(1), -T $(2))                                         \
+     $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))             \
      $(if $(KBUILD_PRESERVE),-p)                                            \
      -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
 
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 3e73dfd838cd..51bb3de680b6 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -119,13 +119,6 @@ _c_flags += $(if $(patsubst n%,, \
                 $(CFLAGS_GCOV))
 endif
 
-ifdef CONFIG_SYMBOL_PREFIX
-_sym_flags = -DSYMBOL_PREFIX=$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))
-_cpp_flags += $(_sym_flags)
-_a_flags += $(_sym_flags)
-endif
-
-
 # If building the kernel in a separate objtree expand all occurrences
 # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').
 
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index cf82c832458f..8dcdca27d836 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -60,7 +60,8 @@ kernelsymfile := $(objtree)/Module.symvers
 modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers
 
 # Step 1), find all modules listed in $(MODVERDIR)/
-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
+MODLISTCMD := find $(MODVERDIR) -name '*.mod' | xargs -r grep -h '\.ko$$' | sort -u
+__modules := $(shell $(MODLISTCMD))
 modules   := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))
 
 # Stop after building .o files if NOFINAL is set. Makes compile tests quicker
@@ -78,12 +79,13 @@ modpost = scripts/mod/modpost                    \
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
  $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
 
+# We can go over command line length here, so be careful.
 quiet_cmd_modpost = MODPOST $(words $(filter-out vmlinux FORCE, $^)) modules
-      cmd_modpost = $(modpost) -s
+      cmd_modpost = $(MODLISTCMD) | sed 's/\.ko$$/.o/' | $(modpost) -s -T -
 
 PHONY += __modpost
 __modpost: $(modules:.ko=.o) FORCE
-        $(call cmd,modpost) $(wildcard vmlinux) $(filter-out FORCE,$^)
+        $(call cmd,modpost) $(wildcard vmlinux)
 
 quiet_cmd_kernel-mod = MODPOST $@
       cmd_kernel-mod = $(modpost) $@
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index d25e4a118d37..88632df4381b 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -45,7 +45,6 @@ int in_source_file;
 
 static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types,
            flag_preserve, flag_warnings;
-static const char *arch = "";
 static const char *mod_prefix = "";
 
 static int errors;
@@ -731,7 +730,7 @@ static void genksyms_usage(void)
 {
         fputs("Usage:\n" "genksyms [-adDTwqhV] > /path/to/.tmp_obj.ver\n" "\n"
 #ifdef __GNU_LIBRARY__
-              "  -a, --arch            Select architecture\n"
+              "  -s, --symbol-prefix   Select symbol prefix\n"
               "  -d, --debug           Increment the debug level (repeatable)\n"
               "  -D, --dump            Dump expanded symbol defs (for debugging only)\n"
               "  -r, --reference file  Read reference symbols from a file\n"
@@ -742,7 +741,7 @@ static void genksyms_usage(void)
               "  -h, --help            Print this message\n"
               "  -V, --version         Print the release version\n"
 #else                           /* __GNU_LIBRARY__ */
-              "  -a                    Select architecture\n"
+              "  -s                    Select symbol prefix\n"
               "  -d                    Increment the debug level (repeatable)\n"
               "  -D                    Dump expanded symbol defs (for debugging only)\n"
               "  -r file               Read reference symbols from a file\n"
@@ -763,7 +762,7 @@ int main(int argc, char **argv)
 
 #ifdef __GNU_LIBRARY__
         struct option long_opts[] = {
-                {"arch", 1, 0, 'a'},
+                {"symbol-prefix", 1, 0, 's'},
                 {"debug", 0, 0, 'd'},
                 {"warnings", 0, 0, 'w'},
                 {"quiet", 0, 0, 'q'},
@@ -776,14 +775,14 @@ int main(int argc, char **argv)
                 {0, 0, 0, 0}
         };
 
-        while ((o = getopt_long(argc, argv, "a:dwqVDr:T:ph",
+        while ((o = getopt_long(argc, argv, "s:dwqVDr:T:ph",
                                 &long_opts[0], NULL)) != EOF)
 #else                           /* __GNU_LIBRARY__ */
-        while ((o = getopt(argc, argv, "a:dwqVDr:T:ph")) != EOF)
+        while ((o = getopt(argc, argv, "s:dwqVDr:T:ph")) != EOF)
 #endif                          /* __GNU_LIBRARY__ */
                 switch (o) {
-                case 'a':
-                        arch = optarg;
+                case 's':
+                        mod_prefix = optarg;
                         break;
                 case 'd':
                         flag_debug++;
@@ -826,9 +825,6 @@ int main(int argc, char **argv)
                         genksyms_usage();
                         return 1;
                 }
-        if ((strcmp(arch, "h8300") == 0) || (strcmp(arch, "blackfin") == 0) ||
-            (strcmp(arch, "metag") == 0))
-                mod_prefix = "_";
         {
                 extern int yydebug;
                 extern int yy_flex_debug;
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 3d569d6022c2..014994936b1c 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -74,9 +74,8 @@ kallsyms()
         info KSYM ${2}
         local kallsymopt;
 
-        if [ -n "${CONFIG_SYMBOL_PREFIX}" ]; then
-                kallsymopt="${kallsymopt} \
-                            --symbol-prefix=${CONFIG_SYMBOL_PREFIX}"
+        if [ -n "${CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX}" ]; then
+                kallsymopt="${kallsymopt} --symbol-prefix=_"
         fi
 
         if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 78b30c1548e9..a4be8e112bb6 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -15,17 +15,12 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include <limits.h>
+#include <stdbool.h>
 #include "modpost.h"
 #include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
-
-/* Some toolchains use a `_' prefix for all user symbols. */
-#ifdef CONFIG_SYMBOL_PREFIX
-#define MODULE_SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
-#else
-#define MODULE_SYMBOL_PREFIX ""
-#endif
-
+#include "../../include/linux/export.h"
 
 /* Are we using CONFIG_MODVERSIONS? */
 int modversions = 0;
@@ -85,6 +80,14 @@ PRINTF void merror(const char *fmt, ...)
         va_end(arglist);
 }
 
+static inline bool strends(const char *str, const char *postfix)
+{
+        if (strlen(str) < strlen(postfix))
+                return false;
+
+        return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;
+}
+
 static int is_vmlinux(const char *modname)
 {
         const char *myname;
@@ -120,22 +123,20 @@ static struct module *find_module(char *modname)
         return mod;
 }
 
-static struct module *new_module(char *modname)
+static struct module *new_module(const char *modname)
 {
         struct module *mod;
-        char *p, *s;
+        char *p;
 
         mod = NOFAIL(malloc(sizeof(*mod)));
         memset(mod, 0, sizeof(*mod));
         p = NOFAIL(strdup(modname));
 
         /* strip trailing .o */
-        s = strrchr(p, '.');
-        if (s != NULL)
-                if (strcmp(s, ".o") == 0) {
-                        *s = '\0';
-                        mod->is_dot_o = 1;
-                }
+        if (strends(p, ".o")) {
+                p[strlen(p) - 2] = '\0';
+                mod->is_dot_o = 1;
+        }
 
         /* add to list */
         mod->name = p;
@@ -562,7 +563,7 @@ static void parse_elf_finish(struct elf_info *info)
 static int ignore_undef_symbol(struct elf_info *info, const char *symname)
 {
         /* ignore __this_module, it will be resolved shortly */
-        if (strcmp(symname, MODULE_SYMBOL_PREFIX "__this_module") == 0)
+        if (strcmp(symname, VMLINUX_SYMBOL_STR(__this_module)) == 0)
                 return 1;
         /* ignore global offset table */
         if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0)
@@ -583,8 +584,8 @@ static int ignore_undef_symbol(struct elf_info *info, const char *symname)
         return 0;
 }
 
-#define CRC_PFX     MODULE_SYMBOL_PREFIX "__crc_"
-#define KSYMTAB_PFX MODULE_SYMBOL_PREFIX "__ksymtab_"
+#define CRC_PFX     VMLINUX_SYMBOL_STR(__crc_)
+#define KSYMTAB_PFX VMLINUX_SYMBOL_STR(__ksymtab_)
 
 static void handle_modversions(struct module *mod, struct elf_info *info,
                                Elf_Sym *sym, const char *symname)
@@ -637,14 +638,15 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                 }
 #endif
 
-                if (memcmp(symname, MODULE_SYMBOL_PREFIX,
-                           strlen(MODULE_SYMBOL_PREFIX)) == 0) {
-                        mod->unres =
-                          alloc_symbol(symname +
-                                       strlen(MODULE_SYMBOL_PREFIX),
-                                       ELF_ST_BIND(sym->st_info) == STB_WEAK,
-                                       mod->unres);
-                }
+#ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX
+                if (symname[0] != '_')
+                        break;
+                else
+                        symname++;
+#endif
+                mod->unres = alloc_symbol(symname,
+                                          ELF_ST_BIND(sym->st_info) == STB_WEAK,
+                                          mod->unres);
                 break;
         default:
                 /* All exported symbols */
@@ -652,9 +654,9 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                         sym_add_exported(symname + strlen(KSYMTAB_PFX), mod,
                                         export);
                 }
-                if (strcmp(symname, MODULE_SYMBOL_PREFIX "init_module") == 0)
+                if (strcmp(symname, VMLINUX_SYMBOL_STR(init_module)) == 0)
                         mod->has_init = 1;
-                if (strcmp(symname, MODULE_SYMBOL_PREFIX "cleanup_module") == 0)
+                if (strcmp(symname, VMLINUX_SYMBOL_STR(cleanup_module)) == 0)
                         mod->has_cleanup = 1;
                 break;
         }
@@ -1762,6 +1764,27 @@ static void read_symbols(char *modname)
                 mod->unres = alloc_symbol("module_layout", 0, mod->unres);
 }
 
+static void read_symbols_from_files(const char *filename)
+{
+        FILE *in = stdin;
+        char fname[PATH_MAX];
+
+        if (strcmp(filename, "-") != 0) {
+                in = fopen(filename, "r");
+                if (!in)
+                        fatal("Can't open filenames file %s: %m", filename);
+        }
+
+        while (fgets(fname, PATH_MAX, in) != NULL) {
+                if (strends(fname, "\n"))
+                        fname[strlen(fname)-1] = '\0';
+                read_symbols(fname);
+        }
+
+        if (in != stdin)
+                fclose(in);
+}
+
 #define SZ 500
 
 /* We first write the generated file into memory using the
@@ -1934,7 +1957,8 @@ static int add_versions(struct buffer *b, struct module *mod)
                                 s->name, mod->name);
                         continue;
                 }
-                buf_printf(b, "\t{ %#8x, \"%s\" },\n", s->crc, s->name);
+                buf_printf(b, "\t{ %#8x, __VMLINUX_SYMBOL_STR(%s) },\n",
+                           s->crc, s->name);
         }
 
         buf_printf(b, "};\n");
@@ -2122,13 +2146,13 @@ int main(int argc, char **argv)
         struct module *mod;
         struct buffer buf = { };
         char *kernel_read = NULL, *module_read = NULL;
-        char *dump_write = NULL;
+        char *dump_write = NULL, *files_source = NULL;
         int opt;
         int err;
         struct ext_sym_list *extsym_iter;
         struct ext_sym_list *extsym_start = NULL;
 
-        while ((opt = getopt(argc, argv, "i:I:e:msSo:awM:K:")) != -1) {
+        while ((opt = getopt(argc, argv, "i:I:e:msST:o:awM:K:")) != -1) {
                 switch (opt) {
                 case 'i':
                         kernel_read = optarg;
@@ -2160,6 +2184,9 @@ int main(int argc, char **argv)
                 case 'S':
                         sec_mismatch_verbose = 0;
                         break;
+                case 'T':
+                        files_source = optarg;
+                        break;
                 case 'w':
                         warn_unresolved = 1;
                         break;
@@ -2182,6 +2209,9 @@ int main(int argc, char **argv)
         while (optind < argc)
                 read_symbols(argv[optind++]);
 
+        if (files_source)
+                read_symbols_from_files(files_source);
+
         for (mod = modules; mod; mod = mod->next) {
                 if (mod->skip)
                         continue;