From patchwork Wed May 9 07:23:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 135205 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5309277lji; Wed, 9 May 2018 00:25:26 -0700 (PDT) X-Google-Smtp-Source: AB8JxZot7AzcYjOownpP6e2ZgcCTBsn9ivIPZM8CaG+wFKoy8Ydo7IXqAxbg1Ye/W6IASvMHMFkQ X-Received: by 2002:a65:62d9:: with SMTP id m25-v6mr18081250pgv.407.1525850726294; Wed, 09 May 2018 00:25:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525850726; cv=none; d=google.com; s=arc-20160816; b=xp6daoIQQh8jATlDyDxTW8SEGOAcWXti3vUoJ69cvgAvSd46aG7W3QeunOoctGVHfg 4mTaNXoJCytrosoqjIsKB4zGQD16OABOiUQ+umfSmBdn7m4mHXjROWw7VE+AduxeKEbB EV42AwoZ0op/Xzh98eFeX1Ha5LesS8B3TYvfWRqCyS3HsfHEO8qCMi1LL5fM7OL+DpB4 nYMLJ+kQRKFN3C1q3Q850/cPrhW46nYz1GA88kVRLWIGzsIkYbGdpP55w7j6s/O2sq6H 435qSnqdSo1hg0DDpxvf6VFHrNPuDgkgxknD12BbSu7BeDBaOIs9bAumZy+WuweMqeIl iL9g== 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=tkCsT8ZAS1PenYR9aUkCCuaCl2IOD4BtKtz/e3afaS0=; b=MzcUu4MalUqvGrW1wwgJwie/WClmrrsem1EhV/UhjFVeQwMdt4HSEnyGXvANuAA6YZ sF6t5bH1YyZIcvxIqWZq/HrV28+iEyYFoxRmLIkeFDnxfassQ0AlWrRGjb6/Ui3Rg4/g 8MvPutHAZjDnj1cIr3tWsFuAsAy34TBurpVM2S7LLsO+sFwLKvH99rgqJiloYD9DmRri 6d5xmislGF1GPwtDF0WkVkVzg1++992O/JtqB+C634piWvsUnvK7GI5lTgV9ssE1J2X3 74doyT2j6+7BPDoWDLErFpqSjcHZibf9OudzqjtVXe20yBNzMr1U3m0SdoHw23G1xY4i nXpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=c2S4/Nd5; 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 t9-v6si24616296plo.592.2018.05.09.00.25.26; Wed, 09 May 2018 00:25:26 -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=c2S4/Nd5; 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 S933741AbeEIHY6 (ORCPT + 29 others); Wed, 9 May 2018 03:24:58 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:50743 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755400AbeEIHYu (ORCPT ); Wed, 9 May 2018 03:24:50 -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 w497O36E028852; Wed, 9 May 2018 16:24:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w497O36E028852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1525850645; bh=tkCsT8ZAS1PenYR9aUkCCuaCl2IOD4BtKtz/e3afaS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c2S4/Nd5YybivMuFwjc6SXfj96SRvzScwxc+tZUndfRv5M8eqhhQVjR1j6wMVQRZH IxY4OD8lVu/+bvN6JP2QDf0q+dowWR8iaQsL4joA3MfvrzGpIyLR1wl8FhHu/pN2Tr mNGDGAhT9R+5fMOqsD/FRPnImUlFfM6lnspTHa7EX4rbDYLjAXsGYzrmqXXNw3ccPy D4cIYRfD7D3b2xUosSDat+BrC1J1J5L55fQENnuWjytEqi23bCz1vqUdWyXQwtDQP3 IE+gCLKgLoZSfiIrOWnDC31K+RVLgdONcVi7X88NyjOYChMNBJ0UZkwFhStM7fzBsk B0+LAh9EAqBVw== 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 2/8] genksyms: remove symbol prefix support Date: Wed, 9 May 2018 16:23:46 +0900 Message-Id: <1525850632-10921-3-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, hence the -s (--symbol-prefix) option is unnecessary. Signed-off-by: Masahiro Yamada --- scripts/Makefile.build | 2 -- scripts/genksyms/genksyms.c | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) -- 2.7.4 diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 8bdb1dc..22df8d0 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -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)) diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c index c9235d8..e007840 100644 --- a/scripts/genksyms/genksyms.c +++ b/scripts/genksyms/genksyms.c @@ -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;