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 c1a37ec1fbaab8c1f89fa4088023c6f3a79be16a
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Sun Jun 22 14:13:58 2025 +0800
libc/machine/arm64: Move all source files out of gnu folder
Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
libs/libc/machine/arm64/CMakeLists.txt | 61 +++++++++++++++-
libs/libc/machine/arm64/Make.defs | 7 +-
.../machine/arm64/{gnu/mcount.c => arch_mcount.c} | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_memchr.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_memcmp.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_memcpy.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_memmove.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_memset.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_setjmp.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_strchr.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_strchrnul.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_strcmp.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_strcpy.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_strlen.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_strncmp.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_strnlen.S | 2 +-
libs/libc/machine/arm64/{gnu => }/arch_strrchr.S | 2 +-
libs/libc/machine/arm64/gnu/CMakeLists.txt | 85 ----------------------
18 files changed, 76 insertions(+), 107 deletions(-)
diff --git a/libs/libc/machine/arm64/CMakeLists.txt
b/libs/libc/machine/arm64/CMakeLists.txt
index aea54d1551..a1afacabe2 100644
--- a/libs/libc/machine/arm64/CMakeLists.txt
+++ b/libs/libc/machine/arm64/CMakeLists.txt
@@ -19,7 +19,6 @@
# the License.
#
#
##############################################################################
-add_subdirectory(gnu)
set(SRCS)
@@ -27,4 +26,64 @@ if(CONFIG_LIBC_ARCH_ELF_64BIT)
list(APPEND SRCS arch_elf.c)
endif()
+if(CONFIG_ARM64_MEMCHR)
+ list(APPEND SRCS arch_memchr.S)
+endif()
+
+if(CONFIG_ARM64_MEMCMP)
+ list(APPEND SRCS arch_memcmp.S)
+endif()
+
+if(CONFIG_ARM64_MEMCPY)
+ list(APPEND SRCS arch_memcpy.S)
+endif()
+
+if(CONFIG_ARM64_MEMMOVE)
+ list(APPEND SRCS arch_memmove.S)
+endif()
+
+if(CONFIG_ARM64_MEMSET)
+ list(APPEND SRCS arch_memset.S)
+endif()
+
+if(CONFIG_ARM64_STRCHR)
+ list(APPEND SRCS arch_strchr.S)
+endif()
+
+if(CONFIG_ARM64_STRCHRNUL)
+ list(APPEND SRCS arch_strchrnul.S)
+endif()
+
+if(CONFIG_ARM64_STRCMP)
+ list(APPEND SRCS arch_strcmp.S)
+endif()
+
+if(CONFIG_ARM64_STRCPY)
+ list(APPEND SRCS arch_strcpy.S)
+endif()
+
+if(CONFIG_ARM64_STRLEN)
+ list(APPEND SRCS arch_strlen.S)
+endif()
+
+if(CONFIG_ARM64_STRNCMP)
+ list(APPEND SRCS arch_strncmp.S)
+endif()
+
+if(CONFIG_ARM64_STRNLEN)
+ list(APPEND SRCS arch_strnlen.S)
+endif()
+
+if(CONFIG_ARM64_STRRCHR)
+ list(APPEND SRCS arch_strrchr.S)
+endif()
+
+if(CONFIG_ARCH_SETJMP_H)
+ list(APPEND SRCS arch_setjmp.S)
+endif()
+
+if(NOT CONFIG_PROFILE_NONE)
+ list(APPEND SRCS arch_mcount.c)
+endif()
+
target_sources(c PRIVATE ${SRCS})
diff --git a/libs/libc/machine/arm64/Make.defs
b/libs/libc/machine/arm64/Make.defs
index a7f1cad529..1c679c7d94 100644
--- a/libs/libc/machine/arm64/Make.defs
+++ b/libs/libc/machine/arm64/Make.defs
@@ -81,12 +81,7 @@ ASRCS += arch_setjmp.S
endif
ifeq ($(CONFIG_PROFILE_NONE),)
-CSRCS += mcount.c
-endif
-
-ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
-DEPPATH += --dep-path machine/arm64/gnu
-VPATH += :machine/arm64/gnu
+CSRCS += arch_mcount.c
endif
DEPPATH += --dep-path machine/arm64
diff --git a/libs/libc/machine/arm64/gnu/mcount.c
b/libs/libc/machine/arm64/arch_mcount.c
similarity index 98%
rename from libs/libc/machine/arm64/gnu/mcount.c
rename to libs/libc/machine/arm64/arch_mcount.c
index 31e08fa363..be7bc7c4da 100644
--- a/libs/libc/machine/arm64/gnu/mcount.c
+++ b/libs/libc/machine/arm64/arch_mcount.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/mcount.c
+ * libs/libc/machine/arm64/arch_mcount.c
*
* 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/arm64/gnu/arch_memchr.S
b/libs/libc/machine/arm64/arch_memchr.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_memchr.S
rename to libs/libc/machine/arm64/arch_memchr.S
index 601992b0af..98275f5f11 100644
--- a/libs/libc/machine/arm64/gnu/arch_memchr.S
+++ b/libs/libc/machine/arm64/arch_memchr.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_memchr.S
+ * libs/libc/machine/arm64/arch_memchr.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2014, ARM Limited, All rights Reserved.
diff --git a/libs/libc/machine/arm64/gnu/arch_memcmp.S
b/libs/libc/machine/arm64/arch_memcmp.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_memcmp.S
rename to libs/libc/machine/arm64/arch_memcmp.S
index 469dae9a5b..bb7429d36a 100644
--- a/libs/libc/machine/arm64/gnu/arch_memcmp.S
+++ b/libs/libc/machine/arm64/arch_memcmp.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_memcmp.S
+ * libs/libc/machine/arm64/arch_memcmp.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2018 Linaro Limited, 2017 ARM Ltd
diff --git a/libs/libc/machine/arm64/gnu/arch_memcpy.S
b/libs/libc/machine/arm64/arch_memcpy.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_memcpy.S
rename to libs/libc/machine/arm64/arch_memcpy.S
index 6e35b61fb3..1acb7f04ab 100644
--- a/libs/libc/machine/arm64/gnu/arch_memcpy.S
+++ b/libs/libc/machine/arm64/arch_memcpy.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_memcpy.S
+ * libs/libc/machine/arm64/arch_memcpy.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2012-2013, Linaro Limited, 2015 ARM Ltd
diff --git a/libs/libc/machine/arm64/gnu/arch_memmove.S
b/libs/libc/machine/arm64/arch_memmove.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_memmove.S
rename to libs/libc/machine/arm64/arch_memmove.S
index 4b0e2b7a9e..557185599b 100644
--- a/libs/libc/machine/arm64/gnu/arch_memmove.S
+++ b/libs/libc/machine/arm64/arch_memmove.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_memmove.S
+ * libs/libc/machine/arm64/arch_memmove.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2013, Linaro Limited, 2015 ARM Ltd
diff --git a/libs/libc/machine/arm64/gnu/arch_memset.S
b/libs/libc/machine/arm64/arch_memset.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_memset.S
rename to libs/libc/machine/arm64/arch_memset.S
index 116fd29ffc..deb4626001 100644
--- a/libs/libc/machine/arm64/gnu/arch_memset.S
+++ b/libs/libc/machine/arm64/arch_memset.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_memset.S
+ * libs/libc/machine/arm64/arch_memset.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2012-2013, Linaro Limited, 2015 ARM Ltd
diff --git a/libs/libc/machine/arm64/gnu/arch_setjmp.S
b/libs/libc/machine/arm64/arch_setjmp.S
similarity index 98%
rename from libs/libc/machine/arm64/gnu/arch_setjmp.S
rename to libs/libc/machine/arm64/arch_setjmp.S
index c6a1c020b5..6c9a9ef67c 100644
--- a/libs/libc/machine/arm64/gnu/arch_setjmp.S
+++ b/libs/libc/machine/arm64/arch_setjmp.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_setjmp.S
+ * libs/libc/machine/arm64/arch_setjmp.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2011, 2012 ARM Ltd, All rights reserved.
diff --git a/libs/libc/machine/arm64/gnu/arch_strchr.S
b/libs/libc/machine/arm64/arch_strchr.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_strchr.S
rename to libs/libc/machine/arm64/arch_strchr.S
index 2f0c3f725c..3e7ae0a225 100644
--- a/libs/libc/machine/arm64/gnu/arch_strchr.S
+++ b/libs/libc/machine/arm64/arch_strchr.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_strchr.S
+ * libs/libc/machine/arm64/arch_strchr.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2014, ARM Limited, All rights Reserved.
diff --git a/libs/libc/machine/arm64/gnu/arch_strchrnul.S
b/libs/libc/machine/arm64/arch_strchrnul.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_strchrnul.S
rename to libs/libc/machine/arm64/arch_strchrnul.S
index 0cf87dd5e8..0376f1a3a6 100644
--- a/libs/libc/machine/arm64/gnu/arch_strchrnul.S
+++ b/libs/libc/machine/arm64/arch_strchrnul.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_strchrnul.S
+ * libs/libc/machine/arm64/arch_strchrnul.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2014, ARM Limited, All rights Reserved.
diff --git a/libs/libc/machine/arm64/gnu/arch_strcmp.S
b/libs/libc/machine/arm64/arch_strcmp.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_strcmp.S
rename to libs/libc/machine/arm64/arch_strcmp.S
index 4131cc326e..395234fa95 100644
--- a/libs/libc/machine/arm64/gnu/arch_strcmp.S
+++ b/libs/libc/machine/arm64/arch_strcmp.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_strcmp.S
+ * libs/libc/machine/arm64/arch_strcmp.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2012-2018, Linaro Limited, All rights reserved.
diff --git a/libs/libc/machine/arm64/gnu/arch_strcpy.S
b/libs/libc/machine/arm64/arch_strcpy.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_strcpy.S
rename to libs/libc/machine/arm64/arch_strcpy.S
index b6b06ac776..7543494ec4 100644
--- a/libs/libc/machine/arm64/gnu/arch_strcpy.S
+++ b/libs/libc/machine/arm64/arch_strcpy.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_strcpy.S
+ * libs/libc/machine/arm64/arch_strcpy.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2013, 2014, 2015 ARM Ltd., All rights Reserved.
diff --git a/libs/libc/machine/arm64/gnu/arch_strlen.S
b/libs/libc/machine/arm64/arch_strlen.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_strlen.S
rename to libs/libc/machine/arm64/arch_strlen.S
index 535e823ce8..23a8a44aeb 100644
--- a/libs/libc/machine/arm64/gnu/arch_strlen.S
+++ b/libs/libc/machine/arm64/arch_strlen.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_strlen.S
+ * libs/libc/machine/arm64/arch_strlen.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2013-2015, Linaro Limited, All rights reserved.
diff --git a/libs/libc/machine/arm64/gnu/arch_strncmp.S
b/libs/libc/machine/arm64/arch_strncmp.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_strncmp.S
rename to libs/libc/machine/arm64/arch_strncmp.S
index 9030aa4429..62a3250e94 100644
--- a/libs/libc/machine/arm64/gnu/arch_strncmp.S
+++ b/libs/libc/machine/arm64/arch_strncmp.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_strncmp.S
+ * libs/libc/machine/arm64/arch_strncmp.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2013, 2018, Linaro Limited, All rights reserved.
diff --git a/libs/libc/machine/arm64/gnu/arch_strnlen.S
b/libs/libc/machine/arm64/arch_strnlen.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_strnlen.S
rename to libs/libc/machine/arm64/arch_strnlen.S
index df70be6860..3077b6d2f3 100644
--- a/libs/libc/machine/arm64/gnu/arch_strnlen.S
+++ b/libs/libc/machine/arm64/arch_strnlen.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_strnlen.S
+ * libs/libc/machine/arm64/arch_strnlen.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2013, Linaro Limited, All rights reserved.
diff --git a/libs/libc/machine/arm64/gnu/arch_strrchr.S
b/libs/libc/machine/arm64/arch_strrchr.S
similarity index 99%
rename from libs/libc/machine/arm64/gnu/arch_strrchr.S
rename to libs/libc/machine/arm64/arch_strrchr.S
index 17ec6ea2b1..9208d1cc68 100644
--- a/libs/libc/machine/arm64/gnu/arch_strrchr.S
+++ b/libs/libc/machine/arm64/arch_strrchr.S
@@ -1,5 +1,5 @@
/****************************************************************************
- * libs/libc/machine/arm64/gnu/arch_strrchr.S
+ * libs/libc/machine/arm64/arch_strrchr.S
*
* SPDX-License-Identifier: BSD-3-Clause
* SPDX-FileCopyrightText: 2014, ARM Limited, All rights Reserved.
diff --git a/libs/libc/machine/arm64/gnu/CMakeLists.txt
b/libs/libc/machine/arm64/gnu/CMakeLists.txt
deleted file mode 100644
index ce5de89a39..0000000000
--- a/libs/libc/machine/arm64/gnu/CMakeLists.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-#
##############################################################################
-# libs/libc/machine/arm64/gnu/CMakeLists.txt
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-# 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.
-#
-#
##############################################################################
-
-set(SRCS)
-
-if(CONFIG_ARM64_MEMCHR)
- list(APPEND SRCS arch_memchr.S)
-endif()
-
-if(CONFIG_ARM64_MEMCMP)
- list(APPEND SRCS arch_memcmp.S)
-endif()
-
-if(CONFIG_ARM64_MEMCPY)
- list(APPEND SRCS arch_memcpy.S)
-endif()
-
-if(CONFIG_ARM64_MEMMOVE)
- list(APPEND SRCS arch_memmove.S)
-endif()
-
-if(CONFIG_ARM64_MEMSET)
- list(APPEND SRCS arch_memset.S)
-endif()
-
-if(CONFIG_ARM64_STRCHR)
- list(APPEND SRCS arch_strchr.S)
-endif()
-
-if(CONFIG_ARM64_STRCHRNUL)
- list(APPEND SRCS arch_strchrnul.S)
-endif()
-
-if(CONFIG_ARM64_STRCMP)
- list(APPEND SRCS arch_strcmp.S)
-endif()
-
-if(CONFIG_ARM64_STRCPY)
- list(APPEND SRCS arch_strcpy.S)
-endif()
-
-if(CONFIG_ARM64_STRLEN)
- list(APPEND SRCS arch_strlen.S)
-endif()
-
-if(CONFIG_ARM64_STRNCMP)
- list(APPEND SRCS arch_strncmp.S)
-endif()
-
-if(CONFIG_ARM64_STRNLEN)
- list(APPEND SRCS arch_strnlen.S)
-endif()
-
-if(CONFIG_ARM64_STRRCHR)
- list(APPEND SRCS arch_strrchr.S)
-endif()
-
-if(CONFIG_ARCH_SETJMP_H)
- list(APPEND SRCS arch_setjmp.S)
-endif()
-
-if(NOT CONFIG_PROFILE_NONE)
- list(APPEND SRCS mcount.c)
-endif()
-
-target_sources(c PRIVATE ${SRCS})
