This is an automated email from the ASF dual-hosted git repository.
jiuzhudong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 5758364f101647f1c1e5a3d031c9c5e01fc3797b
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Sun Jun 22 14:29:36 2025 +0800
libc/machine/arm: Move all source files out of gnu folder
and unify the file prefix to arch_xxx.c
Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
libs/libc/machine/arm/CMakeLists.txt | 12 ++++++------
libs/libc/machine/arm/Make.defs | 11 +++--------
.../libc/machine/arm/{aeabi_atexit.c => arch_atexit.c} | 2 +-
libs/libc/machine/arm/{gnu/mcount.S => arch_mcount.S} | 2 +-
libs/libc/machine/arm/{gnu => }/arch_setjmp.S | 2 +-
...nu_unwind_find_exidx.c => arch_unwind_find_exidx.c} | 2 +-
libs/libc/machine/arm/armv7-a/CMakeLists.txt | 16 ++++++----------
libs/libc/machine/arm/armv7-a/Make.defs | 5 -----
libs/libc/machine/arm/armv7-a/{gnu => }/acle-compat.h | 2 +-
libs/libc/machine/arm/armv7-a/{gnu => }/arch_memchr.S | 2 +-
libs/libc/machine/arm/armv7-a/{gnu => }/arch_memcpy.S | 2 +-
libs/libc/machine/arm/armv7-a/{gnu => }/arch_memmove.S | 2 +-
libs/libc/machine/arm/armv7-a/{gnu => }/arch_memset.S | 2 +-
libs/libc/machine/arm/armv7-a/{gnu => }/arch_strcmp.S | 2 +-
libs/libc/machine/arm/armv7-a/{gnu => }/arch_strlen.S | 2 +-
libs/libc/machine/arm/armv7-m/CMakeLists.txt | 18 +++++++-----------
libs/libc/machine/arm/armv7-m/Make.defs | 5 -----
libs/libc/machine/arm/armv7-m/{gnu => }/acle-compat.h | 2 +-
libs/libc/machine/arm/armv7-m/{gnu => }/arch_memchr.S | 2 +-
libs/libc/machine/arm/armv7-m/{gnu => }/arch_memcpy.S | 2 +-
.../arm/{armv7-r/gnu => armv7-m}/arch_memmove.S | 2 +-
libs/libc/machine/arm/armv7-m/{gnu => }/arch_memset.S | 2 +-
libs/libc/machine/arm/armv7-m/{gnu => }/arch_strcmp.S | 2 +-
libs/libc/machine/arm/armv7-m/{gnu => }/arch_strcpy.S | 2 +-
libs/libc/machine/arm/armv7-m/{gnu => }/arch_strlen.S | 2 +-
libs/libc/machine/arm/armv7-r/CMakeLists.txt | 18 +++++-------------
libs/libc/machine/arm/armv7-r/Make.defs | 5 -----
libs/libc/machine/arm/armv7-r/{gnu => }/acle-compat.h | 2 +-
libs/libc/machine/arm/armv7-r/{gnu => }/arch_memchr.S | 2 +-
libs/libc/machine/arm/armv7-r/{gnu => }/arch_memcpy.S | 2 +-
.../arm/{armv7-m/gnu => armv7-r}/arch_memmove.S | 2 +-
libs/libc/machine/arm/armv7-r/{gnu => }/arch_memset.S | 2 +-
libs/libc/machine/arm/armv7-r/{gnu => }/arch_strcmp.S | 2 +-
libs/libc/machine/arm/armv7-r/{gnu => }/arch_strlen.S | 2 +-
libs/libc/machine/arm/armv8-m/CMakeLists.txt | 18 +++++++-----------
libs/libc/machine/arm/armv8-m/Make.defs | 5 -----
libs/libc/machine/arm/armv8-m/{gnu => }/acle-compat.h | 2 +-
libs/libc/machine/arm/armv8-m/{gnu => }/arch_memchr.S | 2 +-
libs/libc/machine/arm/armv8-m/{gnu => }/arch_memcpy.S | 2 +-
libs/libc/machine/arm/armv8-m/{gnu => }/arch_memmove.S | 2 +-
libs/libc/machine/arm/armv8-m/{gnu => }/arch_memset.S | 2 +-
libs/libc/machine/arm/armv8-m/{gnu => }/arch_strcmp.S | 2 +-
libs/libc/machine/arm/armv8-m/{gnu => }/arch_strcpy.S | 2 +-
libs/libc/machine/arm/armv8-m/{gnu => }/arch_strlen.S | 2 +-
libs/libc/machine/arm/armv8-r/CMakeLists.txt | 16 ++++++----------
libs/libc/machine/arm/armv8-r/Make.defs | 5 -----
libs/libc/machine/arm/armv8-r/{gnu => }/acle-compat.h | 2 +-
libs/libc/machine/arm/armv8-r/{gnu => }/arch_memchr.S | 2 +-
libs/libc/machine/arm/armv8-r/{gnu => }/arch_memcpy.S | 2 +-
libs/libc/machine/arm/armv8-r/{gnu => }/arch_memmove.S | 2 +-
libs/libc/machine/arm/armv8-r/{gnu => }/arch_memset.S | 2 +-
libs/libc/machine/arm/armv8-r/{gnu => }/arch_strcmp.S | 2 +-
libs/libc/machine/arm/armv8-r/{gnu => }/arch_strlen.S | 2 +-
libs/libc/machine/arm/{gnu => }/tc32_setjmp.S | 2 +-
54 files changed, 82 insertions(+), 136 deletions(-)
diff --git a/libs/libc/machine/arm/CMakeLists.txt
b/libs/libc/machine/arm/CMakeLists.txt
index 53ef18bebb..a9e7cf12ef 100644
--- a/libs/libc/machine/arm/CMakeLists.txt
+++ b/libs/libc/machine/arm/CMakeLists.txt
@@ -49,23 +49,23 @@ elseif(CONFIG_ARCH_ARMV8R) # All ARMv8-R
endif()
if(NOT CONFIG_LIBSUPCXX_TOOLCHAIN)
- list(APPEND SRCS aeabi_atexit.c)
+ list(APPEND SRCS arch_atexit.c)
endif()
if(CONFIG_CXX_EXCEPTION)
- list(APPEND SRCS gnu_unwind_find_exidx.c)
+ list(APPEND SRCS arch_unwind_find_exidx.c)
endif()
if(CONFIG_ARCH_SETJMP_H)
if(CONFIG_ARCH_CHIP_TLSR82)
- list(APPEND SRCS gnu/tc32_setjmp.S)
- elseif(CONFIG_ARCH_TOOLCHAIN_GNU)
- list(APPEND SRCS gnu/arch_setjmp.S)
+ list(APPEND SRCS tc32_setjmp.S)
+ else()
+ list(APPEND SRCS arch_setjmp.S)
endif()
endif()
if(CONFIG_PROFILE_MINI)
- list(APPEND SRCS gnu/mcount.S)
+ list(APPEND SRCS arch_mcount.S)
endif()
if(CONFIG_LIBC_ARCH_CRC32)
diff --git a/libs/libc/machine/arm/Make.defs b/libs/libc/machine/arm/Make.defs
index 1252e212e7..575aa6a998 100644
--- a/libs/libc/machine/arm/Make.defs
+++ b/libs/libc/machine/arm/Make.defs
@@ -47,11 +47,11 @@ include $(TOPDIR)/libs/libc/machine/arm/armv8-r/Make.defs
endif
ifneq ($(CONFIG_LIBSUPCXX_TOOLCHAIN),y)
-CSRCS += aeabi_atexit.c
+CSRCS += arch_atexit.c
endif
ifeq ($(CONFIG_CXX_EXCEPTION),y)
-CSRCS += gnu_unwind_find_exidx.c
+CSRCS += arch_unwind_find_exidx.c
endif
ifeq ($(CONFIG_ARCH_SETJMP_H),y)
@@ -63,17 +63,12 @@ endif
endif
ifeq ($(CONFIG_PROFILE_MINI),y)
-ASRCS += mcount.S
+ASRCS += arch_mcount.S
endif
ifeq ($(CONFIG_LIBC_ARCH_CRC32),y)
CSRCS += arch_crc32.c
endif
-ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-DEPPATH += --dep-path machine/arm/gnu
-VPATH += :machine/arm/gnu
-endif
-
DEPPATH += --dep-path machine/arm
VPATH += :machine/arm
diff --git a/libs/libc/machine/arm/aeabi_atexit.c
b/libs/libc/machine/arm/arch_atexit.c
similarity index 98%
rename from libs/libc/machine/arm/aeabi_atexit.c
rename to libs/libc/machine/arm/arch_atexit.c
index d79eb596fa..33d59de23f 100644
--- a/libs/libc/machine/arm/aeabi_atexit.c
+++ b/libs/libc/machine/arm/arch_atexit.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/aeabi_atexit.c
+ * libs/libc/machine/arm/arch_atexit.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/libs/libc/machine/arm/gnu/mcount.S
b/libs/libc/machine/arm/arch_mcount.S
similarity index 97%
rename from libs/libc/machine/arm/gnu/mcount.S
rename to libs/libc/machine/arm/arch_mcount.S
index f77937a89e..c747385b45 100644
--- a/libs/libc/machine/arm/gnu/mcount.S
+++ b/libs/libc/machine/arm/arch_mcount.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/gnu/mcount.S
+ * libs/libc/machine/arm/arch_mcount.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/gnu/arch_setjmp.S
b/libs/libc/machine/arm/arch_setjmp.S
similarity index 99%
rename from libs/libc/machine/arm/gnu/arch_setjmp.S
rename to libs/libc/machine/arm/arch_setjmp.S
index 1183f230d1..19c8451afe 100644
--- a/libs/libc/machine/arm/gnu/arch_setjmp.S
+++ b/libs/libc/machine/arm/arch_setjmp.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/gnu/arm_setjmp.S
+ * libs/libc/machine/arm/arch_setjmp.S
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/libs/libc/machine/arm/gnu_unwind_find_exidx.c
b/libs/libc/machine/arm/arch_unwind_find_exidx.c
similarity index 98%
rename from libs/libc/machine/arm/gnu_unwind_find_exidx.c
rename to libs/libc/machine/arm/arch_unwind_find_exidx.c
index 5ff5a52014..8ff5ddd5d6 100644
--- a/libs/libc/machine/arm/gnu_unwind_find_exidx.c
+++ b/libs/libc/machine/arm/arch_unwind_find_exidx.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/gnu_unwind_find_exidx.c
+ * libs/libc/machine/arm/arch_unwind_find_exidx.c
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/libs/libc/machine/arm/armv7-a/CMakeLists.txt
b/libs/libc/machine/arm/armv7-a/CMakeLists.txt
index 6b7aa39f40..c74e1fa1e0 100644
--- a/libs/libc/machine/arm/armv7-a/CMakeLists.txt
+++ b/libs/libc/machine/arm/armv7-a/CMakeLists.txt
@@ -20,32 +20,28 @@
#
#
##############################################################################
-if(CONFIG_ARCH_TOOLCHAIN_GNU)
- set(ARCH_TOOLCHAIN_DIR gnu)
-endif()
-
if(CONFIG_ARMV7A_MEMCHR)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memchr.S)
+ list(APPEND SRCS arch_memchr.S)
endif()
if(CONFIG_ARMV7A_MEMCPY)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memcpy.S)
+ list(APPEND SRCS arch_memcpy.S)
endif()
if(CONFIG_ARMV7A_MEMMOVE)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memmove.S)
+ list(APPEND SRCS arch_memmove.S)
endif()
if(CONFIG_ARMV7A_MEMSET)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memset.S)
+ list(APPEND SRCS arch_memset.S)
endif()
if(CONFIG_ARMV7A_STRCMP)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strcmp.S)
+ list(APPEND SRCS arch_strcmp.S)
endif()
if(CONFIG_ARMV7A_STRLEN)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strlen.S)
+ list(APPEND SRCS arch_strlen.S)
endif()
if(CONFIG_LIBC_ARCH_ELF)
diff --git a/libs/libc/machine/arm/armv7-a/Make.defs
b/libs/libc/machine/arm/armv7-a/Make.defs
index fa7d0d010d..6d7ea5a9a3 100644
--- a/libs/libc/machine/arm/armv7-a/Make.defs
+++ b/libs/libc/machine/arm/armv7-a/Make.defs
@@ -48,10 +48,5 @@ ifeq ($(CONFIG_LIBC_ARCH_ELF),y)
CSRCS += arch_elf.c
endif
-ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-DEPPATH += --dep-path machine/arm/armv7-a/gnu
-VPATH += :machine/arm/armv7-a/gnu
-endif
-
DEPPATH += --dep-path machine/arm/armv7-a
VPATH += :machine/arm/armv7-a
diff --git a/libs/libc/machine/arm/armv7-a/gnu/acle-compat.h
b/libs/libc/machine/arm/armv7-a/acle-compat.h
similarity index 99%
rename from libs/libc/machine/arm/armv7-a/gnu/acle-compat.h
rename to libs/libc/machine/arm/armv7-a/acle-compat.h
index 72f76e3af9..0b7104ec29 100644
--- a/libs/libc/machine/arm/armv7-a/gnu/acle-compat.h
+++ b/libs/libc/machine/arm/armv7-a/acle-compat.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-a/gnu/acle-compat.h
+ * libs/libc/machine/arm/armv7-a/acle-compat.h
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2014 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-a/gnu/arch_memchr.S
b/libs/libc/machine/arm/armv7-a/arch_memchr.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-a/gnu/arch_memchr.S
rename to libs/libc/machine/arm/armv7-a/arch_memchr.S
index 934d1767bd..08dec97915 100644
--- a/libs/libc/machine/arm/armv7-a/gnu/arch_memchr.S
+++ b/libs/libc/machine/arm/armv7-a/arch_memchr.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-a/gnu/arch_memchr.S
+ * libs/libc/machine/arm/armv7-a/arch_memchr.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2010-2011, Linaro Limited, 2015 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-a/gnu/arch_memcpy.S
b/libs/libc/machine/arm/armv7-a/arch_memcpy.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-a/gnu/arch_memcpy.S
rename to libs/libc/machine/arm/armv7-a/arch_memcpy.S
index 059dfe83c5..11fed34538 100644
--- a/libs/libc/machine/arm/armv7-a/gnu/arch_memcpy.S
+++ b/libs/libc/machine/arm/armv7-a/arch_memcpy.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-a/gnu/arch_memcpy.S
+ * libs/libc/machine/arm/armv7-a/arch_memcpy.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2013, Linaro Limited
diff --git a/libs/libc/machine/arm/armv7-a/gnu/arch_memmove.S
b/libs/libc/machine/arm/armv7-a/arch_memmove.S
similarity index 97%
rename from libs/libc/machine/arm/armv7-a/gnu/arch_memmove.S
rename to libs/libc/machine/arm/armv7-a/arch_memmove.S
index d290ad0076..094b963e11 100644
--- a/libs/libc/machine/arm/armv7-a/gnu/arch_memmove.S
+++ b/libs/libc/machine/arm/armv7-a/arch_memmove.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-a/gnu/arch_memmove.S
+ * libs/libc/machine/arm/armv7-a/arch_memmove.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2015 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-a/gnu/arch_memset.S
b/libs/libc/machine/arm/armv7-a/arch_memset.S
similarity index 98%
rename from libs/libc/machine/arm/armv7-a/gnu/arch_memset.S
rename to libs/libc/machine/arm/armv7-a/arch_memset.S
index db8baba209..b3e5312307 100644
--- a/libs/libc/machine/arm/armv7-a/gnu/arch_memset.S
+++ b/libs/libc/machine/arm/armv7-a/arch_memset.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-a/gnu/arch_memset.S
+ * libs/libc/machine/arm/armv7-a/arch_memset.S
*
* SPDX-License-Identifier: BSD-2-Clause
* SPDX-FileCopyrightText: 2013 The Android Open Source Project
diff --git a/libs/libc/machine/arm/armv7-a/gnu/arch_strcmp.S
b/libs/libc/machine/arm/armv7-a/arch_strcmp.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-a/gnu/arch_strcmp.S
rename to libs/libc/machine/arm/armv7-a/arch_strcmp.S
index 089ce79484..3c1d1ffd0c 100644
--- a/libs/libc/machine/arm/armv7-a/gnu/arch_strcmp.S
+++ b/libs/libc/machine/arm/armv7-a/arch_strcmp.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-a/gnu/arch_strcmp.S
+ * libs/libc/machine/arm/armv7-a/arch_strcmp.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2011 The Android Open Source Project,2008 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-a/gnu/arch_strlen.S
b/libs/libc/machine/arm/armv7-a/arch_strlen.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-a/gnu/arch_strlen.S
rename to libs/libc/machine/arm/armv7-a/arch_strlen.S
index 4ca1009d7d..a4dbacd301 100644
--- a/libs/libc/machine/arm/armv7-a/gnu/arch_strlen.S
+++ b/libs/libc/machine/arm/armv7-a/arch_strlen.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-a/gnu/arch_strlen.S
+ * libs/libc/machine/arm/armv7-a/arch_strlen.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2010-2011,2013 Linaro Limited,215 ARM Ltd.
diff --git a/libs/libc/machine/arm/armv7-m/CMakeLists.txt
b/libs/libc/machine/arm/armv7-m/CMakeLists.txt
index 48fc8d8e1a..f01e9100d6 100644
--- a/libs/libc/machine/arm/armv7-m/CMakeLists.txt
+++ b/libs/libc/machine/arm/armv7-m/CMakeLists.txt
@@ -22,36 +22,32 @@
set(SRCS)
-if(CONFIG_ARCH_TOOLCHAIN_GNU)
- set(ARCH_TOOLCHAIN_DIR gnu)
-endif()
-
if(CONFIG_ARMV7M_MEMCHR)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memchr.S)
+ list(APPEND SRCS arch_memchr.S)
endif()
if(CONFIG_ARMV7M_MEMCPY)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memcpy.S)
+ list(APPEND SRCS arch_memcpy.S)
endif()
if(CONFIG_ARMV7M_MEMSET)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memset.S)
+ list(APPEND SRCS arch_memset.S)
endif()
if(CONFIG_ARMV7M_MEMMOVE)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memmove.S)
+ list(APPEND SRCS arch_memmove.S)
endif()
if(CONFIG_ARMV7M_STRCMP)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strcmp.S)
+ list(APPEND SRCS arch_strcmp.S)
endif()
if(CONFIG_ARMV7M_STRCPY)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strcpy.S)
+ list(APPEND SRCS arch_strcpy.S)
endif()
if(CONFIG_ARMV7M_STRLEN)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strlen.S)
+ list(APPEND SRCS arch_strlen.S)
endif()
if(CONFIG_LIBC_ARCH_ELF)
diff --git a/libs/libc/machine/arm/armv7-m/Make.defs
b/libs/libc/machine/arm/armv7-m/Make.defs
index dd1301f641..be96e4f984 100644
--- a/libs/libc/machine/arm/armv7-m/Make.defs
+++ b/libs/libc/machine/arm/armv7-m/Make.defs
@@ -52,10 +52,5 @@ ifeq ($(CONFIG_LIBC_ARCH_ELF),y)
CSRCS += arch_elf.c
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/libs/libc/machine/arm/armv7-m/gnu/acle-compat.h
b/libs/libc/machine/arm/armv7-m/acle-compat.h
similarity index 99%
rename from libs/libc/machine/arm/armv7-m/gnu/acle-compat.h
rename to libs/libc/machine/arm/armv7-m/acle-compat.h
index 27c23d7e19..f58529bbee 100644
--- a/libs/libc/machine/arm/armv7-m/gnu/acle-compat.h
+++ b/libs/libc/machine/arm/armv7-m/acle-compat.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-m/gnu/acle-compat.h
+ * libs/libc/machine/arm/armv7-m/acle-compat.h
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2014 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-m/gnu/arch_memchr.S
b/libs/libc/machine/arm/armv7-m/arch_memchr.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-m/gnu/arch_memchr.S
rename to libs/libc/machine/arm/armv7-m/arch_memchr.S
index f0b9373c5c..f8922711b3 100644
--- a/libs/libc/machine/arm/armv7-m/gnu/arch_memchr.S
+++ b/libs/libc/machine/arm/armv7-m/arch_memchr.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-m/gnu/arch_memchr.S
+ * libs/libc/machine/arm/armv7-m/arch_memchr.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2010-2011, Linaro Limited, 2015 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-m/gnu/arch_memcpy.S
b/libs/libc/machine/arm/armv7-m/arch_memcpy.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-m/gnu/arch_memcpy.S
rename to libs/libc/machine/arm/armv7-m/arch_memcpy.S
index 4803c9b700..c05eda88b8 100644
--- a/libs/libc/machine/arm/armv7-m/gnu/arch_memcpy.S
+++ b/libs/libc/machine/arm/armv7-m/arch_memcpy.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-m/gnu/arch_memcpy.S
+ * libs/libc/machine/arm/armv7-m/arch_memcpy.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2013 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-r/gnu/arch_memmove.S
b/libs/libc/machine/arm/armv7-m/arch_memmove.S
similarity index 97%
rename from libs/libc/machine/arm/armv7-r/gnu/arch_memmove.S
rename to libs/libc/machine/arm/armv7-m/arch_memmove.S
index 961704f58c..19361ee728 100644
--- a/libs/libc/machine/arm/armv7-r/gnu/arch_memmove.S
+++ b/libs/libc/machine/arm/armv7-m/arch_memmove.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-r/gnu/arch_memmove.S
+ * libs/libc/machine/arm/armv7-m/arch_memmove.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2015 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-m/gnu/arch_memset.S
b/libs/libc/machine/arm/armv7-m/arch_memset.S
similarity index 98%
rename from libs/libc/machine/arm/armv7-m/gnu/arch_memset.S
rename to libs/libc/machine/arm/armv7-m/arch_memset.S
index 9922d5bebb..c4e24a19d8 100644
--- a/libs/libc/machine/arm/armv7-m/gnu/arch_memset.S
+++ b/libs/libc/machine/arm/armv7-m/arch_memset.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-m/gnu/arch_memset.S
+ * libs/libc/machine/arm/armv7-m/arch_memset.S
*
* SPDX-License-Identifier: BSD-2-Clause
* SPDX-FileCopyrightText: 2008 The Android Open Source Project
diff --git a/libs/libc/machine/arm/armv7-m/gnu/arch_strcmp.S
b/libs/libc/machine/arm/armv7-m/arch_strcmp.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-m/gnu/arch_strcmp.S
rename to libs/libc/machine/arm/armv7-m/arch_strcmp.S
index 855cc6a480..1fb87bc126 100644
--- a/libs/libc/machine/arm/armv7-m/gnu/arch_strcmp.S
+++ b/libs/libc/machine/arm/armv7-m/arch_strcmp.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-m/gnu/arch_strcmp.S
+ * libs/libc/machine/arm/armv7-m/arch_strcmp.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2012-2014 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-m/gnu/arch_strcpy.S
b/libs/libc/machine/arm/armv7-m/arch_strcpy.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-m/gnu/arch_strcpy.S
rename to libs/libc/machine/arm/armv7-m/arch_strcpy.S
index 9a998c95fa..b81c5ed3a3 100644
--- a/libs/libc/machine/arm/armv7-m/gnu/arch_strcpy.S
+++ b/libs/libc/machine/arm/armv7-m/arch_strcpy.S
@@ -1,5 +1,5 @@
/***************************************************************************
- * libs/libc/machine/arm/armv7-m/gnu/arch_strcpy.S
+ * libs/libc/machine/arm/armv7-m/arch_strcpy.S
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/libs/libc/machine/arm/armv7-m/gnu/arch_strlen.S
b/libs/libc/machine/arm/armv7-m/arch_strlen.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-m/gnu/arch_strlen.S
rename to libs/libc/machine/arm/armv7-m/arch_strlen.S
index 66dbf05b24..d5c6ea5ada 100644
--- a/libs/libc/machine/arm/armv7-m/gnu/arch_strlen.S
+++ b/libs/libc/machine/arm/armv7-m/arch_strlen.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-m/gnu/arch_strlen.S
+ * libs/libc/machine/arm/armv7-m/arch_strlen.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2010-2011,2013 Linaro Limited, 2015 ARM Ltd.
diff --git a/libs/libc/machine/arm/armv7-r/CMakeLists.txt
b/libs/libc/machine/arm/armv7-r/CMakeLists.txt
index 0492afcb64..9fe70da88c 100644
--- a/libs/libc/machine/arm/armv7-r/CMakeLists.txt
+++ b/libs/libc/machine/arm/armv7-r/CMakeLists.txt
@@ -22,32 +22,24 @@
set(SRCS)
-if(CONFIG_ARCH_TOOLCHAIN_GNU)
- set(ARCH_TOOLCHAIN_DIR gnu)
-endif()
-
-if(CONFIG_ARMV7R_MEMCHR)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memchr.S)
-endif()
-
if(CONFIG_ARMV7R_MEMCPY)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memcpy.S)
+ list(APPEND SRCS arch_memcpy.S)
endif()
if(CONFIG_ARMV7R_MEMSET)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memset.S)
+ list(APPEND SRCS arch_memset.S)
endif()
if(CONFIG_ARMV7R_MEMMOVE)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memmove.S)
+ list(APPEND SRCS arch_memmove.S)
endif()
if(CONFIG_ARMV7R_STRCMP)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strcmp.S)
+ list(APPEND SRCS arch_strcmp.S)
endif()
if(CONFIG_ARMV7R_STRLEN)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strlen.S)
+ list(APPEND SRCS arch_strlen.S)
endif()
if(CONFIG_LIBC_ARCH_ELF)
diff --git a/libs/libc/machine/arm/armv7-r/Make.defs
b/libs/libc/machine/arm/armv7-r/Make.defs
index 2e5e509f37..90d8e45af5 100644
--- a/libs/libc/machine/arm/armv7-r/Make.defs
+++ b/libs/libc/machine/arm/armv7-r/Make.defs
@@ -48,10 +48,5 @@ ifeq ($(CONFIG_LIBC_ARCH_ELF),y)
CSRCS += arch_elf.c
endif
-ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-DEPPATH += --dep-path machine/arm/armv7-r/gnu
-VPATH += :machine/arm/armv7-r/gnu
-endif
-
DEPPATH += --dep-path machine/arm/armv7-r
VPATH += :machine/arm/armv7-r
diff --git a/libs/libc/machine/arm/armv7-r/gnu/acle-compat.h
b/libs/libc/machine/arm/armv7-r/acle-compat.h
similarity index 99%
rename from libs/libc/machine/arm/armv7-r/gnu/acle-compat.h
rename to libs/libc/machine/arm/armv7-r/acle-compat.h
index b9464069a9..9576a7dff3 100644
--- a/libs/libc/machine/arm/armv7-r/gnu/acle-compat.h
+++ b/libs/libc/machine/arm/armv7-r/acle-compat.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-r/gnu/acle-compat.h
+ * libs/libc/machine/arm/armv7-r/acle-compat.h
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2014 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-r/gnu/arch_memchr.S
b/libs/libc/machine/arm/armv7-r/arch_memchr.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-r/gnu/arch_memchr.S
rename to libs/libc/machine/arm/armv7-r/arch_memchr.S
index 5fcc280c54..e764ce296f 100644
--- a/libs/libc/machine/arm/armv7-r/gnu/arch_memchr.S
+++ b/libs/libc/machine/arm/armv7-r/arch_memchr.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-r/gnu/arch_memchr.S
+ * libs/libc/machine/arm/armv7-r/arch_memchr.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2010-2011, Linaro Limited, 2015 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-r/gnu/arch_memcpy.S
b/libs/libc/machine/arm/armv7-r/arch_memcpy.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-r/gnu/arch_memcpy.S
rename to libs/libc/machine/arm/armv7-r/arch_memcpy.S
index 511297c278..731d1dfd88 100644
--- a/libs/libc/machine/arm/armv7-r/gnu/arch_memcpy.S
+++ b/libs/libc/machine/arm/armv7-r/arch_memcpy.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-r/gnu/arch_memchr.S
+ * libs/libc/machine/arm/armv7-r/arch_memchr.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2013, Linaro Limited
diff --git a/libs/libc/machine/arm/armv7-m/gnu/arch_memmove.S
b/libs/libc/machine/arm/armv7-r/arch_memmove.S
similarity index 97%
rename from libs/libc/machine/arm/armv7-m/gnu/arch_memmove.S
rename to libs/libc/machine/arm/armv7-r/arch_memmove.S
index 1a130a54a0..1c41202c4e 100644
--- a/libs/libc/machine/arm/armv7-m/gnu/arch_memmove.S
+++ b/libs/libc/machine/arm/armv7-r/arch_memmove.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-m/gnu/arch_memmove.S
+ * libs/libc/machine/arm/armv7-r/arch_memmove.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2015 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-r/gnu/arch_memset.S
b/libs/libc/machine/arm/armv7-r/arch_memset.S
similarity index 98%
rename from libs/libc/machine/arm/armv7-r/gnu/arch_memset.S
rename to libs/libc/machine/arm/armv7-r/arch_memset.S
index fbfad4e3c2..f1d5a28646 100644
--- a/libs/libc/machine/arm/armv7-r/gnu/arch_memset.S
+++ b/libs/libc/machine/arm/armv7-r/arch_memset.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-r/gnu/arch_memset.S
+ * libs/libc/machine/arm/armv7-r/arch_memset.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2013 The Android Open Source Project
diff --git a/libs/libc/machine/arm/armv7-r/gnu/arch_strcmp.S
b/libs/libc/machine/arm/armv7-r/arch_strcmp.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-r/gnu/arch_strcmp.S
rename to libs/libc/machine/arm/armv7-r/arch_strcmp.S
index adbb8684b7..27e968a54e 100644
--- a/libs/libc/machine/arm/armv7-r/gnu/arch_strcmp.S
+++ b/libs/libc/machine/arm/armv7-r/arch_strcmp.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-r/gnu/arch_strcmp.S
+ * libs/libc/machine/arm/armv7-r/arch_strcmp.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2011 The Android Open Source Project,2008 ARM Ltd
diff --git a/libs/libc/machine/arm/armv7-r/gnu/arch_strlen.S
b/libs/libc/machine/arm/armv7-r/arch_strlen.S
similarity index 99%
rename from libs/libc/machine/arm/armv7-r/gnu/arch_strlen.S
rename to libs/libc/machine/arm/armv7-r/arch_strlen.S
index 81b03b46fb..ec51751318 100644
--- a/libs/libc/machine/arm/armv7-r/gnu/arch_strlen.S
+++ b/libs/libc/machine/arm/armv7-r/arch_strlen.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv7-r/gnu/arch_strlen.S
+ * libs/libc/machine/arm/armv7-r/arch_strlen.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2010-2011,2013 Linaro Limited, 2015 ARM Ltd.
diff --git a/libs/libc/machine/arm/armv8-m/CMakeLists.txt
b/libs/libc/machine/arm/armv8-m/CMakeLists.txt
index 39626072ac..a2ec0b66fd 100644
--- a/libs/libc/machine/arm/armv8-m/CMakeLists.txt
+++ b/libs/libc/machine/arm/armv8-m/CMakeLists.txt
@@ -22,40 +22,36 @@
set(SRCS)
-if(CONFIG_ARCH_TOOLCHAIN_GNU)
- set(ARCH_TOOLCHAIN_DIR gnu)
-endif()
-
if(CONFIG_LIBC_ARCH_ELF)
list(APPEND SRCS arch_elf.c)
endif()
if(CONFIG_ARMV8M_MEMCHR)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memchr.S)
+ list(APPEND SRCS arch_memchr.S)
endif()
if(CONFIG_ARMV8M_MEMCPY)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memcpy.S)
+ list(APPEND SRCS arch_memcpy.S)
endif()
if(CONFIG_ARMV8M_MEMSET)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memset.S)
+ list(APPEND SRCS arch_memset.S)
endif()
if(CONFIG_ARMV8M_MEMMOVE)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memmove.S)
+ list(APPEND SRCS arch_memmove.S)
endif()
if(CONFIG_ARMV8M_STRCMP)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strcmp.S)
+ list(APPEND SRCS arch_strcmp.S)
endif()
if(CONFIG_ARMV8M_STRCPY)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strcpy.S)
+ list(APPEND SRCS arch_strcpy.S)
endif()
if(CONFIG_ARMV8M_STRLEN)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strlen.S)
+ list(APPEND SRCS arch_strlen.S)
endif()
target_sources(c PRIVATE ${SRCS})
diff --git a/libs/libc/machine/arm/armv8-m/Make.defs
b/libs/libc/machine/arm/armv8-m/Make.defs
index bb38110912..c49aff3726 100644
--- a/libs/libc/machine/arm/armv8-m/Make.defs
+++ b/libs/libc/machine/arm/armv8-m/Make.defs
@@ -52,10 +52,5 @@ ifeq ($(CONFIG_ARMV8M_STRLEN),y)
ASRCS += arch_strlen.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/libs/libc/machine/arm/armv8-m/gnu/acle-compat.h
b/libs/libc/machine/arm/armv8-m/acle-compat.h
similarity index 99%
rename from libs/libc/machine/arm/armv8-m/gnu/acle-compat.h
rename to libs/libc/machine/arm/armv8-m/acle-compat.h
index ca469f1ac3..b9f08be676 100644
--- a/libs/libc/machine/arm/armv8-m/gnu/acle-compat.h
+++ b/libs/libc/machine/arm/armv8-m/acle-compat.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-m/gnu/acle-compat.h
+ * libs/libc/machine/arm/armv8-m/acle-compat.h
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2014 ARM Ltd
diff --git a/libs/libc/machine/arm/armv8-m/gnu/arch_memchr.S
b/libs/libc/machine/arm/armv8-m/arch_memchr.S
similarity index 99%
rename from libs/libc/machine/arm/armv8-m/gnu/arch_memchr.S
rename to libs/libc/machine/arm/armv8-m/arch_memchr.S
index 2cc564e675..018c56afb3 100644
--- a/libs/libc/machine/arm/armv8-m/gnu/arch_memchr.S
+++ b/libs/libc/machine/arm/armv8-m/arch_memchr.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-m/gnu/arch_memchr.S
+ * libs/libc/machine/arm/armv8-m/arch_memchr.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2010-2011, Linaro Limited, 2015 ARM Ltd
diff --git a/libs/libc/machine/arm/armv8-m/gnu/arch_memcpy.S
b/libs/libc/machine/arm/armv8-m/arch_memcpy.S
similarity index 99%
rename from libs/libc/machine/arm/armv8-m/gnu/arch_memcpy.S
rename to libs/libc/machine/arm/armv8-m/arch_memcpy.S
index a95474fce9..bd4c2c346b 100644
--- a/libs/libc/machine/arm/armv8-m/gnu/arch_memcpy.S
+++ b/libs/libc/machine/arm/armv8-m/arch_memcpy.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-m/gnu/arch_memcpy.S
+ * libs/libc/machine/arm/armv8-m/arch_memcpy.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2013 ARM Ltd
diff --git a/libs/libc/machine/arm/armv8-m/gnu/arch_memmove.S
b/libs/libc/machine/arm/armv8-m/arch_memmove.S
similarity index 98%
rename from libs/libc/machine/arm/armv8-m/gnu/arch_memmove.S
rename to libs/libc/machine/arm/armv8-m/arch_memmove.S
index 47c640caca..1240e4e025 100644
--- a/libs/libc/machine/arm/armv8-m/gnu/arch_memmove.S
+++ b/libs/libc/machine/arm/armv8-m/arch_memmove.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-m/gnu/arch_memmove.S
+ * libs/libc/machine/arm/armv8-m/arch_memmove.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2015 ARM Ltd
diff --git a/libs/libc/machine/arm/armv8-m/gnu/arch_memset.S
b/libs/libc/machine/arm/armv8-m/arch_memset.S
similarity index 99%
rename from libs/libc/machine/arm/armv8-m/gnu/arch_memset.S
rename to libs/libc/machine/arm/armv8-m/arch_memset.S
index 7a232e60d9..175c6d5299 100644
--- a/libs/libc/machine/arm/armv8-m/gnu/arch_memset.S
+++ b/libs/libc/machine/arm/armv8-m/arch_memset.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-m/gnu/arch_memset.S
+ * libs/libc/machine/arm/armv8-m/arch_memset.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2015 ARM Ltd,2008 The Android Open Source Project
diff --git a/libs/libc/machine/arm/armv8-m/gnu/arch_strcmp.S
b/libs/libc/machine/arm/armv8-m/arch_strcmp.S
similarity index 99%
rename from libs/libc/machine/arm/armv8-m/gnu/arch_strcmp.S
rename to libs/libc/machine/arm/armv8-m/arch_strcmp.S
index 9886744359..361dd61386 100644
--- a/libs/libc/machine/arm/armv8-m/gnu/arch_strcmp.S
+++ b/libs/libc/machine/arm/armv8-m/arch_strcmp.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-m/gnu/arch_strcmp.S
+ * libs/libc/machine/arm/armv8-m/arch_strcmp.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2012-2014 ARM Ltd
diff --git a/libs/libc/machine/arm/armv8-m/gnu/arch_strcpy.S
b/libs/libc/machine/arm/armv8-m/arch_strcpy.S
similarity index 99%
rename from libs/libc/machine/arm/armv8-m/gnu/arch_strcpy.S
rename to libs/libc/machine/arm/armv8-m/arch_strcpy.S
index 2299077718..18ced75f3f 100644
--- a/libs/libc/machine/arm/armv8-m/gnu/arch_strcpy.S
+++ b/libs/libc/machine/arm/armv8-m/arch_strcpy.S
@@ -1,5 +1,5 @@
/***************************************************************************
- * libs/libc/machine/arm/armv8-m/gnu/arch_strcpy.S
+ * libs/libc/machine/arm/armv8-m/arch_strcpy.S
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/libs/libc/machine/arm/armv8-m/gnu/arch_strlen.S
b/libs/libc/machine/arm/armv8-m/arch_strlen.S
similarity index 99%
rename from libs/libc/machine/arm/armv8-m/gnu/arch_strlen.S
rename to libs/libc/machine/arm/armv8-m/arch_strlen.S
index f8f8d91a25..0a5a20f24c 100644
--- a/libs/libc/machine/arm/armv8-m/gnu/arch_strlen.S
+++ b/libs/libc/machine/arm/armv8-m/arch_strlen.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-m/gnu/arch_strlen.S
+ * libs/libc/machine/arm/armv8-m/arch_strlen.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2010-2011,2013 Linaro Limited, 2015 ARM Ltd.
diff --git a/libs/libc/machine/arm/armv8-r/CMakeLists.txt
b/libs/libc/machine/arm/armv8-r/CMakeLists.txt
index 3a8aa560fa..f0a5516624 100644
--- a/libs/libc/machine/arm/armv8-r/CMakeLists.txt
+++ b/libs/libc/machine/arm/armv8-r/CMakeLists.txt
@@ -20,32 +20,28 @@
#
#
##############################################################################
-if(CONFIG_ARCH_TOOLCHAIN_GNU)
- set(ARCH_TOOLCHAIN_DIR gnu)
-endif()
-
if(CONFIG_ARMV8R_MEMCHR)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memchr.S)
+ list(APPEND SRCS arch_memchr.S)
endif()
if(CONFIG_ARMV8R_MEMCPY)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memcpy.S)
+ list(APPEND SRCS arch_memcpy.S)
endif()
if(CONFIG_ARMV8R_MEMMOVE)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memmove.S)
+ list(APPEND SRCS arch_memmove.S)
endif()
if(CONFIG_ARMV8R_MEMSET)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_memset.S)
+ list(APPEND SRCS arch_memset.S)
endif()
if(CONFIG_ARMV8R_STRCMP)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strcmp.S)
+ list(APPEND SRCS arch_strcmp.S)
endif()
if(CONFIG_ARMV8R_STRLEN)
- list(APPEND SRCS ${ARCH_TOOLCHAIN_DIR}/arch_strlen.S)
+ list(APPEND SRCS arch_strlen.S)
endif()
if(CONFIG_LIBC_ARCH_ELF)
diff --git a/libs/libc/machine/arm/armv8-r/Make.defs
b/libs/libc/machine/arm/armv8-r/Make.defs
index bacb1dad5b..f88125d3f3 100644
--- a/libs/libc/machine/arm/armv8-r/Make.defs
+++ b/libs/libc/machine/arm/armv8-r/Make.defs
@@ -48,10 +48,5 @@ ifeq ($(CONFIG_LIBC_ARCH_ELF),y)
CSRCS += arch_elf.c
endif
-ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-DEPPATH += --dep-path machine/arm/armv8-r/gnu
-VPATH += :machine/arm/armv8-r/gnu
-endif
-
DEPPATH += --dep-path machine/arm/armv8-r
VPATH += :machine/arm/armv8-r
diff --git a/libs/libc/machine/arm/armv8-r/gnu/acle-compat.h
b/libs/libc/machine/arm/armv8-r/acle-compat.h
similarity index 99%
rename from libs/libc/machine/arm/armv8-r/gnu/acle-compat.h
rename to libs/libc/machine/arm/armv8-r/acle-compat.h
index 5cf798162d..c8cc657f47 100644
--- a/libs/libc/machine/arm/armv8-r/gnu/acle-compat.h
+++ b/libs/libc/machine/arm/armv8-r/acle-compat.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-r/gnu/acle-compat.h
+ * libs/libc/machine/arm/armv8-r/acle-compat.h
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2014 ARM Ltd
diff --git a/libs/libc/machine/arm/armv8-r/gnu/arch_memchr.S
b/libs/libc/machine/arm/armv8-r/arch_memchr.S
similarity index 99%
rename from libs/libc/machine/arm/armv8-r/gnu/arch_memchr.S
rename to libs/libc/machine/arm/armv8-r/arch_memchr.S
index d50a05d233..e4a9c003cf 100644
--- a/libs/libc/machine/arm/armv8-r/gnu/arch_memchr.S
+++ b/libs/libc/machine/arm/armv8-r/arch_memchr.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-r/gnu/arch_memchr.S
+ * libs/libc/machine/arm/armv8-r/arch_memchr.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2010-2011, Linaro Limited, 2015 ARM Ltd
diff --git a/libs/libc/machine/arm/armv8-r/gnu/arch_memcpy.S
b/libs/libc/machine/arm/armv8-r/arch_memcpy.S
similarity index 99%
rename from libs/libc/machine/arm/armv8-r/gnu/arch_memcpy.S
rename to libs/libc/machine/arm/armv8-r/arch_memcpy.S
index fd20c5c1bd..ed62204be1 100644
--- a/libs/libc/machine/arm/armv8-r/gnu/arch_memcpy.S
+++ b/libs/libc/machine/arm/armv8-r/arch_memcpy.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-r/gnu/arch_memcpy.S
+ * libs/libc/machine/arm/armv8-r/arch_memcpy.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2013, Linaro Limited
diff --git a/libs/libc/machine/arm/armv8-r/gnu/arch_memmove.S
b/libs/libc/machine/arm/armv8-r/arch_memmove.S
similarity index 97%
rename from libs/libc/machine/arm/armv8-r/gnu/arch_memmove.S
rename to libs/libc/machine/arm/armv8-r/arch_memmove.S
index 44eafa9b27..918bee0ddd 100644
--- a/libs/libc/machine/arm/armv8-r/gnu/arch_memmove.S
+++ b/libs/libc/machine/arm/armv8-r/arch_memmove.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-r/gnu/arch_memmove.S
+ * libs/libc/machine/arm/armv8-r/arch_memmove.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2015 ARM Ltd
diff --git a/libs/libc/machine/arm/armv8-r/gnu/arch_memset.S
b/libs/libc/machine/arm/armv8-r/arch_memset.S
similarity index 98%
rename from libs/libc/machine/arm/armv8-r/gnu/arch_memset.S
rename to libs/libc/machine/arm/armv8-r/arch_memset.S
index ec577192a8..364fb4b497 100644
--- a/libs/libc/machine/arm/armv8-r/gnu/arch_memset.S
+++ b/libs/libc/machine/arm/armv8-r/arch_memset.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-r/gnu/arch_memset.S
+ * libs/libc/machine/arm/armv8-r/arch_memset.S
*
* SPDX-License-Identifier: BSD-2-Clause
* SPDX-FileCopyrightText: 2013 The Android Open Source Project
diff --git a/libs/libc/machine/arm/armv8-r/gnu/arch_strcmp.S
b/libs/libc/machine/arm/armv8-r/arch_strcmp.S
similarity index 99%
rename from libs/libc/machine/arm/armv8-r/gnu/arch_strcmp.S
rename to libs/libc/machine/arm/armv8-r/arch_strcmp.S
index ca95f1b81b..987ae16b35 100644
--- a/libs/libc/machine/arm/armv8-r/gnu/arch_strcmp.S
+++ b/libs/libc/machine/arm/armv8-r/arch_strcmp.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-r/gnu/arch_strcmp.S
+ * libs/libc/machine/arm/armv8-r/arch_strcmp.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2011 The Android Open Source Project,2008 ARM Ltd
diff --git a/libs/libc/machine/arm/armv8-r/gnu/arch_strlen.S
b/libs/libc/machine/arm/armv8-r/arch_strlen.S
similarity index 99%
rename from libs/libc/machine/arm/armv8-r/gnu/arch_strlen.S
rename to libs/libc/machine/arm/armv8-r/arch_strlen.S
index f2d7103989..aae9960b6b 100644
--- a/libs/libc/machine/arm/armv8-r/gnu/arch_strlen.S
+++ b/libs/libc/machine/arm/armv8-r/arch_strlen.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/armv8-r/gnu/arch_strlen.S
+ * libs/libc/machine/arm/armv8-r/arch_strlen.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2010-2011,2013 Linaro Limited,215 ARM Ltd.
diff --git a/libs/libc/machine/arm/gnu/tc32_setjmp.S
b/libs/libc/machine/arm/tc32_setjmp.S
similarity index 99%
rename from libs/libc/machine/arm/gnu/tc32_setjmp.S
rename to libs/libc/machine/arm/tc32_setjmp.S
index 1a00ba590d..5598e185ef 100644
--- a/libs/libc/machine/arm/gnu/tc32_setjmp.S
+++ b/libs/libc/machine/arm/tc32_setjmp.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm/gnu/tc32_setjmp.S
+ * libs/libc/machine/arm/tc32_setjmp.S
*
* SPDX-License-Identifier: Apache-2.0
*
