Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9df62f05 authored by Chen Gang's avatar Chen Gang Committed by Michal Marek
Browse files

arch: use ASM_NL instead of ';' for assembler new line character in the macro 



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: default avatarChen Gang <gang.chen.5i5j@gmail.com>
Acked-by: default avatarVineet Gupta <vgupta@synopsys.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent e36aaea2

arch/arc/include/asm/linkage.h

+2 −0
Original line number Diff line number Diff line
@@ -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

 */

include/linux/linkage.h

+12 −7
Original line number Diff line number Diff line
@@ -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,15 +80,15 @@ 


#ifndef ENTRY

#define ENTRY(name) \

  .globl name; \

  ALIGN; \

	.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
@@ -98,7 +103,7 @@ 
 */

#ifndef ENDPROC

#define ENDPROC(name) \

  .type name, @function; \

	.type name, @function ASM_NL \

	END(name)

#endif