Received: by mail.netbsd.org (Postfix, from userid 605) id C2CEF84D82; Sun, 12 Apr 2020 12:19:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 49E3784D7C for ; Sun, 12 Apr 2020 12:19:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 1ttL682ouQAG for ; Sun, 12 Apr 2020 12:19:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A9BCE84C81 for ; Sun, 12 Apr 2020 12:19:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9DA6FFB27; Sun, 12 Apr 2020 12:19:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1586693960266380" MIME-Version: 1.0 Date: Sun, 12 Apr 2020 12:19:20 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/devel/nss To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20200412121920.9DA6FFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1586693960266380 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Sun Apr 12 12:19:20 UTC 2020 Modified Files: pkgsrc/devel/nss: distinfo Added Files: pkgsrc/devel/nss/patches: patch-nss_lib_freebl_aes-armv8.c patch-nss_lib_freebl_gcm-aarch64.c Log Message: nss: interim NetBSD/aarch64 build fix To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 pkgsrc/devel/nss/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/nss/patches/patch-nss_lib_freebl_aes-armv8.c \ pkgsrc/devel/nss/patches/patch-nss_lib_freebl_gcm-aarch64.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1586693960266380 Content-Disposition: inline Content-Length: 3060 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/nss/distinfo diff -u pkgsrc/devel/nss/distinfo:1.109 pkgsrc/devel/nss/distinfo:1.110 --- pkgsrc/devel/nss/distinfo:1.109 Sun Apr 12 10:25:17 2020 +++ pkgsrc/devel/nss/distinfo Sun Apr 12 12:19:20 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.109 2020/04/12 10:25:17 tnn Exp $ +$NetBSD: distinfo,v 1.110 2020/04/12 12:19:20 tnn Exp $ SHA1 (nss-3.51.tar.gz) = f1d46871728cd5afc81ec07d9833bb2b8c4fa68f RMD160 (nss-3.51.tar.gz) = f35fa4a2439f8ec3d2f23c575cfa1d5c7cfe48ef @@ -16,6 +16,8 @@ SHA1 (patch-mn) = 5b79783e48249044be1a90 SHA1 (patch-nss_cmd_platlibs.mk) = 01f4350de601b29c94e8a791a28daca226866bb6 SHA1 (patch-nss_coreconf_OpenBSD.mk) = 1a4c3711d5d1f7f9e8d58b36145b15d7e444d754 SHA1 (patch-nss_coreconf_command.mk) = a7b682d367825b48f8802fa30cee83f10680bb74 +SHA1 (patch-nss_lib_freebl_aes-armv8.c) = aa698f61dd3d66ba707a9b5425bc15d057244ad7 +SHA1 (patch-nss_lib_freebl_gcm-aarch64.c) = 311cfe7ca58e91285052d0ca27bd2df3f325071b SHA1 (patch-nss_lib_freebl_md5.c) = 5cbec40695e296f0713895fb85cd37f6df76b85b SHA1 (patch-nss_lib_util_utilpars.c) = 5d3000515b01037929730a752b7d7a0f46f06deb SHA1 (patch-nss_tests_all.sh) = b328778b538db66f5447f962f23afd6f650f7071 Added files: Index: pkgsrc/devel/nss/patches/patch-nss_lib_freebl_aes-armv8.c diff -u /dev/null pkgsrc/devel/nss/patches/patch-nss_lib_freebl_aes-armv8.c:1.1 --- /dev/null Sun Apr 12 12:19:20 2020 +++ pkgsrc/devel/nss/patches/patch-nss_lib_freebl_aes-armv8.c Sun Apr 12 12:19:20 2020 @@ -0,0 +1,19 @@ +$NetBSD: patch-nss_lib_freebl_aes-armv8.c,v 1.1 2020/04/12 12:19:20 tnn Exp $ + +Explicitly enable the ARMv8 crypto extensions as the compiler doesn't +seem to do it for us. +https://mail-index.netbsd.org/port-arm/2020/04/12/msg006603.html + +--- nss/lib/freebl/aes-armv8.c.orig 2020-03-06 18:44:20.000000000 +0000 ++++ nss/lib/freebl/aes-armv8.c +@@ -2,6 +2,10 @@ + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++#ifdef __NetBSD__ ++asm(".arch_extension crypto"); ++#endif ++ + #include "secerr.h" + #include "rijndael.h" + Index: pkgsrc/devel/nss/patches/patch-nss_lib_freebl_gcm-aarch64.c diff -u /dev/null pkgsrc/devel/nss/patches/patch-nss_lib_freebl_gcm-aarch64.c:1.1 --- /dev/null Sun Apr 12 12:19:20 2020 +++ pkgsrc/devel/nss/patches/patch-nss_lib_freebl_gcm-aarch64.c Sun Apr 12 12:19:20 2020 @@ -0,0 +1,19 @@ +$NetBSD: patch-nss_lib_freebl_gcm-aarch64.c,v 1.1 2020/04/12 12:19:20 tnn Exp $ + +Explicitly enable the ARMv8 crypto extensions as the compiler doesn't +seem to do it for us. +https://mail-index.netbsd.org/port-arm/2020/04/12/msg006603.html + +--- nss/lib/freebl/gcm-aarch64.c.orig 2020-03-06 18:44:20.000000000 +0000 ++++ nss/lib/freebl/gcm-aarch64.c +@@ -2,6 +2,10 @@ + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++#ifdef __NetBSD__ ++asm(".arch_extension crypto"); ++#endif ++ + #ifdef FREEBL_NO_DEPEND + #include "stubs.h" + #endif --_----------=_1586693960266380--