diff --git a/arch/arm/src/cxd56xx/Make.defs b/arch/arm/src/cxd56xx/Make.defs index 4f56e6e8348..1c386a0160b 100644 --- a/arch/arm/src/cxd56xx/Make.defs +++ b/arch/arm/src/cxd56xx/Make.defs @@ -25,12 +25,6 @@ ifneq ($(CONFIG_CXD56_TESTSET),y) CMN_ASRCS += arm_testset.S endif -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c CMN_CSRCS += arm_createstack.c arm_exit.c CMN_CSRCS += arm_initialize.c arm_initialstate.c arm_interruptcontext.c diff --git a/arch/arm/src/efm32/Make.defs b/arch/arm/src/efm32/Make.defs index 8d01f12eaf8..2f763950eb1 100644 --- a/arch/arm/src/efm32/Make.defs +++ b/arch/arm/src/efm32/Make.defs @@ -21,12 +21,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c CMN_CSRCS += arm_createstack.c arm_doirq.c arm_exit.c arm_hardfault.c CMN_CSRCS += arm_initialize.c arm_initialstate.c arm_interruptcontext.c diff --git a/arch/arm/src/eoss3/Make.defs b/arch/arm/src/eoss3/Make.defs index c87c37f898c..3e2bc2f3257 100644 --- a/arch/arm/src/eoss3/Make.defs +++ b/arch/arm/src/eoss3/Make.defs @@ -21,12 +21,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c CMN_CSRCS += arm_createstack.c arm_doirq.c arm_exit.c arm_hardfault.c CMN_CSRCS += arm_initialize.c arm_initialstate.c arm_interruptcontext.c diff --git a/arch/arm/src/imxrt/Make.defs b/arch/arm/src/imxrt/Make.defs index c81024897c4..497c1dc8659 100644 --- a/arch/arm/src/imxrt/Make.defs +++ b/arch/arm/src/imxrt/Make.defs @@ -23,12 +23,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c CMN_CSRCS += arm_createstack.c arm_mdelay.c arm_udelay.c arm_exit.c CMN_CSRCS += arm_initialize.c arm_initialstate.c arm_interruptcontext.c diff --git a/arch/arm/src/kinetis/Make.defs b/arch/arm/src/kinetis/Make.defs index daf57024d1a..0f2fd14063d 100644 --- a/arch/arm/src/kinetis/Make.defs +++ b/arch/arm/src/kinetis/Make.defs @@ -21,12 +21,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_mdelay.c arm_udelay.c arm_exit.c arm_initialize.c arm_memfault.c CMN_CSRCS += arm_initialstate.c arm_interruptcontext.c arm_modifyreg8.c diff --git a/arch/arm/src/lc823450/Make.defs b/arch/arm/src/lc823450/Make.defs index 9cf4e14b8de..74e92be97bd 100644 --- a/arch/arm/src/lc823450/Make.defs +++ b/arch/arm/src/lc823450/Make.defs @@ -21,12 +21,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c CMN_CSRCS += arm_createstack.c arm_mdelay.c arm_udelay.c arm_exit.c CMN_CSRCS += arm_initialize.c arm_initialstate.c arm_interruptcontext.c diff --git a/arch/arm/src/lpc17xx_40xx/Make.defs b/arch/arm/src/lpc17xx_40xx/Make.defs index 67306c6537c..96b01fd0b84 100644 --- a/arch/arm/src/lpc17xx_40xx/Make.defs +++ b/arch/arm/src/lpc17xx_40xx/Make.defs @@ -23,12 +23,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_mdelay.c arm_udelay.c arm_exit.c arm_initialize.c arm_memfault.c CMN_CSRCS += arm_initialstate.c arm_interruptcontext.c arm_modifyreg8.c diff --git a/arch/arm/src/lpc43xx/Make.defs b/arch/arm/src/lpc43xx/Make.defs index f6b9ce52b59..05d8ba44de9 100644 --- a/arch/arm/src/lpc43xx/Make.defs +++ b/arch/arm/src/lpc43xx/Make.defs @@ -21,12 +21,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_doirq.c arm_exit.c arm_hardfault.c arm_initialize.c CMN_CSRCS += arm_initialstate.c arm_interruptcontext.c arm_mdelay.c diff --git a/arch/arm/src/lpc54xx/Make.defs b/arch/arm/src/lpc54xx/Make.defs index 78ae58554b8..d40a65d3a14 100644 --- a/arch/arm/src/lpc54xx/Make.defs +++ b/arch/arm/src/lpc54xx/Make.defs @@ -21,12 +21,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_doirq.c arm_exit.c arm_hardfault.c arm_initialize.c CMN_CSRCS += arm_initialstate.c arm_interruptcontext.c arm_mdelay.c diff --git a/arch/arm/src/max326xx/Make.defs b/arch/arm/src/max326xx/Make.defs index 9ec61cc2117..628bcdd0518 100644 --- a/arch/arm/src/max326xx/Make.defs +++ b/arch/arm/src/max326xx/Make.defs @@ -23,12 +23,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c CMN_CSRCS += arm_createstack.c arm_doirq.c arm_exit.c arm_hardfault.c CMN_CSRCS += arm_initialize.c arm_initialstate.c arm_interruptcontext.c diff --git a/arch/arm/src/nrf52/Make.defs b/arch/arm/src/nrf52/Make.defs index de8eccb18af..70e3d7415f3 100644 --- a/arch/arm/src/nrf52/Make.defs +++ b/arch/arm/src/nrf52/Make.defs @@ -36,12 +36,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c CMN_CSRCS += arm_createstack.c arm_doirq.c arm_exit.c arm_hardfault.c CMN_CSRCS += arm_initialize.c arm_initialstate.c arm_interruptcontext.c diff --git a/arch/arm/src/s32k1xx/s32k14x/Make.defs b/arch/arm/src/s32k1xx/s32k14x/Make.defs index 124d8ef2be7..c36764c085c 100644 --- a/arch/arm/src/s32k1xx/s32k14x/Make.defs +++ b/arch/arm/src/s32k1xx/s32k14x/Make.defs @@ -23,12 +23,6 @@ CMN_ASRCS += arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS += arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_doirq.c arm_hardfault.c arm_initialstate.c arm_memfault.c CMN_CSRCS += arm_releasepending.c arm_reprioritizertr.c arm_schedulesigaction.c diff --git a/arch/arm/src/sam34/Make.defs b/arch/arm/src/sam34/Make.defs index c36dacbae71..2aa370ec183 100644 --- a/arch/arm/src/sam34/Make.defs +++ b/arch/arm/src/sam34/Make.defs @@ -25,12 +25,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_doirq.c arm_exit.c arm_hardfault.c arm_initialize.c CMN_CSRCS += arm_initialstate.c arm_interruptcontext.c arm_mdelay.c diff --git a/arch/arm/src/samd5e5/Make.defs b/arch/arm/src/samd5e5/Make.defs index bae8c0763c2..1750513a0d3 100644 --- a/arch/arm/src/samd5e5/Make.defs +++ b/arch/arm/src/samd5e5/Make.defs @@ -25,12 +25,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_allocateheap.c arm_assert.c arm_blocktask.c arm_copyfullstate.c CMN_CSRCS += arm_createstack.c arm_exit.c arm_initialize.c arm_initialstate.c CMN_CSRCS += arm_interruptcontext.c arm_mdelay.c arm_memfault.c arm_modifyreg8.c diff --git a/arch/arm/src/samv7/Make.defs b/arch/arm/src/samv7/Make.defs index 40ee009d283..a49c36982d2 100644 --- a/arch/arm/src/samv7/Make.defs +++ b/arch/arm/src/samv7/Make.defs @@ -26,12 +26,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_doirq.c arm_exit.c arm_hardfault.c arm_initialize.c CMN_CSRCS += arm_initialstate.c arm_interruptcontext.c arm_mdelay.c diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs index 8472e7148c5..76010371cfc 100644 --- a/arch/arm/src/stm32/Make.defs +++ b/arch/arm/src/stm32/Make.defs @@ -21,12 +21,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_exit.c arm_hardfault.c arm_initialize.c arm_initialstate.c CMN_CSRCS += arm_interruptcontext.c arm_memfault.c arm_modifyreg8.c diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs index cf462c69d28..94bb4632687 100644 --- a/arch/arm/src/stm32f7/Make.defs +++ b/arch/arm/src/stm32f7/Make.defs @@ -26,12 +26,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_doirq.c arm_exit.c arm_hardfault.c arm_initialize.c CMN_CSRCS += arm_initialstate.c arm_interruptcontext.c arm_mdelay.c diff --git a/arch/arm/src/stm32h7/Make.defs b/arch/arm/src/stm32h7/Make.defs index 702307a8a2a..d401d0625fd 100644 --- a/arch/arm/src/stm32h7/Make.defs +++ b/arch/arm/src/stm32h7/Make.defs @@ -26,12 +26,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_doirq.c arm_exit.c arm_hardfault.c arm_initialize.c CMN_CSRCS += arm_initialstate.c arm_interruptcontext.c arm_mdelay.c arm_memfault.c diff --git a/arch/arm/src/stm32l4/Make.defs b/arch/arm/src/stm32l4/Make.defs index 79463daa6a2..59051e66e5e 100644 --- a/arch/arm/src/stm32l4/Make.defs +++ b/arch/arm/src/stm32l4/Make.defs @@ -26,12 +26,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_doirq.c arm_exit.c arm_hardfault.c arm_initialize.c CMN_CSRCS += arm_initialstate.c arm_interruptcontext.c arm_mdelay.c arm_memfault.c diff --git a/arch/arm/src/stm32l5/Make.defs b/arch/arm/src/stm32l5/Make.defs index 179baee9325..ec53d494b9e 100644 --- a/arch/arm/src/stm32l5/Make.defs +++ b/arch/arm/src/stm32l5/Make.defs @@ -31,12 +31,6 @@ CMN_UCSRCS = CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_doirq.c arm_exit.c arm_hardfault.c arm_initialize.c CMN_CSRCS += arm_initialstate.c arm_interruptcontext.c arm_mdelay.c arm_memfault.c diff --git a/arch/arm/src/tiva/Make.defs b/arch/arm/src/tiva/Make.defs index aebee354392..272de114aa8 100644 --- a/arch/arm/src/tiva/Make.defs +++ b/arch/arm/src/tiva/Make.defs @@ -21,12 +21,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_doirq.c arm_exit.c arm_hardfault.c arm_initialize.c CMN_CSRCS += arm_initialstate.c arm_interruptcontext.c arm_mdelay.c diff --git a/arch/arm/src/xmc4/Make.defs b/arch/arm/src/xmc4/Make.defs index 33d87387122..f9ea0450d1e 100644 --- a/arch/arm/src/xmc4/Make.defs +++ b/arch/arm/src/xmc4/Make.defs @@ -21,12 +21,6 @@ CMN_ASRCS = arm_saveusercontext.S arm_fullcontextrestore.S arm_switchcontext.S CMN_ASRCS += arm_testset.S arm_fetchadd.S vfork.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) -CMN_ASRCS += arm_setjmp.S -endif -endif - CMN_CSRCS = arm_assert.c arm_blocktask.c arm_copyfullstate.c arm_createstack.c CMN_CSRCS += arm_doirq.c arm_exit.c arm_initialize.c arm_initialstate.c CMN_CSRCS += arm_hardfault.c arm_interruptcontext.c arm_memfault.c arm_mdelay.c diff --git a/arch/risc-v/src/esp32c3/Make.defs b/arch/risc-v/src/esp32c3/Make.defs index b732b13f99a..25320983515 100644 --- a/arch/risc-v/src/esp32c3/Make.defs +++ b/arch/risc-v/src/esp32c3/Make.defs @@ -25,10 +25,6 @@ HEAD_ASRC = esp32c3_head.S CHIP_ASRCS = esp32c3_vectors.S esp32c3_interrupt.S riscv_syscall.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -CMN_ASRCS += riscv_setjmp.S -endif - # Specify C code within the common directory to be included CMN_CSRCS += riscv_initialize.c riscv_swint.c diff --git a/arch/risc-v/src/fe310/Make.defs b/arch/risc-v/src/fe310/Make.defs index 4a4e1f88ff0..88874a9def5 100644 --- a/arch/risc-v/src/fe310/Make.defs +++ b/arch/risc-v/src/fe310/Make.defs @@ -25,10 +25,6 @@ HEAD_ASRC = fe310_vectors.S # Specify our general Assembly files CHIP_ASRCS = fe310_head.S riscv_syscall.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -CMN_ASRCS += riscv_setjmp.S -endif - # Specify C code within the common directory to be included CMN_CSRCS += riscv_initialize.c riscv_swint.c CMN_CSRCS += riscv_allocateheap.c riscv_createstack.c riscv_exit.c diff --git a/arch/risc-v/src/k210/Make.defs b/arch/risc-v/src/k210/Make.defs index 3c7711197cc..5c5cb22de5f 100644 --- a/arch/risc-v/src/k210/Make.defs +++ b/arch/risc-v/src/k210/Make.defs @@ -27,10 +27,6 @@ CHIP_ASRCS = k210_head.S CMN_ASRCS += riscv_testset.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -CMN_ASRCS += riscv_setjmp.S -endif - # Specify C code within the common directory to be included CMN_CSRCS += riscv_initialize.c riscv_swint.c CMN_CSRCS += riscv_allocateheap.c riscv_createstack.c riscv_exit.c riscv_fault.c diff --git a/arch/risc-v/src/litex/Make.defs b/arch/risc-v/src/litex/Make.defs index 3c1bb1556d0..5b39519237e 100644 --- a/arch/risc-v/src/litex/Make.defs +++ b/arch/risc-v/src/litex/Make.defs @@ -25,10 +25,6 @@ HEAD_ASRC = litex_vectors.S # Specify our general Assembly files CHIP_ASRCS = litex_head.S riscv_syscall.S -ifeq ($(CONFIG_ARCH_SETJMP_H),y) -CMN_ASRCS += riscv_setjmp.S -endif - # Specify C code within the common directory to be included CMN_CSRCS += riscv_initialize.c riscv_swint.c CMN_CSRCS += riscv_allocateheap.c riscv_createstack.c riscv_exit.c diff --git a/libs/libc/machine/arm/armv7-m/Make.defs b/libs/libc/machine/arm/armv7-m/Make.defs index a70bc8a833c..324c61550a9 100644 --- a/libs/libc/machine/arm/armv7-m/Make.defs +++ b/libs/libc/machine/arm/armv7-m/Make.defs @@ -20,8 +20,6 @@ ifeq ($(CONFIG_ARMV7M_MEMCPY),y) ASRCS += arch_memcpy.S -DEPPATH += --dep-path machine/arm/armv7-m/gnu -VPATH += :machine/arm/armv7-m/gnu endif ifeq ($(CONFIG_LIBC_ARCH_ELF),y) @@ -38,5 +36,14 @@ CSRCS += arch_sqrtf.c endif endif +ifeq ($(CONFIG_ARCH_SETJMP_H),y) +ASRCS += arch_setjmp.S +endif + +ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) +DEPPATH += --dep-path machine/arm/armv7-m/gnu +VPATH += :machine/arm/armv7-m/gnu +endif + DEPPATH += --dep-path machine/arm/armv7-m VPATH += :machine/arm/armv7-m diff --git a/arch/arm/src/armv7-m/gnu/arm_setjmp.S b/libs/libc/machine/arm/armv7-m/gnu/arch_setjmp.S similarity index 98% rename from arch/arm/src/armv7-m/gnu/arm_setjmp.S rename to libs/libc/machine/arm/armv7-m/gnu/arch_setjmp.S index 56c177569d7..710d816c1a2 100644 --- a/arch/arm/src/armv7-m/gnu/arm_setjmp.S +++ b/libs/libc/machine/arm/armv7-m/gnu/arch_setjmp.S @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/armv7-m/gnu/arm_setjmp.S + * libs/libc/machine/arm/armv7-m/gnu/arm_setjmp.S * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/libs/libc/machine/arm/armv8-m/Make.defs b/libs/libc/machine/arm/armv8-m/Make.defs index 3f79b8f84a5..471d11e1f0a 100644 --- a/libs/libc/machine/arm/armv8-m/Make.defs +++ b/libs/libc/machine/arm/armv8-m/Make.defs @@ -74,5 +74,14 @@ endif endif # CONFIG_ARMV8M_LIBM +ifeq ($(CONFIG_ARCH_SETJMP_H),y) +ASRCS += arch_setjmp.S +endif + +ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y) +DEPPATH += --dep-path machine/arm/armv8-m/gnu +VPATH += :machine/arm/armv8-m/gnu +endif + DEPPATH += --dep-path machine/arm/armv8-m VPATH += :machine/arm/armv8-m diff --git a/arch/arm/src/armv8-m/arm_setjmp.S b/libs/libc/machine/arm/armv8-m/gnu/arch_setjmp.S similarity index 98% rename from arch/arm/src/armv8-m/arm_setjmp.S rename to libs/libc/machine/arm/armv8-m/gnu/arch_setjmp.S index cdefff75f64..6dcb0b6d2d6 100644 --- a/arch/arm/src/armv8-m/arm_setjmp.S +++ b/libs/libc/machine/arm/armv8-m/gnu/arch_setjmp.S @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/armv8-m/arm_setjmp.S + * libs/libc/machine/arm/armv8-m/gnu/arm_setjmp.S * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/libs/libc/machine/risc-v/Make.defs b/libs/libc/machine/risc-v/Make.defs index 1129f41df54..66109f3704c 100644 --- a/libs/libc/machine/risc-v/Make.defs +++ b/libs/libc/machine/risc-v/Make.defs @@ -18,11 +18,7 @@ # ############################################################################ -ifeq ($(CONFIG_LIBC_ARCH_ELF),y) -CSRCS += arch_elf.c -DEPPATH += --dep-path machine/risc-v/common -VPATH += :machine/risc-v/common -endif +include $(TOPDIR)/libs/libc/machine/risc-v/common/Make.defs ifeq ($(CONFIG_ARCH_RV64GC),y) include $(TOPDIR)/libs/libc/machine/risc-v/rv64/Make.defs diff --git a/libs/libc/machine/risc-v/common/Make.defs b/libs/libc/machine/risc-v/common/Make.defs new file mode 100644 index 00000000000..a046a1f492f --- /dev/null +++ b/libs/libc/machine/risc-v/common/Make.defs @@ -0,0 +1,30 @@ +############################################################################ +# libs/libc/machine/risc-v/common/Make.defs +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +ifeq ($(CONFIG_LIBC_ARCH_ELF),y) +CSRCS += arch_elf.c +endif + +ifeq ($(CONFIG_ARCH_SETJMP_H),y) +ASRCS += arch_setjmp.S +endif + +DEPPATH += --dep-path machine/risc-v/common +VPATH += :machine/risc-v/common diff --git a/arch/risc-v/src/common/riscv_setjmp.S b/libs/libc/machine/risc-v/common/arch_setjmp.S similarity index 97% rename from arch/risc-v/src/common/riscv_setjmp.S rename to libs/libc/machine/risc-v/common/arch_setjmp.S index dca84d9e685..fea415e011a 100644 --- a/arch/risc-v/src/common/riscv_setjmp.S +++ b/libs/libc/machine/risc-v/common/arch_setjmp.S @@ -1,5 +1,5 @@ ############################################################################ -# arch/risc-v/src/common/riscv_setjmp.S +# libs/libc/machine/risc-v/common/arch_setjmp.S # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with