From patchwork Wed May 9 07:23:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 135207 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5309578lji; Wed, 9 May 2018 00:25:50 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqC5aASBv4sZNWhGWjAIiw/+szbB3ejyG1Fln46wZagSWS2eYI4Se6XDCsuQbCJ++jFriQk X-Received: by 2002:a17:902:4c88:: with SMTP id b8-v6mr33318349ple.285.1525850750334; Wed, 09 May 2018 00:25:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525850750; cv=none; d=google.com; s=arc-20160816; b=Q4IDVonzhLNvmFwVAHkYt+J6XtxDGZdey2avAVcM7FFds6wUrRHNNoQfUEfFDkTrDP JMvhLqZJBTd25+XB+leKRc2yqXkR+v/bMAfBwM7SvAZyTIGEX1r0bjtW5NJyYPMmw3WD ZPbRcOcJK2eoHlD2l/9oIiQJQJZ1d9zRWJoB3U6EdXox1ShDIlu2mP1jgRfLhHaXnPvs jRCYEG7mowcJk0yjq4a2dfwvSyqVa+CAny2KSzOJ//miNgGislkBWHyWENqb/UeiuB4K 5ok5jqdS+QzTUAyugmIesVSRU2S2/HPgXyFAxGZqgjVSXcVB58wQgC7O0ISfXns6ob0a OcSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=7DkgxglIpp/KA1uyzrCf8o8QxNMOg5dsU3AB4XzhcyI=; b=Ek8WoN5hb9TbAFgd4fxRiWSoCz798UjrQCQDobM1/LSCmhEKfLprarwhwrK1tlefng B/JqBsxdUZ4JXg+8FUSdQh4ftN4/v8JQkYB3wJgGUW/4PM7TqLAXVaTr5D+DRTtv4GCa kbAqUBlhCH1JtdJMjme8ro9VcvIjUVisV6RBJtaL6i/8ekyhrGn/jNxs4OrMbi+7RrIm SNUftyB+lLDkPoizIwuDrcnRj5K8JSMlJL9ZgqleUnLavmAowMzMjMnkD14UFdX0+TkS AGQI7VU35B9tJEf7eWnusrFSGFPLCbgMOTdxFxpFu1oKoH8PV4lqbFv+SLq8GIgULMC3 gkxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=PelyxVt3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h7-v6si13005995pgc.14.2018.05.09.00.25.50; Wed, 09 May 2018 00:25:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=PelyxVt3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756321AbeEIHZr (ORCPT + 29 others); Wed, 9 May 2018 03:25:47 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:50858 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756217AbeEIHYy (ORCPT ); Wed, 9 May 2018 03:24:54 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w497O36I028852; Wed, 9 May 2018 16:24:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w497O36I028852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1525850648; bh=7DkgxglIpp/KA1uyzrCf8o8QxNMOg5dsU3AB4XzhcyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PelyxVt3zU0yfFWZGyUBarPPxxoVkqR+u3CQUGJknAXo8t+w059k6UYpQOdY0N8Ud 2MMOltcAX3ZcgHQB+yNG/uyOakMmF49v+sMWAZyQ1eTuZTvNuvEOHOzzOJxK9k26oS YXLK2CQEmX/Po5OXsJTEdwI5/3355ro7q5EEck4raNFGLCW2vmZ77UFSQgG/3zDdfE 4SBQKtMPpzV5nfSUWVfTrHb79MJV1flDoM5vBHSI4RxD91lZThJ74E3fEMKZPpBvs3 qXCZlL5s8TkDJd+7Z/cXPiwOsdEA/h6dywRZKIGpBms4NvfkjxZXrCEVjdoNjzVt/p 1xxNbNcix797g== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Arnd Bergmann , Joe Perches , Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 6/8] kbuild: remove CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX Date: Wed, 9 May 2018 16:23:50 +0900 Message-Id: <1525850632-10921-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> References: <1525850632-10921-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/Kconfig | 6 ------ scripts/Makefile.build | 7 +------ scripts/adjust_autoksyms.sh | 3 --- 3 files changed, 1 insertion(+), 15 deletions(-) -- 2.7.4 diff --git a/arch/Kconfig b/arch/Kconfig index 3234b73..c88fa0e 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -671,12 +671,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 22df8d0..753b9ad 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 016b3c4..6e6d639 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"