diff --git a/arch/arm/src/common/CMakeLists.txt b/arch/arm/src/common/CMakeLists.txt index 77cb13a4d06..f84143fcaf9 100644 --- a/arch/arm/src/common/CMakeLists.txt +++ b/arch/arm/src/common/CMakeLists.txt @@ -92,8 +92,4 @@ if(CONFIG_ARCH_HAVE_FETCHADD) list(APPEND SRCS ${ARCH_TOOLCHAIN_PATH}/arm_fetchadd.S) endif() -if(CONFIG_ARCH_TOOLCHAIN_GHS) - list(APPEND SRCS ghs/lib_dummy.c) -endif() - target_sources(arch PRIVATE ${SRCS}) diff --git a/arch/arm/src/common/Make.defs b/arch/arm/src/common/Make.defs index e11a42a84b8..c0722eb1f51 100644 --- a/arch/arm/src/common/Make.defs +++ b/arch/arm/src/common/Make.defs @@ -81,7 +81,3 @@ CMN_ASRCS += fork.S ifeq ($(CONFIG_ARCH_HAVE_FETCHADD),y) CMN_ASRCS += arm_fetchadd.S endif - -ifeq ($(CONFIG_ARCH_TOOLCHAIN_GHS),y) - CMN_CSRCS += ghs/lib_dummy.c -endif diff --git a/libs/libc/machine/arm/CMakeLists.txt b/libs/libc/machine/arm/CMakeLists.txt index a9e7cf12efa..8acbe20e7ef 100644 --- a/libs/libc/machine/arm/CMakeLists.txt +++ b/libs/libc/machine/arm/CMakeLists.txt @@ -52,6 +52,10 @@ if(NOT CONFIG_LIBSUPCXX_TOOLCHAIN) list(APPEND SRCS arch_atexit.c) endif() +if(CONFIG_ARCH_TOOLCHAIN_GHS) + list(APPEND SRCS arch_dummy.c) +endif() + if(CONFIG_CXX_EXCEPTION) list(APPEND SRCS arch_unwind_find_exidx.c) endif() diff --git a/libs/libc/machine/arm/Make.defs b/libs/libc/machine/arm/Make.defs index 575aa6a9982..8136bffacd6 100644 --- a/libs/libc/machine/arm/Make.defs +++ b/libs/libc/machine/arm/Make.defs @@ -50,6 +50,10 @@ ifneq ($(CONFIG_LIBSUPCXX_TOOLCHAIN),y) CSRCS += arch_atexit.c endif +ifeq ($(CONFIG_ARCH_TOOLCHAIN_GHS),y) + CMN_CSRCS += arch_dummy.c +endif + ifeq ($(CONFIG_CXX_EXCEPTION),y) CSRCS += arch_unwind_find_exidx.c endif diff --git a/arch/arm/src/common/ghs/lib_dummy.c b/libs/libc/machine/arm/arch_dummy.c similarity index 97% rename from arch/arm/src/common/ghs/lib_dummy.c rename to libs/libc/machine/arm/arch_dummy.c index 28ab005b522..fef27c127cf 100644 --- a/arch/arm/src/common/ghs/lib_dummy.c +++ b/libs/libc/machine/arm/arch_dummy.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/common/ghs/lib_dummy.c + * libs/libc/machine/arm/arch_dummy.c * * SPDX-License-Identifier: Apache-2.0 *