From nobody Sat Jun 14 12:17:53 2025 X-Original-To: dev-commits-ports-all@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 4bKFds6ZWnz516XN; Sat, 14 Jun 2025 12:17:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bKFds5gP6z415T; Sat, 14 Jun 2025 12:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749903473; 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=UgaOMw2b6Qbvx2wX/RJ6eitKbLP4kGn1cny487pN8LA=; b=nPB9q9IOGDVWqgz/Ju9ntphYblNPYwrmoViL4lU5yaQQtnkoHPFFUInA6DrbLf22jSzMmq vKUnqq2y1SwNFn+gL1igXSHIO8T9gLtNwLF64eJzEQtxxNnjr4Z7L+4sJmgHZ+cJyP9lGG q+aeiHqrsUU1BuD5E7PEc5A4LuR/OeU0qVQY0eYKd8DbuzvE1E9frtyOIJpiQzkXKLsQDz +Duy/Fut8K2ZFlsVxgDUH0cz6RR0Ur7XBYuo087i3j0eg4TDVK8z4fp8KqhHk8/oAoUKHS VDf0EjLivFrKwZ1QQkuj3vQCt5R2T/s0txWm3f6BMF+QnBALQcsQJOEMOVA91w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749903473; 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=UgaOMw2b6Qbvx2wX/RJ6eitKbLP4kGn1cny487pN8LA=; b=W8lnWYkownEk9X5aUa7/czeUnTHjNmcRuURyQ960U7DCt2ZXfh9xg46X+UMD+bw6flOcQD IqnYcUHxCtcVwKrWZ+FZktWr2FU2LSyGH6UEAPLFXtI/UjR5o4MWtX25R4wXYH0cvg2FC3 uW8uZp1uNT5EGOjdu+X1I2YJARae0F/lDis0LoTzYNONqJLmqOnItkOFOCuFX9NMGlhvHz 12LC4Sv5LcMEbi29F65nyT3SNrsFBJYE0kozf9EqWUWaY7tds+ZOvJ0vLr6Ey4tP/aR+Nv R+ouq8/srTxPNfa3zcSmXzzS1NGE8Ej7uuU7ghdEos341ztiHS6veih3JzjJcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749903473; a=rsa-sha256; cv=none; b=L4gBDsVdzvTEqjAXj0IMHbEc3xuWY9o+xIkLElIpcfwAiJ9NoiC6XCutO6rIieyuA2morJ +3B/wb58H9z753L9Jws4nSRn/N2/e0VG0RHkoSQMQvgEsrNBjl+TVMOfM5pt1fUqaqYmC5 r422LHg6op6XUmlrY2LHii72Z2Fmiw2pTAQwVlWJ4vxisL+28zbdWKvXPw6Kvf0vlPkNhI fbs6i1aIp7kGgCgoG/AhNSNoFZRJokY/xTOD0arM/8s3f6oD1b9gGszr99ZfWoC5LetZX4 LvV9Dqz3DTOYsG1KZ/FZkUinkMyDsH4N/kt6fsX6KYbDO6J1vTpldaNzqvT9Yw== 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 4bKFds5Fm8zBXM; Sat, 14 Jun 2025 12:17:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55ECHrio011371; Sat, 14 Jun 2025 12:17:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55ECHr7Y011368; Sat, 14 Jun 2025 12:17:53 GMT (envelope-from git) Date: Sat, 14 Jun 2025 12:17:53 GMT Message-Id: <202506141217.55ECHr7Y011368@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason W. Bacon" Subject: git: ec7391b149b9 - main - devel/isa-l: Enable build on aarch64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jwb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec7391b149b965867f36a51eaf96f3e397a03d96 Auto-Submitted: auto-generated The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec7391b149b965867f36a51eaf96f3e397a03d96 commit ec7391b149b965867f36a51eaf96f3e397a03d96 Author: Jason W. Bacon AuthorDate: 2025-06-14 12:15:10 +0000 Commit: Jason W. Bacon CommitDate: 2025-06-14 12:15:10 +0000 devel/isa-l: Enable build on aarch64 Using generic portable code for now. Upstream has optimized aarch64 code, but it is not portable. No changes on other archs. PR: 287164 Approved by: sunpoet --- devel/isa-l/Makefile | 4 +++- devel/isa-l/distinfo | 4 +--- devel/isa-l/files/patch-aarch64 | 53 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/devel/isa-l/Makefile b/devel/isa-l/Makefile index d96e21dda554..c0e4b322358a 100644 --- a/devel/isa-l/Makefile +++ b/devel/isa-l/Makefile @@ -10,7 +10,9 @@ WWW= https://github.com/intel/isa-l LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= amd64 powerpc64le powerpc64 powerpc +# FIXME: aarch64 uses portable base functions for now. +# Upstream has optimized support for aarch64, but the code is not portable. +ONLY_FOR_ARCHS= aarch64 amd64 powerpc powerpc64 powerpc64le BUILD_DEPENDS= nasm:devel/nasm diff --git a/devel/isa-l/distinfo b/devel/isa-l/distinfo index 93126637cf5e..b3834fccb043 100644 --- a/devel/isa-l/distinfo +++ b/devel/isa-l/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1738088824 +TIMESTAMP = 1749903233 SHA256 (intel-isa-l-v2.31.1_GH0.tar.gz) = e1d5573a4019738243b568ab1e1422e6ab7557c5cae33cc8686944d327ad6bb4 SIZE (intel-isa-l-v2.31.1_GH0.tar.gz) = 741732 -SHA256 (1b1ee1e18f5bb4d91e3839405a8557a64a3b2581.patch) = 2ee0c38621012f038cbc1f246f2a008d8a2f22cf2a9df843e630dc56ab076ae7 -SIZE (1b1ee1e18f5bb4d91e3839405a8557a64a3b2581.patch) = 1296 diff --git a/devel/isa-l/files/patch-aarch64 b/devel/isa-l/files/patch-aarch64 new file mode 100644 index 000000000000..78cfaf023388 --- /dev/null +++ b/devel/isa-l/files/patch-aarch64 @@ -0,0 +1,53 @@ +--- Makefile.am.orig 2025-05-30 12:38:07 UTC ++++ Makefile.am +@@ -71,12 +71,6 @@ endif + other_tests += ${other_tests_x86_32} + endif + +-if CPU_AARCH64 +-ARCH=-Daarch64 +-libisal_la_SOURCES += ${lsrc_aarch64} +-other_tests += ${other_tests_aarch64} +-endif +- + if CPU_PPC64LE + ARCH=-Dppc64le + libisal_la_SOURCES += ${lsrc_ppc64le} +@@ -128,20 +122,13 @@ endif + if USE_NASM + as_filter = ${srcdir}/tools/nasm-filter.sh + endif +-if CPU_AARCH64 +- as_filter = $(CC) -D__ASSEMBLY__ +-endif + + CCAS = $(as_filter) + EXTRA_DIST += tools/yasm-filter.sh tools/nasm-filter.sh + EXTRA_DIST += tools/yasm-cet-filter.sh tools/nasm-cet-filter.sh + + AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${ARCH} ${D} +-if CPU_AARCH64 +-AM_CCASFLAGS = ${AM_CFLAGS} +-else + AM_CCASFLAGS = ${yasm_args} ${INCLUDE} ${src_include} ${DEFS} ${D} +-endif + + .asm.s: + @echo " MKTMP " $@; +--- configure.ac.orig 2025-05-30 12:36:27 UTC ++++ configure.ac +@@ -27,14 +27,11 @@ AS_CASE([$host_cpu], + [x86_64], [CPU="x86_64"], + [amd64], [CPU="x86_64"], + [i?86], [CPU="x86_32"], +- [aarch64], [CPU="aarch64"], +- [arm64], [CPU="aarch64"], + [powerpc64le], [CPU="ppc64le"], + [ppc64le], [CPU="ppc64le"], + ) + AM_CONDITIONAL([CPU_X86_64], [test "$CPU" = "x86_64"]) + AM_CONDITIONAL([CPU_X86_32], [test "$CPU" = "x86_32"]) +-AM_CONDITIONAL([CPU_AARCH64], [test "$CPU" = "aarch64"]) + AM_CONDITIONAL([CPU_PPC64LE], [test "$CPU" = "ppc64le"]) + AM_CONDITIONAL([CPU_UNDEFINED], [test "x$CPU" = "x"]) +