[U-Boot] [PATCH] arc: make global_data.h usable in assembly files

Alexey Brodkin Alexey.Brodkin at synopsys.com
Wed Dec 16 17:09:31 CET 2015


Currently on attempt to use global_data.h in an assembly file following
will happen:
-------------------->8-----------------
AS      arch/arc/lib/start.o
./arch/arc/include/asm/global_data.h: Assembler messages:
./arch/arc/include/asm/global_data.h:11: Error: bad instruction 'struct
arch_global_data{'
./arch/arc/include/asm/global_data.h:12: Error: bad instruction 'int
running_on_hw'
./arch/arc/include/asm/global_data.h:13: Error: junk at end of line,
first unrecognized character is '}'
-------------------->8-----------------

Signed-off-by: Alexey Brodkin <abrodkin at synopsys.com>
---
 arch/arc/include/asm/global_data.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arc/include/asm/global_data.h b/arch/arc/include/asm/global_data.h
index d644e80..7927830 100644
--- a/arch/arc/include/asm/global_data.h
+++ b/arch/arc/include/asm/global_data.h
@@ -7,10 +7,12 @@
 #ifndef	__ASM_ARC_GLOBAL_DATA_H
 #define __ASM_ARC_GLOBAL_DATA_H
 
+#ifndef __ASSEMBLY__
 /* Architecture-specific global data */
 struct arch_global_data {
 	int running_on_hw;
 };
+#endif /* __ASSEMBLY__ */
 
 #include <asm-generic/global_data.h>
 
-- 
2.4.3



More information about the U-Boot mailing list