From nobody Sun May 8 05:25:16 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 96BC51ACC336; Sun, 8 May 2022 05:25:16 +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 4Kwt6h3qZvz3J9B; Sun, 8 May 2022 05:25:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651987516; 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=f5vmgBWWL7RIp5hcQjQvNrT0qz5o8d0A1KZ1iQm5F7k=; b=Vj+DYndnZG5M9TkU77JZ7VHsFuZ7TWKx3MhPMULhAOxX2if3gjPv5yHR63UKiCErkihwFc BebHSVmJdwXU+zVMEl2fc39P3Rxkliy12HMlIqeI33Sh3XgVG8Pop/MmlJAC9Gh3kWnav/ 2bfPbU6BorUjW/5gE0oW/CxiDnR0ObYR8PrVJbCnmu+jxgkEGWv0ytCLxVxdRqL71qWn78 4LsIhS6ceDf7B8FJIF21hATZk3Edw6tIF/ZYj0Dpb81+et7VjoQw9kYPyZQtJ6vcf9b5CO xqyPEf5U6AvBo42jhPyAr0xy14bE2P9pLDbfVrSxg7vK4SsMehsSDMHmvlVPXg== 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 633981EBF8; Sun, 8 May 2022 05:25:16 +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 2485PGRe011196; Sun, 8 May 2022 05:25:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2485PGaJ011195; Sun, 8 May 2022 05:25:16 GMT (envelope-from git) Date: Sun, 8 May 2022 05:25:16 GMT Message-Id: <202205080525.2485PGaJ011195@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: 1a550987749d - main - java/openjdk18: Fix the build on aarch64 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: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a550987749db80b46153ef8ad5016313b23a51e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651987516; 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=f5vmgBWWL7RIp5hcQjQvNrT0qz5o8d0A1KZ1iQm5F7k=; b=WeS8oX/eYYsreIQnbfn/hKYqUKFGCQpnew5l5PRTtCt96H7ydcdJ7VcyLegachUNaAoyBn zSs6nWm4lmd4j7bxp3Z9wCHALKNmqC6xL7st76mms2pcZg/qFB+CvPt0DVV8hKX+sAirUg ybl+4I2uAb27JJYB+y8GZyjdH/2ZFr25Pj5hdWms1xKi6+w72FAZHrNIhxWLgfGNFi0U0m 68S6+xZJes5HLrINnYG3zgvDwP9UHJ7PxrTqf252j5lhWkVtCxG/QYckbo/673S3yYipEe 97WQ1g3Tgo/0xrozZl+4PhPC34KSPBhC7aywWt5JHJNnghbuJLM/arFPyAkm2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651987516; a=rsa-sha256; cv=none; b=I25izONeqiVYZQv0jfx9mK3y7YKVin2HS0IaNvDPW3xX9oOy1qQR5T/QW1GfJE3LDGVLhd LvR9dPNdJ4zCLkE8J7Dgd68HW+d5A4w+nY5w33AIAxvd0z7l54AfIXu2ihGi5Xq9ZjoqMG 3KDvb3w+wMtxABKghXWrWEWozGnOuKdDbzAlnEbyh0xzzpDRGsKsMzWHXPTeK7sdz9F7F/ FJIWLYRySduce3vxQy2CZSIbLiina/Z1oP74j7yJ3nYLWIAkQ9Ei5O5fw7DD42i1iPq5zu ewPgkutUOt928cJVYy+hSvG/3xlChZWLgF5U77eYYyd6vCEpFJ24e7wYiuulfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a550987749db80b46153ef8ad5016313b23a51e commit 1a550987749db80b46153ef8ad5016313b23a51e Author: Greg Lewis AuthorDate: 2022-05-08 05:24:21 +0000 Commit: Greg Lewis CommitDate: 2022-05-08 05:24:21 +0000 java/openjdk18: Fix the build on aarch64 --- ...pot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.S | 31 ++++++++++++++++++ ...t_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp | 38 ++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.S b/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.S new file mode 100644 index 000000000000..35c926fd1a0a --- /dev/null +++ b/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.S @@ -0,0 +1,31 @@ +--- src/hotspot/os_cpu/bsd_aarch64/atomic_bsd_aarch64.S ++++ src/hotspot/os_cpu/bsd_aarch64/atomic_bsd_aarch64.S +@@ -47,6 +47,28 @@ aarch64_atomic_fetch_add_4_default_impl: + mov w0, w2 + ret + ++ .global aarch64_atomic_fetch_add_8_relaxed_default_impl ++ .align 5 ++aarch64_atomic_fetch_add_8_relaxed_default_impl: ++ prfm pstl1strm, [x0] ++0: ldxr x2, [x0] ++ add x8, x2, x1 ++ stxr w9, x8, [x0] ++ cbnz w9, 0b ++ mov x0, x2 ++ ret ++ ++ .global aarch64_atomic_fetch_add_4_relaxed_default_impl ++ .align 5 ++aarch64_atomic_fetch_add_4_relaxed_default_impl: ++ prfm pstl1strm, [x0] ++0: ldxr w2, [x0] ++ add w8, w2, w1 ++ stxr w9, w8, [x0] ++ cbnz w9, 0b ++ mov w0, w2 ++ ret ++ + .globl aarch64_atomic_xchg_4_default_impl + .align 5 + aarch64_atomic_xchg_4_default_impl: diff --git a/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp b/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp new file mode 100644 index 000000000000..a71932f53fe2 --- /dev/null +++ b/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.hpp @@ -0,0 +1,38 @@ +--- src/hotspot/os_cpu/bsd_aarch64/atomic_bsd_aarch64.hpp ++++ src/hotspot/os_cpu/bsd_aarch64/atomic_bsd_aarch64.hpp +@@ -184,9 +184,14 @@ inline D Atomic::PlatformAdd<4>::fetch_and_add(D volatile* dest, I add_value, + atomic_memory_order order) const { + STATIC_ASSERT(4 == sizeof(I)); + STATIC_ASSERT(4 == sizeof(D)); +- D old_value +- = atomic_fastcall(aarch64_atomic_fetch_add_4_impl, dest, add_value); +- return old_value; ++ aarch64_atomic_stub_t stub; ++ switch (order) { ++ case memory_order_relaxed: ++ stub = aarch64_atomic_fetch_add_4_relaxed_impl; break; ++ default: ++ stub = aarch64_atomic_fetch_add_4_impl; break; ++ } ++ return atomic_fastcall(stub, dest, add_value); + } + + template<> +@@ -195,9 +200,14 @@ inline D Atomic::PlatformAdd<8>::fetch_and_add(D volatile* dest, I add_value, + atomic_memory_order order) const { + STATIC_ASSERT(8 == sizeof(I)); + STATIC_ASSERT(8 == sizeof(D)); +- D old_value +- = atomic_fastcall(aarch64_atomic_fetch_add_8_impl, dest, add_value); +- return old_value; ++ aarch64_atomic_stub_t stub; ++ switch (order) { ++ case memory_order_relaxed: ++ stub = aarch64_atomic_fetch_add_8_relaxed_impl; break; ++ default: ++ stub = aarch64_atomic_fetch_add_8_impl; break; ++ } ++ return atomic_fastcall(stub, dest, add_value); + } + + template<>