From 7a54f5177ac3d8d972622dd9f85964c23a6df68d Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Thu, 16 Jun 2016 10:55:00 +0200 Subject: arc: Use "-mcpu=archs" instead of deprecated "-marchs" for ARC HS Newer ARC toolchains don't support "-marchs" option any longer. Instead "-mcpu=archs" should be used. What's also important older toiolchains that support ARC HS cores will also happily accept "-mcpu=archs" so that's a very safe move. Signed-off-by: Alexey Brodkin --- arch/arc/config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch') diff --git a/arch/arc/config.mk b/arch/arc/config.mk index 74943d9ffe..7c974f0055 100644 --- a/arch/arc/config.mk +++ b/arch/arc/config.mk @@ -43,11 +43,11 @@ PLATFORM_CPPFLAGS += -marcem endif ifdef CONFIG_CPU_ARCHS34 -PLATFORM_CPPFLAGS += -marchs +PLATFORM_CPPFLAGS += -mcpu=archs endif ifdef CONFIG_CPU_ARCHS38 -PLATFORM_CPPFLAGS += -marchs +PLATFORM_CPPFLAGS += -mcpu=archs endif PLATFORM_CPPFLAGS += -ffixed-r25 -D__ARC__ -gdwarf-2 -- cgit v1.2.1 From c7dea6e259d68cc0645daf3fe2188e077748ef9e Mon Sep 17 00:00:00 2001 From: Alexey Brodkin Date: Mon, 4 Jul 2016 11:37:55 +0300 Subject: 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 --- arch/arc/include/asm/global_data.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') 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 -- cgit v1.2.1