From nobody Mon Oct 21 09:37:18 2024 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 4XX9FW2P21z5YlSK; Mon, 21 Oct 2024 09:37:19 +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 4XX9FW15VBz4nnf; Mon, 21 Oct 2024 09:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729503439; 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=jBjuXHDFNpnN3/JZgcSl35zXyY889rfK14/JFa1lzsU=; b=JIdhlBbD7bkwO6uiPkoRCe5vdd7OxP5/YAB3RHQzrRS5ZPfFsleuzwYZp2SKNo9pX7uhjm aD2mij+lG5y1w8Ric9G1TQdB5bTZUJk50x5tSNiCxuZ+ew+sPCSCw1Uxolq7gQgwHGN3Dy zpuzC0UuiLadrIzgVe1UN+zPgCIt5rc99AQG4L5EDfe+srHgu6F3g9qlpeNogRAaTHv03p NEr/M12k07KqJWCfaOEkb3MBTiANh+QDNZnQi969cnqysXCRnb670PmXRe7KOkAZOhW5hi dyOuxyVSMm/1wzgjnjqOHDIpjY8yT1vex4nXqGiwNMbFghL/NWp90u5rdDw6sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729503439; 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=jBjuXHDFNpnN3/JZgcSl35zXyY889rfK14/JFa1lzsU=; b=NLDvzpT/Oyv3zXo7LcW26LPguIxRK/g51esekEt+N0bWu/xUXxleW21XDZu4FMvc6bPpBC Fo7Is7fCTXUpamHoacHiTkr1JZH4BTrdqMJff5n077FiaW/MIkLKDXJ0/zyUv58ihoybSO q94Lf4wpHmj3geI4lu0IRx7nEdWMICT4fM2dYQdChggR+S8Xo3m5yXNt9b8TBOVtQOvjRb hxcdBP3fLuu5PHQlQvK8zYk83lyPdB6a26KzcjpOLt7lpBbF+H55dgOXKBZqmoGyWS3VIf JjgoXbZlPt+wU8j3vBASc+FaeZLiOhvmewgfhPyBj2B38KGHEMWedeNmvI7N+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729503439; a=rsa-sha256; cv=none; b=nP5wOGdo3E0ru7yGEuOLqjEjtWh6Bf4Sff/OQIumUM89GQcJ+vg5MESiTGStMvEUTPZG7w vKGIfUotq8eY7T3MsQKL2CRG45B3RqemjW8PFJFUjlSdeOcAuoi3dtsAwCzzMz6+47zHW4 qNwQ3bt0CdpECRvfLj9Rbz9/zt7dLle6UydKST2bWJQINWY5yk6eQGtIwWy0+fdQFYpKAX OSzM6djCfenOsXvOT6/ATmseDIW2Bu2I+DX9LCUykZnraB6dJNY38R401uquatf5ie9aD5 RJ+g7rjm+C62fj7yC85CslGTexX3f/J8vZ8pWaGvRZaI3D2+z79MJBV46Js1nA== 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 4XX9FW0GD9zPbn; Mon, 21 Oct 2024 09:37:19 +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 49L9bITU033088; Mon, 21 Oct 2024 09:37:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L9bIAB033085; Mon, 21 Oct 2024 09:37:18 GMT (envelope-from git) Date: Mon, 21 Oct 2024 09:37:18 GMT Message-Id: <202410210937.49L9bIAB033085@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: b751d1071c36 - main - x11/pixman: fix build on armv7 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b751d1071c3656d2afd58a5b79acad287b1eb233 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=b751d1071c3656d2afd58a5b79acad287b1eb233 commit b751d1071c3656d2afd58a5b79acad287b1eb233 Author: Robert Clausecker AuthorDate: 2024-10-18 09:32:12 +0000 Commit: Robert Clausecker CommitDate: 2024-10-21 09:36:02 +0000 x11/pixman: fix build on armv7 - due to a regression in some binutils>2.40 version, the assembly code no longer assembles. Remove leading zeros from local labels to fix this. - the arm64 assembly code has some other issue which appears to have been fixed upstream in 0.43.0, so don't bother with that; PR 276296 will address this. See also: https://gitlab.freedesktop.org/pixman/pixman/-/issues/96 MFH: 2024Q4 --- .../files/patch-pixman_pixman-arm-simd-asm.S | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/x11/pixman/files/patch-pixman_pixman-arm-simd-asm.S b/x11/pixman/files/patch-pixman_pixman-arm-simd-asm.S new file mode 100644 index 000000000000..be8be516ba3e --- /dev/null +++ b/x11/pixman/files/patch-pixman_pixman-arm-simd-asm.S @@ -0,0 +1,84 @@ +--- pixman/pixman-arm-simd-asm.S.orig 2024-10-18 09:27:57 UTC ++++ pixman/pixman-arm-simd-asm.S +@@ -818,13 +818,13 @@ generate_composite_function \ + .macro over_white_8888_8888_ca_1pixel_tail + mvn TMP0, WK1 + teq WK1, WK1, asr #32 +- bne 01f +- bcc 03f ++ bne 1f ++ bcc 3f + mov WK3, WK1 +- b 02f +-01: over_white_8888_8888_ca_combine WK1, WK3 +-02: pixst , 4, 3, DST +-03: ++ b 2f ++1: over_white_8888_8888_ca_combine WK1, WK3 ++2: pixst , 4, 3, DST ++3: + .endm + + .macro over_white_8888_8888_ca_2pixels_head +@@ -835,21 +835,21 @@ generate_composite_function \ + pixld , 8, 3, DST + mvn TMP0, WK1 + teq WK1, WK1, asr #32 +- bne 01f ++ bne 1f + movcs WK3, WK1 +- bcs 02f ++ bcs 2f + teq WK2, #0 +- beq 05f +- b 02f +-01: over_white_8888_8888_ca_combine WK1, WK3 +-02: mvn TMP0, WK2 ++ beq 5f ++ b 2f ++1: over_white_8888_8888_ca_combine WK1, WK3 ++2: mvn TMP0, WK2 + teq WK2, WK2, asr #32 +- bne 03f ++ bne 3f + movcs WK4, WK2 +- b 04f +-03: over_white_8888_8888_ca_combine WK2, WK4 +-04: pixst , 8, 3, DST +-05: ++ b 4f ++3: over_white_8888_8888_ca_combine WK2, WK4 ++4: pixst , 8, 3, DST ++5: + .endm + + .macro over_white_8888_8888_ca_process_head cond, numbytes, firstreg, unaligned_src, unaligned_mask, preload +@@ -1065,9 +1065,9 @@ generate_composite_function \ + .if offset != 0 + ldrb ORIG_W, [SRC, #offset] + .endif +- beq 01f ++ beq 1f + teq STRIDE_M, #0xFF +- beq 02f ++ beq 2f + .endif + uxtb16 SCRATCH, d /* rb_dest */ + uxtb16 d, d, ror #8 /* ag_dest */ +@@ -1077,13 +1077,13 @@ generate_composite_function \ + uxtab16 d, d, d, ror #8 + mov SCRATCH, SCRATCH, ror #8 + sel d, SCRATCH, d +- b 02f ++ b 2f + .if offset == 0 + 48: /* Last mov d,#0 of the set - used as part of shortcut for + * source values all 0 */ + .endif +-01: mov d, #0 +-02: ++1: mov d, #0 ++2: + .endm + + .macro in_reverse_8888_8888_tail numbytes, reg1, reg2, reg3, reg4