genksyms: remove symbol prefix support
CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG. They were removed by commit4ba66a9760
("arch: remove blackfin port"), commitbb6fb6dfcc
("metag: Remove arch/metag/"), respectively. No more architecture enables CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX, hence the -s (--symbol-prefix) option is unnecessary. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
parent
b2c5cdcfd4
commit
74d9317161
|
@ -147,7 +147,6 @@ $(obj)/%.i: $(src)/%.c FORCE
|
||||||
cmd_gensymtypes_c = \
|
cmd_gensymtypes_c = \
|
||||||
$(CPP) -D__GENKSYMS__ $(c_flags) $< | \
|
$(CPP) -D__GENKSYMS__ $(c_flags) $< | \
|
||||||
$(GENKSYMS) $(if $(1), -T $(2)) \
|
$(GENKSYMS) $(if $(1), -T $(2)) \
|
||||||
$(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX)) \
|
|
||||||
$(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS)) \
|
$(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS)) \
|
||||||
$(if $(KBUILD_PRESERVE),-p) \
|
$(if $(KBUILD_PRESERVE),-p) \
|
||||||
-r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
|
-r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
|
||||||
|
@ -355,7 +354,6 @@ cmd_gensymtypes_S = \
|
||||||
sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ) | \
|
sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ) | \
|
||||||
$(CPP) -D__GENKSYMS__ $(c_flags) -xc - | \
|
$(CPP) -D__GENKSYMS__ $(c_flags) -xc - | \
|
||||||
$(GENKSYMS) $(if $(1), -T $(2)) \
|
$(GENKSYMS) $(if $(1), -T $(2)) \
|
||||||
$(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX)) \
|
|
||||||
$(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS)) \
|
$(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS)) \
|
||||||
$(if $(KBUILD_PRESERVE),-p) \
|
$(if $(KBUILD_PRESERVE),-p) \
|
||||||
-r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
|
-r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
|
||||||
|
|
|
@ -45,7 +45,6 @@ int in_source_file;
|
||||||
|
|
||||||
static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types,
|
static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types,
|
||||||
flag_preserve, flag_warnings, flag_rel_crcs;
|
flag_preserve, flag_warnings, flag_rel_crcs;
|
||||||
static const char *mod_prefix = "";
|
|
||||||
|
|
||||||
static int errors;
|
static int errors;
|
||||||
static int nsyms;
|
static int nsyms;
|
||||||
|
@ -693,10 +692,10 @@ void export_symbol(const char *name)
|
||||||
fputs(">\n", debugfile);
|
fputs(">\n", debugfile);
|
||||||
|
|
||||||
/* Used as a linker script. */
|
/* Used as a linker script. */
|
||||||
printf(!flag_rel_crcs ? "%s__crc_%s = 0x%08lx;\n" :
|
printf(!flag_rel_crcs ? "__crc_%s = 0x%08lx;\n" :
|
||||||
"SECTIONS { .rodata : ALIGN(4) { "
|
"SECTIONS { .rodata : ALIGN(4) { "
|
||||||
"%s__crc_%s = .; LONG(0x%08lx); } }\n",
|
"__crc_%s = .; LONG(0x%08lx); } }\n",
|
||||||
mod_prefix, name, crc);
|
name, crc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -769,7 +768,6 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
#ifdef __GNU_LIBRARY__
|
#ifdef __GNU_LIBRARY__
|
||||||
struct option long_opts[] = {
|
struct option long_opts[] = {
|
||||||
{"symbol-prefix", 1, 0, 's'},
|
|
||||||
{"debug", 0, 0, 'd'},
|
{"debug", 0, 0, 'd'},
|
||||||
{"warnings", 0, 0, 'w'},
|
{"warnings", 0, 0, 'w'},
|
||||||
{"quiet", 0, 0, 'q'},
|
{"quiet", 0, 0, 'q'},
|
||||||
|
@ -789,9 +787,6 @@ int main(int argc, char **argv)
|
||||||
while ((o = getopt(argc, argv, "s:dwqVDr:T:phR")) != EOF)
|
while ((o = getopt(argc, argv, "s:dwqVDr:T:phR")) != EOF)
|
||||||
#endif /* __GNU_LIBRARY__ */
|
#endif /* __GNU_LIBRARY__ */
|
||||||
switch (o) {
|
switch (o) {
|
||||||
case 's':
|
|
||||||
mod_prefix = optarg;
|
|
||||||
break;
|
|
||||||
case 'd':
|
case 'd':
|
||||||
flag_debug++;
|
flag_debug++;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue