]> git.sur5r.net Git - u-boot/commitdiff
arc: make global_data.h usable in assembly files
authorAlexey Brodkin <abrodkin@synopsys.com>
Mon, 4 Jul 2016 08:37:55 +0000 (11:37 +0300)
committerAlexey Brodkin <abrodkin@synopsys.com>
Mon, 4 Jul 2016 08:43:41 +0000 (11:43 +0300)
Currently on attempt to use global_data.h in an assembly file following
will happen:
-------------------->8-----------------
./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: junk at end of line, first unrecognized character is `}'
scripts/Makefile.build:316: recipe for target 'arch/arc/lib/start.o' failed
-------------------->8-----------------

In this change we disable struct arch_global_data in ASM which fixes
the issue above.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
arch/arc/include/asm/global_data.h

index e25b966feb19e6a341d459703131dd6b22033bd4..f0242f1ad6e340d8196fc0bec3a195221016381e 100644 (file)
@@ -7,9 +7,11 @@
 #ifndef        __ASM_ARC_GLOBAL_DATA_H
 #define __ASM_ARC_GLOBAL_DATA_H
 
+#ifndef __ASSEMBLY__
 /* Architecture-specific global data */
 struct arch_global_data {
 };
+#endif /* __ASSEMBLY__ */
 
 #include <asm-generic/global_data.h>