Page MenuHomeFreeBSD

D54775.id171090.diff
No OneTemporary

D54775.id171090.diff

diff --git a/lib/libc/aarch64/string/Makefile.inc b/lib/libc/aarch64/string/Makefile.inc
--- a/lib/libc/aarch64/string/Makefile.inc
+++ b/lib/libc/aarch64/string/Makefile.inc
@@ -14,6 +14,11 @@
strnlen \
strrchr
+AARCH64_STRING_IFUNC_FILES= \
+ memcpy-mops.S \
+ memmove-mops.S \
+ memset-mops.S
+
# SIMD-enhanced routines not derived from Arm's code
MDSRCS+= \
memchr.S \
@@ -58,6 +63,15 @@
CFLAGS.${FUNC}.S+=-I${SRCTOP}/contrib/arm-optimized-routines/string
.endfor
+.for FILE in ${AARCH64_STRING_IFUNC_FILES}
+${FILE}: ${LIBC_SRCTOP}/aarch64/string/Makefile.inc
+ printf '/* %sgenerated by libc/aarch64/string/Makefile.inc */\n' @ > ${.TARGET}
+ printf '#include "aarch64/%s"\n' ${FILE} >> ${.TARGET}
+CLEANFILES+= ${FILE}
+MDSRCS+= ${FILE}
+CFLAGS.${FILE}+=-I${SRCTOP}/contrib/arm-optimized-routines/string
+.endfor
+
# Several files are wrappers in the src tree for the implementation from
# arm-optimized-routines
CFLAGS.memchr.S+=-I${SRCTOP}/contrib/arm-optimized-routines/string
diff --git a/lib/libc/aarch64/string/memcpy.S b/lib/libc/aarch64/string/memcpy.S
--- a/lib/libc/aarch64/string/memcpy.S
+++ b/lib/libc/aarch64/string/memcpy.S
@@ -1,3 +1 @@
#include "aarch64/memcpy-advsimd.S"
-#include "aarch64/memcpy-mops.S"
-#include "aarch64/memmove-mops.S"
diff --git a/lib/libc/aarch64/string/memset.S b/lib/libc/aarch64/string/memset.S
--- a/lib/libc/aarch64/string/memset.S
+++ b/lib/libc/aarch64/string/memset.S
@@ -1,2 +1 @@
#include "aarch64/memset.S"
-#include "aarch64/memset-mops.S"

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 4:02 AM (18 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31952182
Default Alt Text
D54775.id171090.diff (1 KB)

Event Timeline