From f2520f87a2a8099758479055e2a38138387f5d4f Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 5 Jun 2015 22:27:49 -0400 Subject: [PATCH] Rename VXMICRO_ARCH_arc -> CONFIG_ARC Change-Id: I4aca181523f50f43ee01e1be0c20a9ad844ef618 Signed-off-by: Anas Nashif --- include/arch/cpu.h | 2 +- include/linker-defs.h | 2 +- include/section_tags.h | 4 ++-- include/sections.h | 2 +- include/toolchain/common.h | 2 +- include/toolchain/gcc.h | 12 ++++++------ 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/arch/cpu.h b/include/arch/cpu.h index c04f9e6c8b8..45316362e83 100644 --- a/include/arch/cpu.h +++ b/include/arch/cpu.h @@ -37,7 +37,7 @@ #include #elif defined(CONFIG_ARM) #include -#elif defined(VXMICRO_ARCH_arc) +#elif defined(CONFIG_ARC) #include #else #error "Unknown VXMICRO_ARCH" diff --git a/include/linker-defs.h b/include/linker-defs.h index 113672ad9fb..d56365d2df9 100644 --- a/include/linker-defs.h +++ b/include/linker-defs.h @@ -49,7 +49,7 @@ This file may be included by: #include #elif defined(CONFIG_ARM) /* Nothing yet to include */ -#elif defined(VXMICRO_ARCH_arc) +#elif defined(CONFIG_ARC) /* Nothing yet to include */ #else #error Arch not supported. diff --git a/include/section_tags.h b/include/section_tags.h index 367031d7eeb..8078cb11138 100644 --- a/include/section_tags.h +++ b/include/section_tags.h @@ -60,7 +60,7 @@ _FILE_PATH_HASH, __COUNTER__) #endif /* CONFIG_GDB_INFO && !CONFIG_SW_ISR_TABLE */ -#elif defined(VXMICRO_ARCH_arc) +#elif defined(CONFIG_ARC) #define __irq_vector_table \ __section(IRQ_VECTOR_TABLE, _FILE_PATH_HASH, __COUNTER__) @@ -68,7 +68,7 @@ #define __isr_table_section \ __section(ISR_TABLE_SECTION, _FILE_PATH_HASH, __COUNTER__) -#endif /* VXMICRO_ARCH_arc */ +#endif /* CONFIG_ARC */ #endif /* !_ASMLANGUAGE */ diff --git a/include/sections.h b/include/sections.h index e039662704a..8698102c9e3 100644 --- a/include/sections.h +++ b/include/sections.h @@ -79,7 +79,7 @@ #define GDB_STUB_IRQ_VECTOR_TABLE gdb_stub_irq_vector_table #endif /* CONFIG_GDB_INFO && !CONFIG_SW_ISR_TABLE */ -#elif defined(VXMICRO_ARCH_arc) +#elif defined(CONFIG_ARC) #ifdef CONFIG_SW_ISR_TABLE_DYNAMIC #define ISR_TABLE_SECTION DATA diff --git a/include/toolchain/common.h b/include/toolchain/common.h index 803b136a6ba..8dcc808d1f6 100644 --- a/include/toolchain/common.h +++ b/include/toolchain/common.h @@ -101,7 +101,7 @@ Macros to abstract compiler capabilities (common to all toolchains). #define PERFOPT_ALIGN .balign 4 #endif - #elif defined(VXMICRO_ARCH_arc) + #elif defined(CONFIG_ARC) #define PERFOPT_ALIGN .balign 4 diff --git a/include/toolchain/gcc.h b/include/toolchain/gcc.h index ffaeea29694..9506a2a5ac4 100644 --- a/include/toolchain/gcc.h +++ b/include/toolchain/gcc.h @@ -173,7 +173,7 @@ A##a: #define GDATA(sym) .global FUNC(sym); .type FUNC(sym),%object #define WTEXT(sym) .weak FUNC(sym); .type FUNC(sym),%function #define WDATA(sym) .weak FUNC(sym); .type FUNC(sym),%object -#elif defined(VXMICRO_ARCH_arc) +#elif defined(CONFIG_ARC) /* * Need to use assembly macros because ';' is interpreted as the start of * a single line comment in the ARC assembler. @@ -191,7 +191,7 @@ A##a: #define GTEXT(sym) glbl_text sym #define GDATA(sym) glbl_data sym -#else /* !CONFIG_ARM && !VXMICRO_ARCH_arc */ +#else /* !CONFIG_ARM && !CONFIG_ARC */ #define GTEXT(sym) .globl FUNC(sym); .type FUNC(sym),@function #define GDATA(sym) .globl FUNC(sym); .type FUNC(sym),@object #endif @@ -206,7 +206,7 @@ A##a: * if all functions in the sub-section are not referenced. */ -#if defined(VXMICRO_ARCH_arc) +#if defined(CONFIG_ARC) /* * Need to use assembly macros because ';' is interpreted as the start of * a single line comment in the ARC assembler. @@ -238,7 +238,7 @@ A##a: #define SECTION_FUNC(sect, sym) section_func sect, sym #define SECTION_SUBSEC_FUNC(sect, subsec, sym) \ section_subsec_func sect, subsec, sym -#else /* !VXMICRO_ARCH_arc */ +#else /* !CONFIG_ARC */ #define SECTION_VAR(sect, sym) .section .sect.FUNC(sym); FUNC(sym): #define SECTION_FUNC(sect, sym) \ @@ -249,7 +249,7 @@ A##a: #define SECTION_SUBSEC_FUNC(sect, subsec, sym) \ .section .sect.subsec, "ax"; PERFOPT_ALIGN; FUNC(sym): -#endif /* VXMICRO_ARCH_arc */ +#endif /* CONFIG_ARC */ #endif /* _ASMLANGUAGE && !_LINKER */ @@ -294,7 +294,7 @@ A##a: ",%B0" \ "\n\t.type\t" #name ",%%object" : : "n"(~(value))) -#elif defined(CONFIG_X86_32) || defined(VXMICRO_ARCH_arc) +#elif defined(CONFIG_X86_32) || defined(CONFIG_ARC) #define GEN_ABSOLUTE_SYM(name, value) \ __asm__(".globl\t" #name "\n\t.equ\t" #name \