aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-05-09 03:23:50 -0400
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-05-17 09:44:57 -0400
commit704db5433fb43acbf1486303721bd0cbb65af251 (patch)
tree93558386f64fbc4d695982d8dd4127622c7b1150
parent94e58e0ac31284fa26597c0e00a9b1d87a691d02 (diff)
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/Kconfig6
-rw-r--r--scripts/Makefile.build7
-rwxr-xr-xscripts/adjust_autoksyms.sh3
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
686 Modules only use ELF REL relocations. Modules with ELF RELA 686 Modules only use ELF REL relocations. Modules with ELF RELA
687 relocations will give an error. 687 relocations will give an error.
688 688
689config HAVE_UNDERSCORE_SYMBOL_PREFIX
690 bool
691 help
692 Some architectures generate an _ in front of C symbols; things like
693 module loading and assembly files need to know about this.
694
695config HAVE_IRQ_EXIT_ON_IRQ_STACK 689config HAVE_IRQ_EXIT_ON_IRQ_STACK
696 bool 690 bool
697 help 691 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)
485 485
486dummy-object = $(obj)/.lib_exports.o 486dummy-object = $(obj)/.lib_exports.o
487ksyms-lds = $(dot-target).lds 487ksyms-lds = $(dot-target).lds
488ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX
489ref_prefix = EXTERN(_
490else
491ref_prefix = EXTERN(
492endif
493 488
494quiet_cmd_export_list = EXPORTS $@ 489quiet_cmd_export_list = EXPORTS $@
495cmd_export_list = $(OBJDUMP) -h $< | \ 490cmd_export_list = $(OBJDUMP) -h $< | \
496 sed -ne '/___ksymtab/s/.*+\([^ ]*\).*/$(ref_prefix)\1)/p' >$(ksyms-lds);\ 491 sed -ne '/___ksymtab/s/.*+\([^ ]*\).*/EXTERN(\1)/p' >$(ksyms-lds);\
497 rm -f $(dummy-object);\ 492 rm -f $(dummy-object);\
498 echo | $(CC) $(a_flags) -c -o $(dummy-object) -x assembler -;\ 493 echo | $(CC) $(a_flags) -c -o $(dummy-object) -x assembler -;\
499 $(LD) $(ld_flags) -r -o $@ -T $(ksyms-lds) $(dummy-object);\ 494 $(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
61 sed -n -e '3{s/ /\n/g;/^$/!p;}' "$mod" 61 sed -n -e '3{s/ /\n/g;/^$/!p;}' "$mod"
62done | sort -u | 62done | sort -u |
63while read sym; do 63while read sym; do
64 if [ -n "$CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX" ]; then
65 sym="${sym#_}"
66 fi
67 echo "#define __KSYM_${sym} 1" 64 echo "#define __KSYM_${sym} 1"
68done >> "$new_ksyms_file" 65done >> "$new_ksyms_file"
69 66