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>

diff --git a/arch/Kconfig b/arch/Kconfig
index 8e0d665c8d53d3c57c2c434939f93125472ff610..706dec4d295ad74dbc834f2483a87a8a3696f0a8 100644 (file)
--- 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 22df8d037cf20eb7ee0f39d84de38980e220ebef..753b9add56f548bdfc1ec262451745fc491f03ad 100644 (file)
--- 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 016b3c48a4ecaa72dabda569fb2a87a0396a3077..6e6d63957da348f6172ca7a7c5545e0058d8824d 100755 (executable)
--- 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"