libc/machine/riscv: Move all source files out of gnu folder

and remove the empty CMakeLists.txt in the subdirectories.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2025-06-22 14:03:16 +08:00 committed by Donny(董九柱)
parent 1177ac8ee4
commit ae071920b4
11 changed files with 21 additions and 124 deletions

View file

@ -17,18 +17,25 @@
# the License.
#
# ##############################################################################
add_subdirectory(gnu)
if(CONFIG_ARCH_RV64GC)
add_subdirectory(rv64)
endif()
if(CONFIG_ARCH_RV32IM)
add_subdirectory(rv32)
endif()
set(SRCS)
if(CONFIG_RISCV_MEMCPY)
list(APPEND SRCS arch_memcpy.S)
endif()
if(CONFIG_RISCV_MEMSET)
list(APPEND SRCS arch_memset.S)
endif()
if(CONFIG_RISCV_STRCMP)
list(APPEND SRCS arch_strcmp.S)
endif()
if(CONFIG_ARCH_SETJMP_H)
list(APPEND SRCS arch_setjmp.S)
endif()
if(CONFIG_LIBC_ARCH_ELF)
list(APPEND SRCS arch_elf.c)
endif()

View file

@ -40,10 +40,5 @@ ifeq ($(CONFIG_LIBC_ARCH_ELF),y)
CSRCS += arch_elf.c
endif
ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
DEPPATH += --dep-path machine/risc-v/gnu
VPATH += :machine/risc-v/gnu
endif
DEPPATH += --dep-path machine/risc-v
VPATH += :machine/risc-v

View file

@ -1,5 +1,5 @@
/****************************************************************************
* libs/libc/machine/risc-v/gnu/arch_memcpy.S
* libs/libc/machine/risc-v/arch_memcpy.S
*
* SPDX-License-Identifier: Apache-2.0
*

View file

@ -1,5 +1,5 @@
/****************************************************************************
* libs/libc/machine/risc-v/gnu/arch_memset.S
* libs/libc/machine/risc-v/arch_memset.S
*
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
* SPDX-FileCopyrightText: 2017 SiFive Inc. All rights reserved.

View file

@ -1,5 +1,5 @@
############################################################################
# libs/libc/machine/risc-v/gnu/arch_setjmp.S
# libs/libc/machine/risc-v/arch_setjmp.S
#
# SPDX-License-Identifier: Apache-2.0
#

View file

@ -1,5 +1,5 @@
/****************************************************************************
* libs/libc/machine/risc-v/gnu/arch_strcmp.S
* libs/libc/machine/risc-v/arch_strcmp.S
*
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
* SPDX-FileCopyrightText: 2017 SiFive Inc. All rights reserved.

View file

@ -1,5 +1,5 @@
/****************************************************************************
* libs/libc/machine/risc-v/gnu/asm.h
* libs/libc/machine/risc-v/asm.h
*
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
* SPDX-FileCopyrightText: 2017 SiFive Inc. All rights reserved.

View file

@ -1,21 +0,0 @@
# ##############################################################################
# libs/libc/machine/risc-v/common/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.
#
# ##############################################################################

View file

@ -1,41 +0,0 @@
# ##############################################################################
# libs/libc/machine/risc-v/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_RISCV_MEMCPY)
list(APPEND SRCS arch_memcpy.S)
endif()
if(CONFIG_RISCV_MEMSET)
list(APPEND SRCS arch_memset.S)
endif()
if(CONFIG_RISCV_STRCMP)
list(APPEND SRCS arch_strcmp.S)
endif()
if(CONFIG_ARCH_SETJMP_H)
list(APPEND SRCS arch_setjmp.S)
endif()
target_sources(c PRIVATE ${SRCS})

View file

@ -1,21 +0,0 @@
# ##############################################################################
# libs/libc/machine/risc-v/rv32/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.
#
# ##############################################################################

View file

@ -1,22 +0,0 @@
# ##############################################################################
# libs/libc/machine/risc-v/rv64/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.
#
# ##############################################################################