From patchwork Wed Nov 30 08:50:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 84972 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp138306qgi; Wed, 30 Nov 2016 00:50:45 -0800 (PST) X-Received: by 10.84.176.131 with SMTP id v3mr70755090plb.51.1480495845723; Wed, 30 Nov 2016 00:50:45 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f13si34814642plm.259.2016.11.30.00.50.45; Wed, 30 Nov 2016 00:50:45 -0800 (PST) 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; 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; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757362AbcK3Iuk (ORCPT + 25 others); Wed, 30 Nov 2016 03:50:40 -0500 Received: from alt32.smtp-out.videotron.ca ([24.53.0.21]:39766 "EHLO alt32.smtp-out.videotron.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757304AbcK3Iuc (ORCPT ); Wed, 30 Nov 2016 03:50:32 -0500 Received: from yoda.home ([96.23.157.65]) by Videotron with SMTP id C0ayc2HpVWjC4C0azckpBN; Wed, 30 Nov 2016 03:50:30 -0500 X-Authority-Analysis: v=2.1 cv=FfyXvMK6 c=1 sm=1 tr=0 a=keA3yYpnlypCNW5BNWqu+w==:117 a=keA3yYpnlypCNW5BNWqu+w==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=L24OOQBejmoA:10 a=KKAkSRfTAAAA:8 a=8ubSwkDiYurDY74VSmoA:9 a=cvBusfyB2V15izCimMoJ:22 Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 50C762DA064A; Wed, 30 Nov 2016 03:50:28 -0500 (EST) From: Nicolas Pitre To: Russell King - ARM Linux , Nicholas Piggin , Michal Marek Cc: Arnd Bergmann , viro@zeniv.linux.org.uk, linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] kbuild: make modversion for exported asm symbols more convivial Date: Wed, 30 Nov 2016 03:50:23 -0500 Message-Id: <1480495824-4151-3-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480495824-4151-1-git-send-email-nicolas.pitre@linaro.org> References: <1480495824-4151-1-git-send-email-nicolas.pitre@linaro.org> X-CMAE-Envelope: MS4wfBNci9r7AaxAkfNEuKKqTTH6Q5jHmGaNfvrtLoLPUvopsqo36f47Ea5ZommeVsp7VeilNxu9I3moRICZoTSahW4cyeOJ5PUgHKYmY0ZezKTlrAP+c8lX rVF1Y8NKRvTl64TI/pj8wRWRK2Bmj1UT7gN8kQhk5Cg7/OuGTlnqHC+Z1USZfGkGdCh7Rytw1hRxNGsvchsXLoMjNsR52UxHCj5nOm5IJAzFEF9aNIf7PYAk Wbi+5ZjmMvlnceh5LzUqPJHj4y+X2YaKWv52ys6YQim+QxfgjmDhDjDTnl58DnEC6dqaVqFVdmW1xkj5t0++1eMqTJ2crAT2grkUVkiS7slSTH8ZC3zF6RFV bP58I/u9+wRnDshDEyO21ro2c9P+pV6K+vgEkBBLYGU2dYY3ub5pr/PPgl9+vtNa3lvx4E8+qQ4M4+eyfqpnUtoZViA/AdIZ3T57aMAL4o47r+jlnNk= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rather than having an asm-prototypes.h file where C prototypes for exported asm symbols are centralized, let's have some macros that can be used directly in the code where those symbols are exported for genksyms consumption. Either the prototype is provided directly if no include files has it, or the include file containing it is specified. Signed-off-by: Nicolas Pitre --- include/asm-generic/export.h | 15 +++++++++++++++ scripts/Makefile.build | 22 +++++++++++++++------- 2 files changed, 30 insertions(+), 7 deletions(-) -- 2.7.4 diff --git a/include/asm-generic/export.h b/include/asm-generic/export.h index 39a19dc366..83dda5f840 100644 --- a/include/asm-generic/export.h +++ b/include/asm-generic/export.h @@ -84,11 +84,26 @@ KSYM(__kcrctab_\name): #define __EXPORT_SYMBOL(sym, val, sec) ___EXPORT_SYMBOL sym, val, sec #endif +/* in the non genksyms case those are no-ops */ +#define SYMBOL_CPROTO(expr) +#define SYMBOL_CPROTO_INCLUDE(file) + #else /* __GENKSYMS__ */ /* create a preprocessor output suitable for cmd_gensymtypes_S */ #define __EXPORT_SYMBOL(sym, val, sec) EXPORT_SYMBOL(sym) +/* + * The cmd_gensymtypes_S kbuild command recognizes the following: + * + * Provide a C prototype for genksyms: SYMBOL_CPROTO(expr) + * example: SYMBOL_CPROTO(void foobar(int x, int y)) + * + * Specify an include file that contains C prototypes for genksyms: + * SYMBOL_CPROTO_INCLUDE(quoted_filename) + * example: SYMBOL_CPROTO_INCLUDE() + */ + #endif /* __GENKSYMS__ */ #define EXPORT_SYMBOL(name) \ diff --git a/scripts/Makefile.build b/scripts/Makefile.build index ebf6e08ae4..58ebc4b15d 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -317,24 +317,32 @@ modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL) $(real-objs-m) : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) $(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE) -# .S file exports must have their C prototypes defined in asm/asm-prototypes.h -# or a file that it includes, in order to get versioned symbols. We build a -# dummy C file that includes asm-prototypes and the EXPORT_SYMBOL lines from -# the .S file (with trailing ';'), and run genksyms on that, to extract vers. +# In order to get versioned symbols, .S file exports must have their C prototypes: +# - defined in asm/asm-prototypes.h or a file that it includes, or +# - provided in a file specified by SYMBOL_CPROTO_INCLUDE(), or +# - specified directly by SYMBOL_CPROTO(). +# We build a dummy C file that includes asm-prototypes and the EXPORT_SYMBOL +# lines from the .S file (with trailing ';'), and run genksyms on that, to +# extract vers. # # This is convoluted. The .S file must first be preprocessed to run guards and # expand names, then the resulting exports must be constructed into plain # EXPORT_SYMBOL(symbol); to build our dummy C file, and that gets preprocessed # to make the genksyms input. See also include/asm-generic/export.h. # +# The -Ulinux is necessary otherwise SYMBOL_CPROTO_INCLUDE() +# is turned into #include <1/bitops.h> due to "linux" being defined to 1. +# # These mirror gensymtypes_c and co above, keep them in synch. cmd_gensymtypes_S = \ ( echo "\#include " ; \ if [ -e $(srctree)/arch/$(SRCARCH)/include/asm/asm-prototypes.h ]; \ then echo "\#include "; fi; \ - $(CPP) -D__GENKSYMS__ $(a_flags) $< | tr ";" "\n" | \ - sed -n -e '/EXPORT_SYMBOL(/s/$$/;/p' ) | \ - $(CPP) -D__GENKSYMS__ $(c_flags) -xc - | \ + $(CPP) -D__GENKSYMS__ $(a_flags) -Ulinux $< | tr ";" "\n" | \ + sed -n -e '/EXPORT_SYMBOL(/s/$$/;/p' \ + -e 's/SYMBOL_CPROTO(\(.*\))/\1;/p' \ + -e 's/SYMBOL_CPROTO_INCLUDE(\(.*\))/\#include \1/p' ) | \ + $(CPP) -D__GENKSYMS__ -I$(@D) $(c_flags) -xc - | \ $(GENKSYMS) $(if $(1), -T $(2)) \ $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX)) \ $(if $(KBUILD_PRESERVE),-p) \