diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-05-09 16:23:50 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-05-17 22:44:57 +0900 |
| commit | 704db5433fb43acbf1486303721bd0cbb65af251 (patch) | |
| tree | 93558386f64fbc4d695982d8dd4127622c7b1150 | |
| parent | 94e58e0ac31284fa26597c0e00a9b1d87a691d02 (diff) | |
| download | linux-stable-704db5433fb43acbf1486303721bd0cbb65af251.tar.gz linux-stable-704db5433fb43acbf1486303721bd0cbb65af251.tar.bz2 linux-stable-704db5433fb43acbf1486303721bd0cbb65af251.zip | |
kbuild: remove CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX
CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX was selected by BLACKFIN, METAG.
They were removed by commit 4ba66a976072 ("arch: remove blackfin port"),
commit bb6fb6dfcc17 ("metag: Remove arch/metag/"), respectively.
No more architecture enables CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX.
Clean up the rest of scripts, and remove the Kconfig entry.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
| -rw-r--r-- | arch/Kconfig | 6 | ||||
| -rw-r--r-- | scripts/Makefile.build | 7 | ||||
| -rwxr-xr-x | scripts/adjust_autoksyms.sh | 3 |
3 files changed, 1 insertions, 15 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 8e0d665c8d53..706dec4d295a 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -686,12 +686,6 @@ config MODULES_USE_ELF_REL Modules only use ELF REL relocations. Modules with ELF RELA relocations will give an error. -config HAVE_UNDERSCORE_SYMBOL_PREFIX - bool - help - Some architectures generate an _ in front of C symbols; things like - module loading and assembly files need to know about this. - config HAVE_IRQ_EXIT_ON_IRQ_STACK bool help diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 22df8d037cf2..753b9add56f5 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -485,15 +485,10 @@ targets += $(lib-target) dummy-object = $(obj)/.lib_exports.o ksyms-lds = $(dot-target).lds -ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX -ref_prefix = EXTERN(_ -else -ref_prefix = EXTERN( -endif quiet_cmd_export_list = EXPORTS $@ cmd_export_list = $(OBJDUMP) -h $< | \ - sed -ne '/___ksymtab/s/.*+\([^ ]*\).*/$(ref_prefix)\1)/p' >$(ksyms-lds);\ + sed -ne '/___ksymtab/s/.*+\([^ ]*\).*/EXTERN(\1)/p' >$(ksyms-lds);\ rm -f $(dummy-object);\ echo | $(CC) $(a_flags) -c -o $(dummy-object) -x assembler -;\ $(LD) $(ld_flags) -r -o $@ -T $(ksyms-lds) $(dummy-object);\ diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh index 016b3c48a4ec..6e6d63957da3 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh @@ -61,9 +61,6 @@ for mod in "$MODVERDIR"/*.mod; do sed -n -e '3{s/ /\n/g;/^$/!p;}' "$mod" done | sort -u | while read sym; do - if [ -n "$CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX" ]; then - sym="${sym#_}" - fi echo "#define __KSYM_${sym} 1" done >> "$new_ksyms_file" |