patch-2.1.35 linux/include/linux/linkage.h

Next file: linux/include/linux/sched.h
Previous file: linux/include/linux/config.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.34/linux/include/linux/linkage.h linux/include/linux/linkage.h
@@ -7,7 +7,6 @@
 #define asmlinkage
 #endif
 
-#ifdef __ELF__
 #define SYMBOL_NAME_STR(X) #X
 #define SYMBOL_NAME(X) X
 #ifdef __STDC__
@@ -15,33 +14,13 @@
 #else
 #define SYMBOL_NAME_LABEL(X) X/**/:
 #endif
-#else
-#define SYMBOL_NAME_STR(X) "_"#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
-#endif
 
 #if !defined(__i486__) && !defined(__i586__)
-#ifdef __ELF__
 #define __ALIGN .align 4,0x90
 #define __ALIGN_STR ".align 4,0x90"
-#else  /* __ELF__ */
-#define __ALIGN .align 2,0x90
-#define __ALIGN_STR ".align 2,0x90"
-#endif /* __ELF__ */
 #else  /* __i486__/__i586__ */
-#ifdef __ELF__
 #define __ALIGN .align 16,0x90
 #define __ALIGN_STR ".align 16,0x90"
-#else  /* __ELF__ */
-#define __ALIGN .align 4,0x90
-#define __ALIGN_STR ".align 4,0x90"
-#endif /* __ELF__ */
 #endif /* __i486__/__i586__ */
 
 #ifdef __ASSEMBLY__

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov