X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Flinux%2Flinkage.h;h=8e2f15a63529b391affc44be5cdc5fffcb7542f1;hb=456ecd08ec026e67a17a77baa3778c9f1b8e474d;hp=7435fcd0262bd4770159e1bd3ebf6d5a9444a54f;hpb=ec4fa56743a3534c4bace2c9c72ea36b9d41000c;p=oweals%2Fu-boot.git

diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index 7435fcd026..8e2f15a635 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - linkage.h
+ * U-Boot - linkage.h
  *
  * Copyright (c) 2005-2007 Analog Devices Inc.
  *
@@ -11,13 +11,20 @@
 
 #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
 #define CPP_ASMLINKAGE
 #endif
 
+#ifndef asmlinkage
 #define asmlinkage CPP_ASMLINKAGE
+#endif
 
 #define SYMBOL_NAME_STR(X)	#X
 #define SYMBOL_NAME(X)		X
@@ -41,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
@@ -59,7 +66,7 @@
 
 #ifndef ENDPROC
 #define ENDPROC(name) \
-	.type name STT_FUNC; \
+	.type name STT_FUNC ASM_NL \
 	END(name)
 #endif