From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754049Ab3KUJ7R (ORCPT ); Thu, 21 Nov 2013 04:59:17 -0500 Received: from us01smtp2.synopsys.com ([198.182.44.80]:38188 "EHLO kiruna.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753886Ab3KUJ7P (ORCPT ); Thu, 21 Nov 2013 04:59:15 -0500 Message-ID: <528DD92E.9070408@synopsys.com> Date: Thu, 21 Nov 2013 15:28:06 +0530 From: Vineet Gupta User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Chen Gang , Al Viro , "Arnd Bergmann" , Rusty Russell CC: James Hogan , "linux-kernel@vger.kernel.org" , Linux-Arch , "Max Filippov" , Sam Ravnborg , Tim Abbott , Joe Perches , Michal Marek , David Howells Subject: Re: [PATCH v2] arch: use ASM_NL instead of ';' for assembler new line character in the macro References: <526E3CE2.2070405@asianux.com> <526E6A92.6090301@synopsys.com> <526F09B8.9030202@asianux.com> <526F11C0.1030809@asianux.com> <526F149A.3000306@asianux.com> <52733FEC.4010807@synopsys.com> In-Reply-To: <52733FEC.4010807@synopsys.com> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.12.197.99] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/01/2013 11:15 AM, Vineet Gupta wrote: > +CC Sam, Tim, Joe, Michal, David > > Guys can you please take a look at this patch and suggest the best way to merge. > > The root cause is some gas ports (including ARC) use ';' for comment (vs. newline) > More background at https://lkml.org/lkml/2013/10/24/365 Ping ! Any objections to this. Given that this is exception case, it is simpler than defining a Kconfig control. -Vineet > > > On 10/29/2013 07:21 AM, Chen Gang wrote: >> For some assemblers, they use another character as newline in a macro >> (e.g. arc uses '`'), so for generic assembly code, need use ASM_NL (a >> macro) instead of ';' for it. >> >> Also need notice about code styles ('\t' for each line). >> >> >> Signed-off-by: Chen Gang >> --- >> arch/arc/include/asm/linkage.h | 2 ++ >> include/linux/linkage.h | 19 ++++++++++++------- >> 2 files changed, 14 insertions(+), 7 deletions(-) >> >> diff --git a/arch/arc/include/asm/linkage.h b/arch/arc/include/asm/linkage.h >> index 0283e9e..66ee552 100644 >> --- a/arch/arc/include/asm/linkage.h >> +++ b/arch/arc/include/asm/linkage.h >> @@ -11,6 +11,8 @@ >> >> #ifdef __ASSEMBLY__ >> >> +#define ASM_NL ` /* use '`' to mark new line in macro */ >> + >> /* Can't use the ENTRY macro in linux/linkage.h >> * gas considers ';' as comment vs. newline >> */ >> diff --git a/include/linux/linkage.h b/include/linux/linkage.h >> index d3e8ad2..a6a42dd 100644 >> --- a/include/linux/linkage.h >> +++ b/include/linux/linkage.h >> @@ -6,6 +6,11 @@ >> #include >> #include >> >> +/* Some toolchains use other characters (e.g. '`') to mark new line in macro */ >> +#ifndef ASM_NL >> +#define ASM_NL ; >> +#endif >> + >> #ifdef __cplusplus >> #define CPP_ASMLINKAGE extern "C" >> #else >> @@ -75,21 +80,21 @@ >> >> #ifndef ENTRY >> #define ENTRY(name) \ >> - .globl name; \ >> - ALIGN; \ >> - name: >> + .globl name ASM_NL \ >> + ALIGN ASM_NL \ >> + name: >> #endif >> #endif /* LINKER_SCRIPT */ >> >> #ifndef WEAK >> #define WEAK(name) \ >> - .weak name; \ >> + .weak name ASM_NL \ >> name: >> #endif >> >> #ifndef END >> #define END(name) \ >> - .size name, .-name >> + .size name, .-name >> #endif >> >> /* If symbol 'name' is treated as a subroutine (gets called, and returns) >> @@ -98,8 +103,8 @@ >> */ >> #ifndef ENDPROC >> #define ENDPROC(name) \ >> - .type name, @function; \ >> - END(name) >> + .type name, @function ASM_NL \ >> + END(name) >> #endif >> >> #endif >> >