Skip to content

Commit 92e2921

Browse files
committed
ARC: define ASM_NL and __ALIGN(_STR) outside #ifdef __ASSEMBLY__ guard
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: 9df62f0 ("arch: use ASM_NL instead of ';' for assembler new line character in the macro") Fixes: 8d92e99 ("ARC: define __ALIGN_STR and __ALIGN symbols for ARC") Signed-off-by: Masahiro Yamada <[email protected]>
1 parent 1c975da commit 92e2921

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/arc/include/asm/linkage.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88

99
#include <asm/dwarf.h>
1010

11+
#define ASM_NL ` /* use '`' to mark new line in macro */
12+
#define __ALIGN .align 4
13+
#define __ALIGN_STR __stringify(__ALIGN)
14+
1115
#ifdef __ASSEMBLY__
1216

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

31-
#define ASM_NL ` /* use '`' to mark new line in macro */
32-
#define __ALIGN .align 4
33-
#define __ALIGN_STR __stringify(__ALIGN)
34-
3535
/* annotation for data we want in DCCM - if enabled in .config */
3636
.macro ARCFP_DATA nm
3737
#ifdef CONFIG_ARC_HAS_DCCM

0 commit comments

Comments
 (0)