From 8a86fccb1b378d86af6ac2e64263d16412a85434 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 5 Mar 2025 11:57:05 -0500 Subject: [PATCH] arm64, riscv64: Drop arch_string.S. It was empty and unused on these architectures. --- src/system/kernel/lib/arch/arm64/Jamfile | 1 - src/system/kernel/lib/arch/riscv64/Jamfile | 1 - .../libroot/posix/string/arch/arm64/Jamfile | 1 - .../posix/string/arch/arm64/arch_string.S | 6 ------ .../posix/string/arch/riscv64/arch_string.S | 21 ------------------- 5 files changed, 30 deletions(-) delete mode 100644 src/system/libroot/posix/string/arch/arm64/arch_string.S delete mode 100644 src/system/libroot/posix/string/arch/riscv64/arch_string.S diff --git a/src/system/kernel/lib/arch/arm64/Jamfile b/src/system/kernel/lib/arch/arm64/Jamfile index 8d106db8d6..c0dcb8d7e9 100644 --- a/src/system/kernel/lib/arch/arm64/Jamfile +++ b/src/system/kernel/lib/arch/arm64/Jamfile @@ -26,7 +26,6 @@ KernelMergeObject kernel_lib_posix_arch_$(TARGET_ARCH).o : kernel_longjmp_return.c kernel_setjmp_save_sigs.c - arch_string.S memset.c memcpy.c diff --git a/src/system/kernel/lib/arch/riscv64/Jamfile b/src/system/kernel/lib/arch/riscv64/Jamfile index 603763cf5d..cee144858b 100644 --- a/src/system/kernel/lib/arch/riscv64/Jamfile +++ b/src/system/kernel/lib/arch/riscv64/Jamfile @@ -28,7 +28,6 @@ KernelMergeObject kernel_lib_posix_arch_$(TARGET_ARCH).o : kernel_longjmp_return.c kernel_setjmp_save_sigs.c - #arch_string.S memcpy.c memset.c diff --git a/src/system/libroot/posix/string/arch/arm64/Jamfile b/src/system/libroot/posix/string/arch/arm64/Jamfile index 4df560e006..b6e8bc3bc9 100644 --- a/src/system/libroot/posix/string/arch/arm64/Jamfile +++ b/src/system/libroot/posix/string/arch/arm64/Jamfile @@ -13,7 +13,6 @@ for architectureObject in [ MultiArchSubDirSetup arm64 ] { SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ; MergeObject <$(architecture)>posix_string_arch_$(TARGET_ARCH).o : - arch_string.S memcpy.c memset.c ; diff --git a/src/system/libroot/posix/string/arch/arm64/arch_string.S b/src/system/libroot/posix/string/arch/arm64/arch_string.S deleted file mode 100644 index 4c57a0adc0..0000000000 --- a/src/system/libroot/posix/string/arch/arm64/arch_string.S +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright 2019, Haiku, Inc. All rights reserved. - * Distributed under the terms of the MIT License. - */ - -#include diff --git a/src/system/libroot/posix/string/arch/riscv64/arch_string.S b/src/system/libroot/posix/string/arch/riscv64/arch_string.S deleted file mode 100644 index 70106ebffb..0000000000 --- a/src/system/libroot/posix/string/arch/riscv64/arch_string.S +++ /dev/null @@ -1,21 +0,0 @@ -/* -** Copyright 2001, Travis Geiselbrecht. All rights reserved. -** Distributed under the terms of the NewOS License. -*/ - -#include - -#warning RISCV64: optimized assembly memcpy -// for now, a generic C one in: -// * src/system/kernel/lib/arch/riscv64/Jamfile -// * src/system/runtime_loader/arch/riscv64/Jamfile - -#if 0 - -/* that should be enough for now */ - -.align 4 -FUNCTION(memcpy): -/* void *memcpy(void *dest, const void *src, size_t count) */ -FUNCTION_END(memcpy) -#endif