From: Alexey Brodkin <abrodkin@synopsys.com>
Date: Mon, 4 Jul 2016 08:37:55 +0000 (+0300)
Subject: arc: make global_data.h usable in assembly files
X-Git-Tag: v2016.07~15^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c7dea6e259d68cc0645daf3fe2188e077748ef9e;p=oweals%2Fu-boot.git

arc: make global_data.h usable in assembly files

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>
---

diff --git a/arch/arc/include/asm/global_data.h b/arch/arc/include/asm/global_data.h
index e25b966feb..f0242f1ad6 100644
--- a/arch/arc/include/asm/global_data.h
+++ b/arch/arc/include/asm/global_data.h
@@ -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>