diff options
| author | Chen Gang <gang.chen.5i5j@gmail.com> | 2015-02-19 18:51:27 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-05 20:49:43 -0500 |
| commit | 950cb9bbc7fa6fa129a675c39b99e7cd9d63595c (patch) | |
| tree | 9c8273441beb67ff86eb6c2bd53573987c1635a1 /include/linux/linkage.h | |
| parent | b050898efa6b4f0272f12885a7365f044ab4c08e (diff) | |
| download | u-boot-imx-950cb9bbc7fa6fa129a675c39b99e7cd9d63595c.zip u-boot-imx-950cb9bbc7fa6fa129a675c39b99e7cd9d63595c.tar.gz u-boot-imx-950cb9bbc7fa6fa129a675c39b99e7cd9d63595c.tar.bz2 | |
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.
Basically this is the same patch as applied to Linux kernel -
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/include/linux/linkage.h?id=9df62f054406992ce41ec4558fca6a0fa56fffeb
but modified a bit to fit in U-Boot.
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/linux/linkage.h')
| -rw-r--r-- | include/linux/linkage.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 5797498..efb04ee 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h @@ -11,6 +11,11 @@ #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 @@ -43,15 +48,15 @@ #define ALIGN_STR __ALIGN_STR #define LENTRY(name) \ - ALIGN; \ + ALIGN ASM_NL \ SYMBOL_NAME_LABEL(name) #define ENTRY(name) \ - .globl SYMBOL_NAME(name); \ + .globl SYMBOL_NAME(name) ASM_NL \ LENTRY(name) #define WEAK(name) \ - .weak SYMBOL_NAME(name); \ + .weak SYMBOL_NAME(name) ASM_NL \ LENTRY(name) #ifndef END @@ -61,7 +66,7 @@ #ifndef ENDPROC #define ENDPROC(name) \ - .type name STT_FUNC; \ + .type name STT_FUNC ASM_NL \ END(name) #endif |