Commit c182d87c authored Jun 12, 2023 by Masahiro Yamada Committed by Greg Kroah-Hartman Jul 27, 2023

ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef ASSEMBLY guard



[ Upstream commit 92e2921eeafdfca9acd9b83f07d2b7ca099bac24 ]

ASM_NL is useful not only in *.S files but also in .c files for using
inline assembler in C code.

On ARC, however, ASM_NL is evaluated inconsistently. It is expanded to
a backquote (`) in *.S files, but a semicolon (;) in *.c files because
arch/arc/include/asm/linkage.h defines it inside #ifdef __ASSEMBLY__,
so the definition for C code falls back to the default value defined in
include/linux/linkage.h.

If ASM_NL is used in inline assembler in .c files, it will result in
wrong assembly code because a semicolon is not an instruction separator,
but the start of a comment for ARC.

Move ASM_NL (also __ALIGN and __ALIGN_STR) out of the #ifdef.

Fixes: 9df62f05 ("arch: use ASM_NL instead of ';' for assembler new line character in the macro")
Fixes: 8d92e992a785 ("ARC: define __ALIGN_STR and __ALIGN symbols for ARC")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 02dc8e8b

arch/arc/include/asm/linkage.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,10 @@

	#include <asm/dwarf.h>		#include <asm/dwarf.h>

			#define ASM_NL ` /* use '`' to mark new line in macro */
			#define __ALIGN .align 4
			#define __ALIGN_STR __stringify(__ALIGN)

	#ifdef __ASSEMBLY__		#ifdef __ASSEMBLY__

	.macro ST2 e, o, off		.macro ST2 e, o, off
	@@ -28,10 +32,6 @@
	#endif		#endif
	.endm		.endm

	#define ASM_NL ` /* use '`' to mark new line in macro */
	#define __ALIGN .align 4
	#define __ALIGN_STR __stringify(__ALIGN)

	/* annotation for data we want in DCCM - if enabled in .config */		/* annotation for data we want in DCCM - if enabled in .config */
	.macro ARCFP_DATA nm		.macro ARCFP_DATA nm
	#ifdef CONFIG_ARC_HAS_DCCM		#ifdef CONFIG_ARC_HAS_DCCM