f4f9e6f138
[ 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: 9df62f0544 ("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>
84 lines
1.7 KiB
C
84 lines
1.7 KiB
C
/*
|
|
* Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#ifndef __ASM_LINKAGE_H
|
|
#define __ASM_LINKAGE_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__
|
|
|
|
.macro ST2 e, o, off
|
|
#ifdef CONFIG_ARC_HAS_LL64
|
|
std \e, [sp, \off]
|
|
#else
|
|
st \e, [sp, \off]
|
|
st \o, [sp, \off+4]
|
|
#endif
|
|
.endm
|
|
|
|
.macro LD2 e, o, off
|
|
#ifdef CONFIG_ARC_HAS_LL64
|
|
ldd \e, [sp, \off]
|
|
#else
|
|
ld \e, [sp, \off]
|
|
ld \o, [sp, \off+4]
|
|
#endif
|
|
.endm
|
|
|
|
/* annotation for data we want in DCCM - if enabled in .config */
|
|
.macro ARCFP_DATA nm
|
|
#ifdef CONFIG_ARC_HAS_DCCM
|
|
.section .data.arcfp
|
|
#else
|
|
.section .data
|
|
#endif
|
|
.global \nm
|
|
.endm
|
|
|
|
/* annotation for data we want in DCCM - if enabled in .config */
|
|
.macro ARCFP_CODE
|
|
#ifdef CONFIG_ARC_HAS_ICCM
|
|
.section .text.arcfp, "ax",@progbits
|
|
#else
|
|
.section .text, "ax",@progbits
|
|
#endif
|
|
.endm
|
|
|
|
#define ENTRY_CFI(name) \
|
|
.globl name ASM_NL \
|
|
ALIGN ASM_NL \
|
|
name: ASM_NL \
|
|
CFI_STARTPROC ASM_NL
|
|
|
|
#define END_CFI(name) \
|
|
CFI_ENDPROC ASM_NL \
|
|
.size name, .-name
|
|
|
|
#else /* !__ASSEMBLY__ */
|
|
|
|
#ifdef CONFIG_ARC_HAS_ICCM
|
|
#define __arcfp_code __attribute__((__section__(".text.arcfp")))
|
|
#else
|
|
#define __arcfp_code __attribute__((__section__(".text")))
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARC_HAS_DCCM
|
|
#define __arcfp_data __attribute__((__section__(".data.arcfp")))
|
|
#else
|
|
#define __arcfp_data __attribute__((__section__(".data")))
|
|
#endif
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif
|