diff --git a/musl_template.gni b/musl_template.gni index 6d7d76e0697ab0fdf80318989ed3cbb34f310eb8..8a95b033351ceb1ed4b12c0df7dfcfc66138df3d 100755 --- a/musl_template.gni +++ b/musl_template.gni @@ -269,9 +269,15 @@ template("musl_libs") { ] if (musl_arch == "arm") { - sources_orig -= [ "src/thread/${musl_arch}/__set_thread_area.c" ] + sources_orig -= [ + "src/thread/${musl_arch}/__set_thread_area.c", + "src/string/arm/memcpy_le.S", + ] } else if (musl_arch == "aarch64") { - sources_orig -= [ "src/thread/${musl_arch}/__set_thread_area.s" ] + sources_orig -= [ + "src/thread/${musl_arch}/__set_thread_area.s", + "src/string/memcpy.c", + ] } if ("${target_abi}" == "a7_hard_neon-vfpv4") { @@ -282,6 +288,14 @@ template("musl_libs") { sources += [ "${target_out_dir}/${musl_ported_dir}/${s}" ] } + if (musl_arch == "arm") { + sources += [ "//third_party/optimized-routines/string/arm/memcpy.S" ] + asmflags = [ "-D__memcpy_arm = memcpy" ] + } else if (musl_arch == "aarch64") { + sources += [ "//third_party/optimized-routines/string/aarch64/memcpy.S" ] + asmflags = [ "-D__memcpy_aarch64 = memcpy" ] + } + cflags = [ "-O3", "-fPIC",