From ee659ae1a1de7896528d3a4ad3f69f7d0d96c2d8 Mon Sep 17 00:00:00 2001 From: Benjamin Walsh Date: Sun, 22 Jan 2017 18:06:10 -0500 Subject: [PATCH] build: add _ASMLANGUAGE to all asm files This avoids asm files from having to explicitly define the _ASMLANGUAGE symbol themselves. Change-Id: I71f5a169f75d7443a58a0365a41c55b20dae3029 Signed-off-by: Benjamin Walsh --- Makefile | 2 +- arch/arc/core/atomic.S | 2 -- arch/arc/core/cpu_idle.S | 2 -- arch/arc/core/fast_irq.S | 2 -- arch/arc/core/fault_s.S | 2 -- arch/arc/core/isr_wrapper.S | 2 -- arch/arc/core/regular_irq.S | 2 -- arch/arc/core/reset.S | 2 -- arch/arc/core/sw_isr_table.S | 2 -- arch/arc/core/swap.S | 2 -- arch/arc/core/thread_entry_wrapper.S | 2 -- arch/arc/soc/quark_se_c1000_ss/soc_power.S | 2 -- arch/arm/core/cortex_m/nmi_on_reset.S | 2 -- arch/arm/core/cortex_m/reset.S | 2 -- arch/arm/core/cortex_m/sw_isr_table.S | 2 -- arch/arm/core/cortex_m/vector_table.S | 2 -- arch/arm/core/cpu_idle.S | 2 -- arch/arm/core/exc_exit.S | 2 -- arch/arm/core/fault_s.S | 2 -- arch/arm/core/isr_wrapper.S | 2 -- arch/arm/core/swap.S | 2 -- arch/arm/soc/nxp_kinetis/k6x/wdog.S | 2 -- arch/nios2/core/crt0.S | 1 - arch/nios2/core/exception.S | 1 - arch/nios2/core/reset.S | 2 -- arch/nios2/core/sw_isr_table.S | 2 -- arch/nios2/core/swap.S | 1 - arch/riscv32/core/isr.S | 2 -- arch/riscv32/core/reset.S | 1 - arch/riscv32/core/sw_isr_table.S | 2 -- arch/riscv32/core/swap.S | 1 - arch/riscv32/soc/pulpino/soc_irq.S | 2 -- arch/riscv32/soc/pulpino/vector.S | 2 -- arch/riscv32/soc/riscv32-qemu/soc_irq.S | 2 -- arch/riscv32/soc/riscv32-qemu/vector.S | 2 -- arch/x86/core/cache_s.S | 1 - arch/x86/core/crt0.S | 2 -- arch/x86/core/excstub.S | 2 -- arch/x86/core/intstub.S | 2 -- arch/x86/core/swap.S | 2 -- arch/x86/debug/gdb_dbg_regs.S | 2 -- arch/x86/soc/intel_quark/quark_se/soc_power.S | 2 -- drivers/interrupt_controller/loapic_spurious.S | 2 -- tests/legacy/kernel/test_mem_safe/src/asm_x86.S | 1 - .../legacy/kernel/test_static_idt/microkernel/src/test_stubs.S | 2 -- tests/legacy/kernel/test_static_idt/nanokernel/src/test_stubs.S | 2 -- 46 files changed, 1 insertion(+), 84 deletions(-) diff --git a/Makefile b/Makefile index 71ad2c8a380..627d11a480e 100644 --- a/Makefile +++ b/Makefile @@ -399,7 +399,7 @@ KBUILD_CXXFLAGS := -c -g -std=c++11 \ -ffunction-sections -fdata-sections \ -fno-rtti -fno-exceptions -KBUILD_AFLAGS := -c -g -xassembler-with-cpp +KBUILD_AFLAGS := -c -g -xassembler-with-cpp -D_ASMLANGUAGE LDFLAGS += $(call ld-option,-nostartfiles) LDFLAGS += $(call ld-option,-nodefaultlibs) diff --git a/arch/arc/core/atomic.S b/arch/arc/core/atomic.S index 6c642500ee0..beab8bf016a 100644 --- a/arch/arc/core/atomic.S +++ b/arch/arc/core/atomic.S @@ -16,8 +16,6 @@ * where they are not supported on ARC EM family processors. */ -#define _ASMLANGUAGE - #include #include diff --git a/arch/arc/core/cpu_idle.S b/arch/arc/core/cpu_idle.S index 6a7f1240262..dd764edf90b 100644 --- a/arch/arc/core/cpu_idle.S +++ b/arch/arc/core/cpu_idle.S @@ -11,8 +11,6 @@ * CPU power management routines. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arc/core/fast_irq.S b/arch/arc/core/fast_irq.S index ec9e431e1f8..01b44f6fafa 100644 --- a/arch/arc/core/fast_irq.S +++ b/arch/arc/core/fast_irq.S @@ -13,8 +13,6 @@ * See isr_wrapper.S for details. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arc/core/fault_s.S b/arch/arc/core/fault_s.S index 22e540fc350..a87c0b7bd5b 100644 --- a/arch/arc/core/fault_s.S +++ b/arch/arc/core/fault_s.S @@ -11,8 +11,6 @@ * Fault handlers for ARCv2 processors. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arc/core/isr_wrapper.S b/arch/arc/core/isr_wrapper.S index 0daca7acb16..035add0526c 100644 --- a/arch/arc/core/isr_wrapper.S +++ b/arch/arc/core/isr_wrapper.S @@ -13,8 +13,6 @@ * a parameter. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arc/core/regular_irq.S b/arch/arc/core/regular_irq.S index 506732d7e44..8f4a5d615f1 100644 --- a/arch/arc/core/regular_irq.S +++ b/arch/arc/core/regular_irq.S @@ -14,8 +14,6 @@ * See isr_wrapper.S for details. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arc/core/reset.S b/arch/arc/core/reset.S index 70efb087ec4..ac48a3c4233 100644 --- a/arch/arc/core/reset.S +++ b/arch/arc/core/reset.S @@ -11,8 +11,6 @@ * Reset handler that prepares the system for running C code. */ -#define _ASMLANGUAGE - // #include #include #include diff --git a/arch/arc/core/sw_isr_table.S b/arch/arc/core/sw_isr_table.S index ae42bf2adcd..868bd72b9e7 100644 --- a/arch/arc/core/sw_isr_table.S +++ b/arch/arc/core/sw_isr_table.S @@ -6,8 +6,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arc/core/swap.S b/arch/arc/core/swap.S index 11e3e5a03d6..63278b1cf97 100644 --- a/arch/arc/core/swap.S +++ b/arch/arc/core/swap.S @@ -14,8 +14,6 @@ * See isr_wrapper.S for details. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arc/core/thread_entry_wrapper.S b/arch/arc/core/thread_entry_wrapper.S index 97e78509848..f4c2ae4a731 100644 --- a/arch/arc/core/thread_entry_wrapper.S +++ b/arch/arc/core/thread_entry_wrapper.S @@ -11,8 +11,6 @@ * Wrapper for _thread_entry routine when called from the initial context. */ -#define _ASMLANGUAGE - #include #include diff --git a/arch/arc/soc/quark_se_c1000_ss/soc_power.S b/arch/arc/soc/quark_se_c1000_ss/soc_power.S index ecbef056798..0b9e3356342 100644 --- a/arch/arc/soc/quark_se_c1000_ss/soc_power.S +++ b/arch/arc/soc/quark_se_c1000_ss/soc_power.S @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arm/core/cortex_m/nmi_on_reset.S b/arch/arm/core/cortex_m/nmi_on_reset.S index 7df5bc93fe7..2710d85ead9 100644 --- a/arch/arm/core/cortex_m/nmi_on_reset.S +++ b/arch/arm/core/cortex_m/nmi_on_reset.S @@ -15,8 +15,6 @@ * rebooting might trigger the exact same problem over and over. */ -#define _ASMLANGUAGE - #include #include diff --git a/arch/arm/core/cortex_m/reset.S b/arch/arm/core/cortex_m/reset.S index 5c60f48a10e..286122505e0 100644 --- a/arch/arm/core/cortex_m/reset.S +++ b/arch/arm/core/cortex_m/reset.S @@ -11,8 +11,6 @@ * Reset handler that prepares the system for running C code. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arm/core/cortex_m/sw_isr_table.S b/arch/arm/core/cortex_m/sw_isr_table.S index b440c37f3d8..486b91a0342 100644 --- a/arch/arm/core/cortex_m/sw_isr_table.S +++ b/arch/arm/core/cortex_m/sw_isr_table.S @@ -11,8 +11,6 @@ * Software ISR table for ARM */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arm/core/cortex_m/vector_table.S b/arch/arm/core/cortex_m/vector_table.S index ea58412133b..437aca0411a 100644 --- a/arch/arm/core/cortex_m/vector_table.S +++ b/arch/arm/core/cortex_m/vector_table.S @@ -16,8 +16,6 @@ * rest should not be triggered until the kernel is ready to handle them. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arm/core/cpu_idle.S b/arch/arm/core/cpu_idle.S index 0360bb8fa7a..43a96383458 100644 --- a/arch/arm/core/cpu_idle.S +++ b/arch/arm/core/cpu_idle.S @@ -10,8 +10,6 @@ * */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arm/core/exc_exit.S b/arch/arm/core/exc_exit.S index faa00dfdce5..1e19e597ff8 100644 --- a/arch/arm/core/exc_exit.S +++ b/arch/arm/core/exc_exit.S @@ -14,8 +14,6 @@ * wrapped around by _isr_wrapper()). */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arm/core/fault_s.S b/arch/arm/core/fault_s.S index 01748bcba3d..9109a792b71 100644 --- a/arch/arm/core/fault_s.S +++ b/arch/arm/core/fault_s.S @@ -11,8 +11,6 @@ * Fault handlers for ARM Cortex-M processors. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arm/core/isr_wrapper.S b/arch/arm/core/isr_wrapper.S index 01cb9b032c9..a56aa1f1586 100644 --- a/arch/arm/core/isr_wrapper.S +++ b/arch/arm/core/isr_wrapper.S @@ -12,8 +12,6 @@ * a parameter. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arm/core/swap.S b/arch/arm/core/swap.S index dd091254611..de321df373d 100644 --- a/arch/arm/core/swap.S +++ b/arch/arm/core/swap.S @@ -12,8 +12,6 @@ * on ARM Cortex-M3/M4 CPUs. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/arm/soc/nxp_kinetis/k6x/wdog.S b/arch/arm/soc/nxp_kinetis/k6x/wdog.S index 56db546588d..3a08bc81193 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/wdog.S +++ b/arch/arm/soc/nxp_kinetis/k6x/wdog.S @@ -11,8 +11,6 @@ * This module initializes the watchdog for the fsl_frdm_k64f platform. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/nios2/core/crt0.S b/arch/nios2/core/crt0.S index 5aece89cd21..21ffa7b2ea0 100644 --- a/arch/nios2/core/crt0.S +++ b/arch/nios2/core/crt0.S @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE #include #include diff --git a/arch/nios2/core/exception.S b/arch/nios2/core/exception.S index 618d59e3e85..58edec60115 100644 --- a/arch/nios2/core/exception.S +++ b/arch/nios2/core/exception.S @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE #include #include #include diff --git a/arch/nios2/core/reset.S b/arch/nios2/core/reset.S index eb0ca7f5672..8c2719cec22 100644 --- a/arch/nios2/core/reset.S +++ b/arch/nios2/core/reset.S @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/nios2/core/sw_isr_table.S b/arch/nios2/core/sw_isr_table.S index 34b59c1e38a..47488c641d6 100644 --- a/arch/nios2/core/sw_isr_table.S +++ b/arch/nios2/core/sw_isr_table.S @@ -6,8 +6,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/nios2/core/swap.S b/arch/nios2/core/swap.S index eade327f27a..f3e126fad68 100644 --- a/arch/nios2/core/swap.S +++ b/arch/nios2/core/swap.S @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE #include #include #include diff --git a/arch/riscv32/core/isr.S b/arch/riscv32/core/isr.S index 673fc5c70c4..0872433135b 100644 --- a/arch/riscv32/core/isr.S +++ b/arch/riscv32/core/isr.S @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/riscv32/core/reset.S b/arch/riscv32/core/reset.S index 0cc022ae11c..73a359497de 100644 --- a/arch/riscv32/core/reset.S +++ b/arch/riscv32/core/reset.S @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE #include /* exports */ diff --git a/arch/riscv32/core/sw_isr_table.S b/arch/riscv32/core/sw_isr_table.S index 713ba641d3e..ce1a6752045 100644 --- a/arch/riscv32/core/sw_isr_table.S +++ b/arch/riscv32/core/sw_isr_table.S @@ -6,8 +6,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/riscv32/core/swap.S b/arch/riscv32/core/swap.S index 05453f446a7..1d18f811fb5 100644 --- a/arch/riscv32/core/swap.S +++ b/arch/riscv32/core/swap.S @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE #include #include #include diff --git a/arch/riscv32/soc/pulpino/soc_irq.S b/arch/riscv32/soc/pulpino/soc_irq.S index f702c1f35d6..9312ef4dc35 100644 --- a/arch/riscv32/soc/pulpino/soc_irq.S +++ b/arch/riscv32/soc/pulpino/soc_irq.S @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/riscv32/soc/pulpino/vector.S b/arch/riscv32/soc/pulpino/vector.S index 43f19bc3c3d..309e38ed772 100644 --- a/arch/riscv32/soc/pulpino/vector.S +++ b/arch/riscv32/soc/pulpino/vector.S @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE - #include /* imports */ diff --git a/arch/riscv32/soc/riscv32-qemu/soc_irq.S b/arch/riscv32/soc/riscv32-qemu/soc_irq.S index bb80a2cb686..fa42b93f455 100644 --- a/arch/riscv32/soc/riscv32-qemu/soc_irq.S +++ b/arch/riscv32/soc/riscv32-qemu/soc_irq.S @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/riscv32/soc/riscv32-qemu/vector.S b/arch/riscv32/soc/riscv32-qemu/vector.S index 9d4dffe801c..a99eff02185 100644 --- a/arch/riscv32/soc/riscv32-qemu/vector.S +++ b/arch/riscv32/soc/riscv32-qemu/vector.S @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE - #include /* imports */ diff --git a/arch/x86/core/cache_s.S b/arch/x86/core/cache_s.S index bbf9966ac39..c2c99fc64fb 100644 --- a/arch/x86/core/cache_s.S +++ b/arch/x86/core/cache_s.S @@ -10,7 +10,6 @@ * This module contains functions for manipulating caches. */ -#define _ASMLANGUAGE #include #ifndef CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED diff --git a/arch/x86/core/crt0.S b/arch/x86/core/crt0.S index 828fced210d..487d55b5981 100644 --- a/arch/x86/core/crt0.S +++ b/arch/x86/core/crt0.S @@ -11,8 +11,6 @@ * after having been loaded into RAM. */ -#define _ASMLANGUAGE - #include /* exports (private APIs) */ diff --git a/arch/x86/core/excstub.S b/arch/x86/core/excstub.S index aa22c27f351..540c0cc3eab 100644 --- a/arch/x86/core/excstub.S +++ b/arch/x86/core/excstub.S @@ -14,8 +14,6 @@ * and exiting a C exception handler. */ -#define _ASMLANGUAGE - #include #include #include /* For MK_ISR_NAME */ diff --git a/arch/x86/core/intstub.S b/arch/x86/core/intstub.S index ddd8b04dc43..3caed0fafa3 100644 --- a/arch/x86/core/intstub.S +++ b/arch/x86/core/intstub.S @@ -14,8 +14,6 @@ * entering and exiting a C interrupt handler. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/x86/core/swap.S b/arch/x86/core/swap.S index 8286c8c736b..06d66b1b963 100644 --- a/arch/x86/core/swap.S +++ b/arch/x86/core/swap.S @@ -17,8 +17,6 @@ * save frame on the stack. */ -#define _ASMLANGUAGE - #include #include #include diff --git a/arch/x86/debug/gdb_dbg_regs.S b/arch/x86/debug/gdb_dbg_regs.S index ee780173c00..5bbede3b684 100644 --- a/arch/x86/debug/gdb_dbg_regs.S +++ b/arch/x86/debug/gdb_dbg_regs.S @@ -11,8 +11,6 @@ * utilities. */ -#define _ASMLANGUAGE - #include /* exports (internal APIs) */ diff --git a/arch/x86/soc/intel_quark/quark_se/soc_power.S b/arch/x86/soc/intel_quark/quark_se/soc_power.S index dda0c412080..257e506fbcd 100644 --- a/arch/x86/soc/intel_quark/quark_se/soc_power.S +++ b/arch/x86/soc/intel_quark/quark_se/soc_power.S @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define _ASMLANGUAGE - #include #ifdef CONFIG_SYS_POWER_DEEP_SLEEP diff --git a/drivers/interrupt_controller/loapic_spurious.S b/drivers/interrupt_controller/loapic_spurious.S index f923e859c57..9b49c1fa71e 100644 --- a/drivers/interrupt_controller/loapic_spurious.S +++ b/drivers/interrupt_controller/loapic_spurious.S @@ -9,8 +9,6 @@ * @brief LOAPIC spurioys interrupt handler */ -#define _ASMLANGUAGE - #include #include diff --git a/tests/legacy/kernel/test_mem_safe/src/asm_x86.S b/tests/legacy/kernel/test_mem_safe/src/asm_x86.S index a1e85189c05..c3dce5cfd14 100644 --- a/tests/legacy/kernel/test_mem_safe/src/asm_x86.S +++ b/tests/legacy/kernel/test_mem_safe/src/asm_x86.S @@ -9,7 +9,6 @@ * @ brief architecture specific support for the mem_probe tests */ -#define _ASMLANGUAGE #include GDATA(foo) diff --git a/tests/legacy/kernel/test_static_idt/microkernel/src/test_stubs.S b/tests/legacy/kernel/test_static_idt/microkernel/src/test_stubs.S index 69fd54621c4..9dc3490486a 100644 --- a/tests/legacy/kernel/test_static_idt/microkernel/src/test_stubs.S +++ b/tests/legacy/kernel/test_static_idt/microkernel/src/test_stubs.S @@ -12,8 +12,6 @@ This module implements assembler exception and interrupt stubs for regression testing. */ -#define _ASMLANGUAGE - #ifdef CONFIG_ISA_IA32 /* IA-32 specific */ diff --git a/tests/legacy/kernel/test_static_idt/nanokernel/src/test_stubs.S b/tests/legacy/kernel/test_static_idt/nanokernel/src/test_stubs.S index 69fd54621c4..9dc3490486a 100644 --- a/tests/legacy/kernel/test_static_idt/nanokernel/src/test_stubs.S +++ b/tests/legacy/kernel/test_static_idt/nanokernel/src/test_stubs.S @@ -12,8 +12,6 @@ This module implements assembler exception and interrupt stubs for regression testing. */ -#define _ASMLANGUAGE - #ifdef CONFIG_ISA_IA32 /* IA-32 specific */