diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /include/linux/linkage.h | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'include/linux/linkage.h')
| -rw-r--r-- | include/linux/linkage.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/linux/linkage.h b/include/linux/linkage.h index 190202f05..b7657dd8a 100644 --- a/include/linux/linkage.h +++ b/include/linux/linkage.h @@ -13,6 +13,17 @@ #define asmlinkage CPP_ASMLINKAGE #endif +#ifdef __sh__ +#define STRINGIFY(X) #X +#define SYMBOL_NAME_STR(X) STRINGIFY(SYMBOL_NAME(X)) +#ifdef __STDC__ +#define SYMBOL_NAME(X) _##X +#define SYMBOL_NAME_LABEL(X) _##X##: +#else +#define SYMBOL_NAME(X) _/**/X +#define SYMBOL_NAME_LABEL(X) _/**/X/**/: +#endif +#else #define SYMBOL_NAME_STR(X) #X #define SYMBOL_NAME(X) X #ifdef __STDC__ @@ -20,6 +31,7 @@ #else #define SYMBOL_NAME_LABEL(X) X/**/: #endif +#endif #ifdef __arm__ #define __ALIGN .align 0 @@ -29,6 +41,10 @@ #define __ALIGN .align 4 #define __ALIGN_STR ".align 4" #else +#ifdef __sh__ +#define __ALIGN .balign 4 +#define __ALIGN_STR ".balign 4" +#else #if !defined(__i486__) && !defined(__i586__) #define __ALIGN .align 4,0x90 #define __ALIGN_STR ".align 4,0x90" @@ -36,6 +52,7 @@ #define __ALIGN .align 16,0x90 #define __ALIGN_STR ".align 16,0x90" #endif /* __i486__/__i586__ */ +#endif /* __sh__ */ #endif /* __mc68000__ */ #endif /* __arm__ */ |