summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAlexey Brodkin <abrodkin@synopsys.com>2016-07-04 11:37:55 +0300
committerAlexey Brodkin <abrodkin@synopsys.com>2016-07-04 11:43:41 +0300
commitc7dea6e259d68cc0645daf3fe2188e077748ef9e (patch)
treee273d9a073f5358cda54eff2ee79220a655ff5cd /arch
parent7a54f5177ac3d8d972622dd9f85964c23a6df68d (diff)
downloadu-boot-imx-c7dea6e259d68cc0645daf3fe2188e077748ef9e.zip
u-boot-imx-c7dea6e259d68cc0645daf3fe2188e077748ef9e.tar.gz
u-boot-imx-c7dea6e259d68cc0645daf3fe2188e077748ef9e.tar.bz2
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arc/include/asm/global_data.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arc/include/asm/global_data.h b/arch/arc/include/asm/global_data.h
index e25b966..f0242f1 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>