Re: [PATCH v3] arch: use ASM_NL instead of ';' for assembler newline character in the macro

[Vineet Gupta]

Hi Mike,

On Saturday 18 January 2014 03:14 PM, Chen Gang wrote:
> Hello Maintainers:
>
> Please help check this patch when you have time.
>
> Thanks.

Do you know whose tree this is goona go thru. I can take it thru ARC (but maybe
for 3.15, however it would be better it went thru mm or some such).

-Vineet

>
> On 01/12/2014 09:59 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.
>>
>>
>> Signed-off-by: Chen Gang <gang.chen.5i5j@xxxxxxxxx>
>> Acked-by: Vineet Gupta <vgupta@xxxxxxxxxxxx>
>> ---
>>  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 <linux/export.h>
>>  #include <asm/linkage.h>
>>  
>> +/* 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
>>
>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/