From owner-dev-commits-ports-main@freebsd.org Tue Apr 6 12:30:29 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 23EC65CFA29; Tue, 6 Apr 2021 12:30:29 +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 4FF6LY0NmFz4lNk; Tue, 6 Apr 2021 12:30:29 +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 EA3113D5C; Tue, 6 Apr 2021 12:30:28 +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 136CUSp6043896; Tue, 6 Apr 2021 12:30:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136CUSin043895; Tue, 6 Apr 2021 12:30:28 GMT (envelope-from git) Date: Tue, 6 Apr 2021 12:30:28 GMT Message-Id: <202104061230.136CUSin043895@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 0be8c2b26aa7 - main - security/nettle: fix build on powerpc64* MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0be8c2b26aa7569164cf4103d11bce97404667fd Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 12:30:29 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=0be8c2b26aa7569164cf4103d11bce97404667fd commit 0be8c2b26aa7569164cf4103d11bce97404667fd Author: Piotr Kubaj AuthorDate: 2021-04-06 12:29:52 +0000 Commit: Piotr Kubaj CommitDate: 2021-04-06 12:29:52 +0000 security/nettle: fix build on powerpc64* Due to the string "swap_mask" being replaced with the vector register, the assembly label pointing at the local data variable .swap_mask was being replaced as well, causing the local label to be named ".0", which the clang integrated assembler treats as a syntax error. Change the name to .swap_data. Submitted by: bdragon --- .../patch-powerpc64-p8-aes-decrypt-internal.asm | 19 +++++++++++++++++++ .../patch-powerpc64-p8-aes-encrypt-internal.asm | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/security/nettle/patch-powerpc64-p8-aes-decrypt-internal.asm b/security/nettle/patch-powerpc64-p8-aes-decrypt-internal.asm new file mode 100644 index 000000000000..2ade3b44fdaa --- /dev/null +++ b/security/nettle/patch-powerpc64-p8-aes-decrypt-internal.asm @@ -0,0 +1,19 @@ +--- powerpc64/p8/aes-decrypt-internal.asm.orig 2021-04-03 16:33:37.883035000 -0500 ++++ powerpc64/p8/aes-decrypt-internal.asm 2021-04-03 16:34:24.022307000 -0500 +@@ -71,7 +71,7 @@ define(`FUNC_ALIGN', `5') + PROLOGUE(_nettle_aes_decrypt) + vxor ZERO,ZERO,ZERO + +- DATA_LOAD_VEC(swap_mask,.swap_mask,r5) ++ DATA_LOAD_VEC(swap_mask,.swap_data,r5) + + subi ROUNDS,ROUNDS,1 + srdi LENGTH,LENGTH,4 +@@ -351,6 +351,6 @@ EPILOGUE(_nettle_aes_decrypt) + + .data + .align 4 +-.swap_mask: ++.swap_data: + IF_LE(`.byte 8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7') + IF_BE(`.byte 3,2,1,0,7,6,5,4,11,10,9,8,15,14,13,12') diff --git a/security/nettle/patch-powerpc64-p8-aes-encrypt-internal.asm b/security/nettle/patch-powerpc64-p8-aes-encrypt-internal.asm new file mode 100644 index 000000000000..effecd530cc8 --- /dev/null +++ b/security/nettle/patch-powerpc64-p8-aes-encrypt-internal.asm @@ -0,0 +1,19 @@ +--- powerpc64/p8/aes-encrypt-internal.asm.orig 2021-04-03 16:33:26.104735000 -0500 ++++ powerpc64/p8/aes-encrypt-internal.asm 2021-04-03 16:34:43.805790000 -0500 +@@ -63,7 +63,7 @@ define(`S7', `v9') + + define(`FUNC_ALIGN', `5') + PROLOGUE(_nettle_aes_encrypt) +- DATA_LOAD_VEC(swap_mask,.swap_mask,r5) ++ DATA_LOAD_VEC(swap_mask,.swap_data,r5) + + subi ROUNDS,ROUNDS,1 + srdi LENGTH,LENGTH,4 +@@ -328,6 +328,6 @@ EPILOGUE(_nettle_aes_encrypt) + + .data + .align 4 +-.swap_mask: ++.swap_data: + IF_LE(`.byte 8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7') + IF_BE(`.byte 3,2,1,0,7,6,5,4,11,10,9,8,15,14,13,12')