From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932927AbcKVLGp (ORCPT ); Tue, 22 Nov 2016 06:06:45 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:55592 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752526AbcKVLGm (ORCPT ); Tue, 22 Nov 2016 06:06:42 -0500 From: Arnd Bergmann To: Russell King Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Nicolas Pitre , linux-arm-kernel@lists.infradead.org, Nicholas Piggin , viro@zeniv.linux.org.uk, linux-kbuild@vger.kernel.org, linux-arch@vger.kernel.org, regressions@leemhuis.info, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] kbuild: provide include/asm/asm-prototypes.h for ARM Date: Tue, 22 Nov 2016 12:05:40 +0100 Message-Id: <20161122110557.1533467-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:q1/Dzon1YKnj8d7BrSRHdju/yLI9XO2pd9okzJx4A29B8XLJYOg SN1/aWjUOpC2S0/aZx4zqtdsqPOwnJCQkWiUOZMYx8+tJTuyX37Gnr1lvQxeozehyefuOaG 4yU9GrOCULjs10v+VvlNx2qH9G4H/OdIJz6niDTVfQdXSqx0GG5N1lpMKpO1Zi06bOrGO3h OXsHeXPaEu1dBIwGrYH7w== X-UI-Out-Filterresults: notjunk:1;V01:K0:XLQaJ+Z+P4Q=:YyXoX0LmPeCayjNGIZ0Vq0 KtGm3+8CnpW7sNWPBygy9wQyWfSthbt+Bns/YXaje+HmYB4TwEpa/SmldItrdS+pjfOPNLVje tvLtxrtWm23cDrwTMxeALFAR+vtGfYl/xX4yqe9DmYbW+N/7ysxP6KLnc3i2rpSms29PwksvO gMfeIOCnO6f1P8/PC495sk7c4OLWXvSEhHDNN78XpgdzQYwqo9qDY0Q0cqJNJfQ/EsNDqT//i malMfPT0XlkKeQL5o1OTcAnVuVKi2ElB9W94FAy37a44xs+MCmRjMqOoNcahoYTVmq4Rqc6Fb fxrAos4UGeLtigH3meNPtlvpgyJGuI8+k2JwRzzphwvP2jGO4iyZGzaqvdvYT787nQbpH0NhP V366gYiDVsAEU34YEvpgHbs/Bc84Dz9udJKa+XFPZB85VayrhqsFrxU+WJ1ivsw2nFW+k432o LWpkBj2p95PkBLJwkFIhW3ujqwY2/4hkW0Iuw8WGn52WHlw3uXEpjWtXDl+sRaHEjnyxg3s9q Vjn2tBxvXHGQg7v9I1UGohOJjVp4pYWJr0EWs2TUiNYze6K9sNbYNP7lg5YFRO7M1CsAo64Ub Cta1h9MJMGstnPLp7OUqQjh4Ck1coDgkVc/0PQ80gsPPAvnlR5Dz7t0xoQA7a/LkJ401urNKU eYHlaNszAxU9Dnt+kX/JygcRduXh3srqpOaW8CMtyftiTbKJ5zsOviHnCv8uRiuVASwfZkfZO SbYqRwGKCxZtrsl/ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This adds an asm/asm-prototypes.h header for ARM to fix the broken symbol versioning for symbols exported from assembler files. I couldn't find the correct prototypes for the compiler builtins, so I went with the fake 'void f(void)' prototypes that we had before, restoring the state before they were moved. Originally I assumed that the problem was just a harmless warning in unusual configurations, but as Uwe found, we actually need this to load most modules when symbol versioning is enabled, as it is in many distro kernels. Cc: Uwe Kleine-König Fixes: 4dd1837d7589 ("arm: move exports to definitions") Signed-off-by: Arnd Bergmann --- Compared to the earlier version, I dropped the changes to the csumpartial files, which now get handled correctly by Kbuild even when the export comes from a macro, and I also dropped the changes to the bitops files, which were already fixed in a patch from Nico. The patch applies cleanly on top of the rmk/fixes tree but has no effect there, as it also needs 4efca4ed05cb ("kbuild: modversions for EXPORT_SYMBOL() for asm") and cc6acc11cad1 ("kbuild: be more careful about matching preprocessed asm ___EXPORT_SYMBOL"). With the combination of rmk/fixes, torvalds/master and these two patches, symbol versioning works again on ARM. As it is still broken on almost all other architectures (powerpc is fixed, x86 has a patch), I wonder if we should make CONFIG_MODVERSIONS as broken for everything else. --- arch/arm/include/asm/asm-prototypes.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 arch/arm/include/asm/asm-prototypes.h diff --git a/arch/arm/include/asm/asm-prototypes.h b/arch/arm/include/asm/asm-prototypes.h new file mode 100644 index 000000000000..04e5616a7b15 --- /dev/null +++ b/arch/arm/include/asm/asm-prototypes.h @@ -0,0 +1,34 @@ +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +extern void __aeabi_idivmod(void); +extern void __aeabi_idiv(void); +extern void __aeabi_lasr(void); +extern void __aeabi_llsl(void); +extern void __aeabi_llsr(void); +extern void __aeabi_lmul(void); +extern void __aeabi_uidivmod(void); +extern void __aeabi_uidiv(void); +extern void __aeabi_ulcmp(void); + +extern void __ashldi3(void); +extern void __ashrdi3(void); +extern void __bswapdi2(void); +extern void __bswapsi2(void); +extern void __divsi3(void); +extern void __do_div64(void); +extern void __lshrdi3(void); +extern void __modsi3(void); +extern void __muldi3(void); +extern void __ucmpdi2(void); +extern void __udivsi3(void); +extern void __umodsi3(void); -- 2.9.0