diff --git a/src/system/runtime_loader/arch/arm/Jamfile b/src/system/runtime_loader/arch/arm/Jamfile index 500d89a703..1f535a4f26 100644 --- a/src/system/runtime_loader/arch/arm/Jamfile +++ b/src/system/runtime_loader/arch/arm/Jamfile @@ -16,9 +16,7 @@ for architectureObject in [ MultiArchSubDirSetup arm ] { arch_relocate.cpp : thread.o - - arch_string.o - memset.o + <$(architecture)>posix_string_arch_$(TARGET_ARCH).o ; } } diff --git a/src/system/runtime_loader/arch/arm64/Jamfile b/src/system/runtime_loader/arch/arm64/Jamfile index d98c92f7a7..686c19f095 100644 --- a/src/system/runtime_loader/arch/arm64/Jamfile +++ b/src/system/runtime_loader/arch/arm64/Jamfile @@ -16,9 +16,7 @@ for architectureObject in [ MultiArchSubDirSetup arm64 ] { arch_relocate.cpp : thread.o - - memcpy.o - memset.o + <$(architecture)>posix_string_arch_$(TARGET_ARCH).o ; } } diff --git a/src/system/runtime_loader/arch/m68k/Jamfile b/src/system/runtime_loader/arch/m68k/Jamfile index cfb139c93f..cf3be21f7e 100644 --- a/src/system/runtime_loader/arch/m68k/Jamfile +++ b/src/system/runtime_loader/arch/m68k/Jamfile @@ -17,9 +17,7 @@ for architectureObject in [ MultiArchSubDirSetup m68k ] { : atomic.o thread.o - - arch_string.o - memset.o + <$(architecture)>posix_string_arch_$(TARGET_ARCH).o ; } } diff --git a/src/system/runtime_loader/arch/ppc/Jamfile b/src/system/runtime_loader/arch/ppc/Jamfile index 26cb1d351c..042424d142 100644 --- a/src/system/runtime_loader/arch/ppc/Jamfile +++ b/src/system/runtime_loader/arch/ppc/Jamfile @@ -17,9 +17,7 @@ for architectureObject in [ MultiArchSubDirSetup ppc ] { : atomic.o thread.o - - memcpy.o - memset.o + <$(architecture)>posix_string_arch_$(TARGET_ARCH).o ; } } diff --git a/src/system/runtime_loader/arch/riscv64/Jamfile b/src/system/runtime_loader/arch/riscv64/Jamfile index 0cb1eb7e79..fb5a9dffaa 100644 --- a/src/system/runtime_loader/arch/riscv64/Jamfile +++ b/src/system/runtime_loader/arch/riscv64/Jamfile @@ -16,10 +16,7 @@ for architectureObject in [ MultiArchSubDirSetup riscv64 ] { arch_relocate.cpp : thread.o - - #arch_string.o - memcpy.o - memset.o + <$(architecture)>posix_string_arch_$(TARGET_ARCH).o ; } } diff --git a/src/system/runtime_loader/arch/sparc/Jamfile b/src/system/runtime_loader/arch/sparc/Jamfile index 43de71c836..e141b00fa1 100644 --- a/src/system/runtime_loader/arch/sparc/Jamfile +++ b/src/system/runtime_loader/arch/sparc/Jamfile @@ -16,9 +16,7 @@ for architectureObject in [ MultiArchSubDirSetup sparc ] { arch_relocate.cpp : thread.o - - memcpy.o - memset.o + <$(architecture)>posix_string_arch_$(TARGET_ARCH).o ; } } diff --git a/src/system/runtime_loader/arch/x86/Jamfile b/src/system/runtime_loader/arch/x86/Jamfile index 1348a19789..1f47d2ee78 100644 --- a/src/system/runtime_loader/arch/x86/Jamfile +++ b/src/system/runtime_loader/arch/x86/Jamfile @@ -22,7 +22,7 @@ for architectureObject in [ MultiArchSubDirSetup x86 x86_gcc2 ] { memcpy.o memset.o : - arch_string.o + <$(architecture)>posix_string_arch_$(TARGET_ARCH).o : x86_64 ] ; } diff --git a/src/system/runtime_loader/arch/x86_64/Jamfile b/src/system/runtime_loader/arch/x86_64/Jamfile index d5d101fe93..0bc1312802 100644 --- a/src/system/runtime_loader/arch/x86_64/Jamfile +++ b/src/system/runtime_loader/arch/x86_64/Jamfile @@ -16,7 +16,7 @@ for architectureObject in [ MultiArchSubDirSetup x86_64 ] { arch_relocate.cpp : thread.o - arch_string.o + <$(architecture)>posix_string_arch_$(TARGET_ARCH).o ; } }