From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761188AbcLPK6N (ORCPT ); Fri, 16 Dec 2016 05:58:13 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:64880 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760770AbcLPK5G (ORCPT ); Fri, 16 Dec 2016 05:57:06 -0500 From: Arnd Bergmann To: linux-arch@vger.kernel.org Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@vger.kernel.org, Russell King , Andrew Morton , kernel-build-reports@lists.linaro.org, kvmarm@lists.cs.columbia.edu, Arnd Bergmann Subject: [PATCH 13/13] ARM: avoid 'Q' asm constraint for gcc-4.1 and earlier Date: Fri, 16 Dec 2016 11:56:34 +0100 Message-Id: <20161216105634.235457-14-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20161216105634.235457-1-arnd@arndb.de> References: <20161216105634.235457-1-arnd@arndb.de> X-Provags-ID: V03:K0:Xse5Cos1IL8GPmA5+TD39QpTBn85andwQI7lBvdxgY+bbxcvPyQ WR8T+0cHO9yKafMr3MxoyIizQBwJCKQLuxoZ/IJTDZ8BlZkZVLT9uPaTmiROk2dMZhS2iXT iro7lHvsHol2xVkxocIxs1xLOtHw+X1Vp/s7Z2I3uE+HdU8o6J0fy9/EeHAia3jlhoLYya4 bVS75fgu4h+Z7haTyhEDQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:/F+IqrFNW2U=:DXBh+mGowddr+XFI91XFoK TAcqosMJKRX23MiKsDqZk/KFzCh+wXUs4quLQnguYjItJgjz8nKbaqlH57joDzBDgr0lZ7R+l ELigEurYpjDAVTUtNFEhRV8m7sH4pI7M6bRZJZHwuAXHdosUhqxFf/7B2lBktu25T6Mo350WU Bn2TmsKtIuKW4uAJJXFCXjq+6JX1XlXEn5UAOcTWj/JZbRPYhty+L3A10V2vfsYrSBkQ5LE5o K30I+mJP2SbV3+Wq6HiHhMEpoZ8UvWCnBt77LawC8/tKLGKCu08JDTEHzPkSK7Vd34LfNHERf +dELaStNKHbemJFQdCBmOLWHzfeq4w75Yga6pxa4IKaFB5uCSWDAgbkqmLLEXyqUYdywWI8Yv K7hIAPehoNBflvsaeVogA1/HBBVg8N/PZImJwTb39yeItqavBiBAe1Kj/SrhDRpHjp85cXv4n FFrWj8/XNH6WepUgogQ3LQw1p3Bticts4W801dzeQsOwOlmoAW0Bp6Yje4M8Scg8bQVsCjaJK r27fCzocfwHWaTlPDX9H1Du65enqbyFhjNhPFD38PxpKuCnr6BNCizXPW8TB1U8FUOoiJarWY n1/8WBoeQ/l6+LHpwzhYG9jd8ZEIfqMwpnyE500tlriGuD3+6yvJldslU83MNWjOqdhMZ0lvu 4kyXvQS3BVZ4XaTJGU+xJf+yZty4O0pYFSqR6FuWaoTCtBVftnSpEIOxLymD73If1LtM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Building with ancient gcc versions results in a stream of build errors like: arch/arm/include/asm/io.h:100: error: impossible constraint in 'asm' arch/arm/include/asm/io.h:118: error: impossible constraint in 'asm' This reverts to an older version of __raw_readl, __raw_writel and __my_cpu_offset, which seem to be the only functions affected by this. Signed-off-by: Arnd Bergmann --- arch/arm/include/asm/io.h | 8 ++++++++ arch/arm/include/asm/percpu.h | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 6f89a4d9fc85..d0f89c4cb8e2 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -97,8 +97,12 @@ static inline void __raw_writeb(u8 val, volatile void __iomem *addr) #define __raw_writel __raw_writel static inline void __raw_writel(u32 val, volatile void __iomem *addr) { +#if GCC_VERSION < 40200 + *(volatile u32 __force *)addr = val; +#else asm volatile("str %1, %0" : : "Qo" (*(volatile u32 __force *)addr), "r" (val)); +#endif } #define __raw_readb __raw_readb @@ -115,9 +119,13 @@ static inline u8 __raw_readb(const volatile void __iomem *addr) static inline u32 __raw_readl(const volatile void __iomem *addr) { u32 val; +#if GCC_VERSION < 40200 + val = *(volatile u32 __force *)addr; +#else asm volatile("ldr %0, %1" : "=r" (val) : "Qo" (*(volatile u32 __force *)addr)); +#endif return val; } diff --git a/arch/arm/include/asm/percpu.h b/arch/arm/include/asm/percpu.h index a89b4076cde4..dee4c89b4458 100644 --- a/arch/arm/include/asm/percpu.h +++ b/arch/arm/include/asm/percpu.h @@ -36,9 +36,12 @@ static inline unsigned long __my_cpu_offset(void) * We want to allow caching the value, so avoid using volatile and * instead use a fake stack read to hazard against barrier(). */ +#if GCC_VERSION < 40200 + asm("mrc p15, 0, %0, c13, c0, 4" : "=r" (off) : : "memory"); +#else asm("mrc p15, 0, %0, c13, c0, 4" : "=r" (off) : "Q" (*(const unsigned long *)current_stack_pointer)); - +#endif return off; } #define __my_cpu_offset __my_cpu_offset() -- 2.9.0