diff --git a/arch/arc/config.mk b/arch/arc/config.mk index 74943d9ffe5cd55bf1bb82ff52cae313a9206daa..7c974f005585b29ad5b75f024dee03774ea9a3c3 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 diff --git a/arch/arc/include/asm/global_data.h b/arch/arc/include/asm/global_data.h index e25b966feb19e6a341d459703131dd6b22033bd4..f0242f1ad6e340d8196fc0bec3a195221016381e 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>