From nobody Tue Oct 11 22:17:20 2022 X-Original-To: dev-commits-ports-main@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 4Mn9BT2qy4z4fY4t; Tue, 11 Oct 2022 22:17:21 +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 4Mn9BT2180z3XwH; Tue, 11 Oct 2022 22:17:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665526641; 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=B81CLnf5MjR4wcOUhhQcA7Q4GlIa8EtaGO9Ep2sj11g=; b=fbCHOwLeFE/vDDCiVX2la5OpKiU/PUQYidrKmzZAKvGspYFHv3CFwdSOEvbah6zdj1CTOD u+vDGQO0nCnt1DWA02FdPqB9Pk75SMsABHjpmPnLHRqNHX8hrKimNBYVIm0p2/Coq996cA IuNrzeXTS8s+EGA6DjcsCDpIV1cSs1NGecreLEBbBg/2YgpGMKCL/eAgLmb5i6h8wGd9o6 2zFT5p32mZsBaXSKfhrZVpTSO3+5HPjhTu9432K3BhW9e28Bq9wJZEUYuEHXPCI3Pfz7XU fVNejAAHt+rDH4Bk2TTDr90zDzGenG1pxl1xxtdMwU5s8XpBceteB1t8V131WA== 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 4Mn9BT0yD7z164d; Tue, 11 Oct 2022 22:17:21 +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 29BMHLHm023983; Tue, 11 Oct 2022 22:17:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29BMHKD5023982; Tue, 11 Oct 2022 22:17:20 GMT (envelope-from git) Date: Tue, 11 Oct 2022 22:17:20 GMT Message-Id: <202210112217.29BMHKD5023982@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 8fc6b69f47e7 - main - security/putty: fix aarch64 build on clang 10. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8fc6b69f47e7ee7da005f8b59fc10522d287740b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665526641; 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=B81CLnf5MjR4wcOUhhQcA7Q4GlIa8EtaGO9Ep2sj11g=; b=HGkGM2g32Cn+HxadLydkRxVYMoY+X6/zHni7ZhGLkgsiVLvl/kP0waEsWsNLiX0A+4os13 Vz6nOxJeg6a26cuzk2DtcCstsSBeT1vI/Q52GG/bZkxMlLy6jJ09HtFBfFbSixUghq89Pl kDyyJKQdCpTQJ1mjLLVnw3I8rBtIpHHM9GW9WyjL0Dd2622M0Xb+LR5ryA/M5z/HnxlGyn ssid4wCKiWUujHIhyZjiCWTAlIsZcR22hVkZRbg8kn+V+B+lgyhL85hKaytuC3iGkaZjmk O6IJI5TX2WfllRlIrua0lsCB+jVk9aYKUB5wHGfRibzZCBcXuV0m0+XS+Oi98w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665526641; a=rsa-sha256; cv=none; b=d8WWuMPUN6yERBc0YTGM6FLeAZ4tMxMkOt2iTBON530lgjK4XvVU99oGA5orGQrKJmcHjh rGmh0mwlXUjW5RmoWuFoimq/J+XpZ46G61rfGh9dfXzd9xZyO8xuzLMMtqAlrkohwojlv9 TddMYuVE6+ZJwZorco5K2HJZUh9ta7i8HmQ12Epgapf12Zj0dZe8FIrx+GPAcu8DeJiDCz V/gR2fU9Q34A2EeRc3Jy9ppWhT3Pv9k+95vvBvsfxFZsHQoYubKMBoIaT11/hBsBNjb8AR +pHjMB6pUtTG9ITrbWN3vDD9kJ8jqbo24q6Xy9k1wPB4WCTxXAlOTYPcwxlohA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=8fc6b69f47e7ee7da005f8b59fc10522d287740b commit 8fc6b69f47e7ee7da005f8b59fc10522d287740b Author: Matthias Andree AuthorDate: 2022-10-11 22:12:57 +0000 Commit: Matthias Andree CommitDate: 2022-10-11 22:17:18 +0000 security/putty: fix aarch64 build on clang 10. clang 10 (FreeBSD 12.3) does not support vaddq_p128 and similar ARM NEON intrinsics, but clang 13 (FreeBSD 13.1) does. Abuse the HAVE_NEON_PMULL cmake test to disable aesgcm-neon.c unless vaddq_p128() is available. http://ampere1.nyi.freebsd.org/data/123arm64-quarterly/31229ca1324c/logs/putty-nogtk-0.78~pre20220922.log: /wrkdirs/usr/ports/security/putty-nogtk/work/putty-0.78~pre20220922.9fcfd67/crypto/aesgcm-neon.c:125:16: warning: implicit declaration of function 'vaddq_p128' is invalid in C99 [-Wimplicit-function-declaration] ctx->acc = vaddq_p128(ctx->acc, load_p128_be(coeff)); --- security/putty/Makefile | 1 - security/putty/files/patch-crypto_CMakeLists.txt | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/security/putty/Makefile b/security/putty/Makefile index 6f030da7f8d7..fe19c50a6f96 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -7,7 +7,6 @@ CATEGORIES= security # ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/ MASTER_SITES= https://tartarus.org/~simon/putty-prerel-snapshots/ \ LOCAL/mandree/ -PATCH_STRIP= -p1 MAINTAINER= mandree@FreeBSD.org COMMENT= Secure shell and telnet client including xterm emulator diff --git a/security/putty/files/patch-crypto_CMakeLists.txt b/security/putty/files/patch-crypto_CMakeLists.txt new file mode 100644 index 000000000000..82639b778fd0 --- /dev/null +++ b/security/putty/files/patch-crypto_CMakeLists.txt @@ -0,0 +1,15 @@ +This is a crude hack to avoid aesgcm-neon.c on FreeBSD 12.3, +which does - by way of clang 10.0.1 - not offer vaddq_p128() +through arm-neon.h. clang 13 as of FreeBSD 13.1 does. + +--- crypto/CMakeLists.txt.orig 2022-09-21 23:42:30 UTC ++++ crypto/CMakeLists.txt +@@ -192,7 +192,7 @@ if(neon) + volatile poly128_t r; + volatile poly64_t a, b; + volatile poly64x2_t u, v; +- int main(void) { r = vmull_p64(a, b); r = vmull_high_p64(u, v); }" ++ int main(void) { r = vmull_p64(a, b); r = vmull_high_p64(u, v); r = vaddq_p128(r, r); }" + ADD_SOURCES_IF_SUCCESSFUL aesgcm-neon.c) + + # The 'sha3' architecture extension, despite the name, includes