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

Commit 74d93171 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

genksyms: remove symbol prefix support 



CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG.
They were removed by commit 4ba66a97 ("arch: remove blackfin port"),
commit bb6fb6df ("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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent b2c5cdcf

scripts/Makefile.build

+0 −2
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ $(obj)/%.i: $(src)/%.c FORCE 
cmd_gensymtypes_c =                                                         \

    $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \

    $(GENKSYMS) $(if $(1), -T $(2))                                         \

     $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))             \

     $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS))                             \

     $(if $(KBUILD_PRESERVE),-p)                                            \

     -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);/' ) | \

    $(CPP) -D__GENKSYMS__ $(c_flags) -xc - |                                \

    $(GENKSYMS) $(if $(1), -T $(2))                                         \

     $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))             \

     $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS))                             \

     $(if $(KBUILD_PRESERVE),-p)                                            \

     -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))

scripts/genksyms/genksyms.c

+3 −8
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ int in_source_file; 


static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types,

	   flag_preserve, flag_warnings, flag_rel_crcs;

static const char *mod_prefix = "";



static int errors;

static int nsyms;
@@ -693,10 +692,10 @@ void export_symbol(const char *name) 
			fputs(">\n", debugfile);



		/* 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) { "

		       "%s__crc_%s = .; LONG(0x%08lx); } }\n",

		       mod_prefix, name, crc);

		       "__crc_%s = .; LONG(0x%08lx); } }\n",

		       name, crc);

	}

}
@@ -769,7 +768,6 @@ int main(int argc, char **argv) 


#ifdef __GNU_LIBRARY__

	struct option long_opts[] = {

		{"symbol-prefix", 1, 0, 's'},

		{"debug", 0, 0, 'd'},

		{"warnings", 0, 0, 'w'},

		{"quiet", 0, 0, 'q'},
@@ -789,9 +787,6 @@ int main(int argc, char **argv) 
	while ((o = getopt(argc, argv, "s:dwqVDr:T:phR")) != EOF)

#endif				/* __GNU_LIBRARY__ */

		switch (o) {

		case 's':

			mod_prefix = optarg;

			break;

		case 'd':

			flag_debug++;

			break;