Date: Tue, 14 Dec 2021 12:36:13 GMT From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: c71bfb101302 - stable/13 - Revert "Switch to Arm Optimized Routines for mem* & str*" Message-ID: <202112141236.1BECaDUF059520@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c71bfb101302d0afe8886659c63ada78c6ac37df commit c71bfb101302d0afe8886659c63ada78c6ac37df Author: Andrew Turner <andrew@FreeBSD.org> AuthorDate: 2021-12-14 12:34:09 +0000 Commit: Andrew Turner <andrew@FreeBSD.org> CommitDate: 2021-12-14 12:34:09 +0000 Revert "Switch to Arm Optimized Routines for mem* & str*" The Arm Optimized Routines don't exist in 13. I missed this as my builds succeeded, likely due to stale depends files. This reverts commit bfd10d146ba4f8dc26e8b9bb9013a9316105f11a. --- lib/libc/aarch64/string/Makefile.inc | 51 +++++++++++------------------------- lib/libc/aarch64/string/memcpy.S | 6 ----- lib/libc/aarch64/string/memmove.S | 5 ---- lib/libc/aarch64/string/strchr.S | 5 ---- lib/libc/aarch64/string/strrchr.S | 5 ---- 5 files changed, 15 insertions(+), 57 deletions(-) diff --git a/lib/libc/aarch64/string/Makefile.inc b/lib/libc/aarch64/string/Makefile.inc index 0e1f0f4b84e2..5ce355f8b0c1 100644 --- a/lib/libc/aarch64/string/Makefile.inc +++ b/lib/libc/aarch64/string/Makefile.inc @@ -1,41 +1,20 @@ # $FreeBSD$ # -# String handling from the Arm Optimized Routines -# https://github.com/ARM-software/optimized-routines +# String handling from the Cortex Strings library +# https://git.linaro.org/toolchain/cortex-strings.git # -AARCH64_STRING_FUNCS= \ - memchr \ - memcmp \ - memcpy \ - memmove \ - memrchr \ - memset \ - stpcpy \ - strchr \ - strchrnul \ - strcmp \ - strcpy \ - strlen \ - strncmp \ - strnlen \ - strrchr +.PATH: ${SRCTOP}/contrib/cortex-strings/src/aarch64 -# -# Add the above functions. Generate an asm file that includes the needed -# Arm Optimized Routines file defining the function name to the libc name. -# Some file need multiple macros defined or a weak symbol added we can -# override the generated file in these cases. -# -.for FUNC in ${AARCH64_STRING_FUNCS} -.if !exists(${FUNC}.S) -${FUNC}.S: - printf '/* %sgenerated by libc/aarch64/string/Makefile.inc */\n' @ > ${.TARGET} - printf '#define __%s_aarch64 %s\n' ${FUNC} ${FUNC} >> ${.TARGET} - printf '#include "aarch64/%s.S"\n' ${FUNC} >> ${.TARGET} -CLEANFILES+= ${FUNC}.S -.endif - -MDSRCS+= ${FUNC}.S -CFLAGS.${FUNC}.S+=-I${SRCTOP}/contrib/arm-optimized-routines/string -.endfor +MDSRCS+= \ + memchr.S \ + memcmp.S \ + memcpy.S \ + memmove.S \ + memset.S \ + strchr.S \ + strcmp.S \ + strcpy.S \ + strlen.S \ + strncmp.S \ + strnlen.S diff --git a/lib/libc/aarch64/string/memcpy.S b/lib/libc/aarch64/string/memcpy.S deleted file mode 100644 index ac4fbe8d6175..000000000000 --- a/lib/libc/aarch64/string/memcpy.S +++ /dev/null @@ -1,6 +0,0 @@ -#define __memcpy_aarch64 memcpy -#define __memmove_aarch64 memmove -#include "aarch64/memcpy.S" - -.weak index -.equ index, strchr diff --git a/lib/libc/aarch64/string/memmove.S b/lib/libc/aarch64/string/memmove.S deleted file mode 100644 index e2f99790e0da..000000000000 --- a/lib/libc/aarch64/string/memmove.S +++ /dev/null @@ -1,5 +0,0 @@ -/* - * memmove is implemented in memcpy.S. Having this file simplifies the build - * as it stops MISRCS from picking up the C implementation and rtld expects - * to copy the memmove object file into its object directory. - */ diff --git a/lib/libc/aarch64/string/strchr.S b/lib/libc/aarch64/string/strchr.S deleted file mode 100644 index e241b35004bb..000000000000 --- a/lib/libc/aarch64/string/strchr.S +++ /dev/null @@ -1,5 +0,0 @@ -#define __strchr_aarch64 strchr -#include "aarch64/strchr.S" - -.weak index -.equ index, strchr diff --git a/lib/libc/aarch64/string/strrchr.S b/lib/libc/aarch64/string/strrchr.S deleted file mode 100644 index 46e966e3188a..000000000000 --- a/lib/libc/aarch64/string/strrchr.S +++ /dev/null @@ -1,5 +0,0 @@ -#define __strrchr_aarch64 strrchr -#include "aarch64/strrchr.S" - -.weak rindex -.equ rindex, strrchr
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112141236.1BECaDUF059520>