Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Dec 2023 11:52:12 GMT
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 1a4a9a50574d - main - libicp_rescue: unbreak for armv6 after recent OpenZFS import
Message-ID:  <202312091152.3B9BqCjR012814@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=1a4a9a50574d9b4b4db90a85bc253d340c93a8a0

commit 1a4a9a50574d9b4b4db90a85bc253d340c93a8a0
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-12-09 11:51:50 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2023-12-09 11:51:50 +0000

    libicp_rescue: unbreak for armv6 after recent OpenZFS import
    
    Similar to fb17dfa0c83c, fix libicp_rescue to include asm versions of
    sha2 on armv6, to unbreak the build of rescue.
    
    Fixes:          3494f7c019fc
---
 cddl/lib/libicp_rescue/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile
index e129a2f3e0f9..cb2c868e2bc1 100644
--- a/cddl/lib/libicp_rescue/Makefile
+++ b/cddl/lib/libicp_rescue/Makefile
@@ -20,7 +20,7 @@ ASM_SOURCES_AS = \
         asm-x86_64/blake3/blake3_sse41.S
 
 CFLAGS+= -D__amd64 -D_SYS_STACK_H
-.elif ${MACHINE_ARCH} == "armv7"
+.elif ${MACHINE_ARCH} == "armv6" || ${MACHINE_ARCH} == "armv7"
 ASM_SOURCES_C =
 ASM_SOURCES_AS = \
         asm-arm/sha2/sha256-armv7.S \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312091152.3B9BqCjR012814>