From nobody Tue Dec 14 12:36:13 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C9E8A18D2455; Tue, 14 Dec 2021 12:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JCyXs3cVZz3wRZ; Tue, 14 Dec 2021 12:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5BED1490; Tue, 14 Dec 2021 12:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BECaDMn059521; Tue, 14 Dec 2021 12:36:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BECaDUF059520; Tue, 14 Dec 2021 12:36:13 GMT (envelope-from git) Date: Tue, 14 Dec 2021 12:36:13 GMT Message-Id: <202112141236.1BECaDUF059520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: c71bfb101302 - stable/13 - Revert "Switch to Arm Optimized Routines for mem* & str*" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c71bfb101302d0afe8886659c63ada78c6ac37df Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639485373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g8GBAc73dImVFTeF6cjehFXEAU4tjHQqaCLZIHqiQvQ=; b=nSKWjqeV/8huwO4/kVl3PZ8ZzuXQIzDpltsOm02UaJETRUAgUgZOivsjnLLuWyPhMSp845 3ZSbqh1BFywNQd+2cIM75YIlzno6DstrJEjdwsst/9rVL95R6G+irYB08MWMWy3C+3hmmI KP59VeGiFpbdDIOp+TbmZwbJjbGLKf1WIxjTW58o+m8em8+9rM590lEjiDWBIjz62siz40 sIIXCI4ciEzO4CiJJpV2oqQnEBeXFUwZM61Y9OOOumYR7AiM+nV36Jwvh5l9djlUYMfQuu q7Okpmzv3JsKtgunlPIRGVto1daVfohVxE/hprYdNe17rPp/A4JanEGlZ8aJXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639485373; a=rsa-sha256; cv=none; b=lFx0I8P5/hMGhkjOvF7iY8Yu7T7XvvTg+ELN5zNkA9xIQmHfEvAOZ1QfZxf2r7xAANtc9A 35mSIJnfhBZznIPmGUMkW5ZTotpr99PY2b5Qb5hPmkxJFZhErMWIG375mziDNQg4GYHuqb Cf59DfBaEvFyS+tK4rOmOy2DC0FkW/O+1mo2LpawjuBxhp8TUdKOlDTizuvuJgvm1Ux9HI rikmixFnWJCSrg1dltndoUHyNaq32hacdgQFcJrSDQ1aeho3HP+EWRXJT+5W9OuWaSCBl4 SsRUSh/qygLasIkCNUXziH1GQ1f66uKDWlOlzUgIVw6fem92qMTcAhR0Ds8XYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c71bfb101302d0afe8886659c63ada78c6ac37df commit c71bfb101302d0afe8886659c63ada78c6ac37df Author: Andrew Turner AuthorDate: 2021-12-14 12:34:09 +0000 Commit: Andrew Turner 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