From nobody Thu Feb 02 04:49:55 2023 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 4P6mYH6Dz8z3bnPm; Thu, 2 Feb 2023 04:49:55 +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 4P6mYH5KCdz4Br3; Thu, 2 Feb 2023 04:49:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675313395; 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=yLl2YRXWU3btWvgTCQi/7lqyX1NAdzkgxLch2brAuM8=; b=cJP4EC0/NNuXi6maOqiaemhAOpzbIUTQ4//hpbQPP1jbXsn3HntM+/Qoc/U4bnDjtQLojH Kea+jD+M1dQbrUoEqLqFQBY8hznIv8291AG0NWPSPQ8iPrT3oZt/AE3yoawKtno9dShvIH y3ew9Nn/MRNnYfC55es4HJHpXI3RuFReCnQm/TwInou2EMFAmhVR3w6KQOQ1VIsh7u57i/ K+85c9Nmr3ILrBA0PMk27IUiB/28auXmPPt6Rp4OR+HQ4eevx/UVTHxQFzk69bSR1ie5uj WcdsmF0Qio0JSuUcBQDqWQ9PYEky7GzFfdudKLOSQNAMa3qV3FZDIKBhqO1mLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675313395; 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=yLl2YRXWU3btWvgTCQi/7lqyX1NAdzkgxLch2brAuM8=; b=Q6l2GugcJ+/+SoGl5P1Z5nwMtJoLfiRsBMWU+016KU4oPCiwd1cRhU5YpYzFKeBINJ1SEh Iv0BFqtkDqzVlXittRbz+CDiC/5fyLIOtWrpCVuoOL0ztRuBTD/7A8vn1CQGOelQN57v0D D7Zq8R98ZgP5hU637aG+OSSC7CcavpZrcvV4j+p+r0yiJuwlc4Ii1ojEMMM71qTWFpag2X J2499qkdppQp1GgJH/2V7MoK/CN/XW2V6mbCgULCSdOzzdr20SO4E57USZi2zZ1G8Uws/U vX8JW1XnTT41aXFRutHWYnFU8env6/0dbhirOfjg4ajHHmMt9vKDDmgT0fankg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675313395; a=rsa-sha256; cv=none; b=VPGXhhPEeKk0OvpJaapuKXhXa/Y+fe3Knfj9txM8Wo1pfI2cCZOw+e4/y8hn6hk0czzzln xnl69zz65JYetiVQZK70SiMRfZIs89C1pdqYpLFT4nxj9B7p9XgX014wuzyavLOhfmr+FD iz25ae0225VcdjhLw1RybA24ZsXnpuIc/ekbIBjSpQyUHAd7/3xP7oCqTThye+Nz533H3C 5aVzZv9HNtlRjsGByPtp9Aovz21nVbjjOnyTrzh0tC7A0DkzX9paMHWFzmMLIKEr2lL+xW rQ3HAHoebQSx6EEdK2Br/OTFf0EmMLCAsRFT39T0fTiX3NDfFDxiIp9cI1Tzhg== 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 4P6mYH4NQDzhDv; Thu, 2 Feb 2023 04:49:55 +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 3124ntQX019387; Thu, 2 Feb 2023 04:49:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3124ntgP019386; Thu, 2 Feb 2023 04:49:55 GMT (envelope-from git) Date: Thu, 2 Feb 2023 04:49:55 GMT Message-Id: <202302020449.3124ntgP019386@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: 5d7631b4566a - 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: 5d7631b4566ab101b5030fcbc87a55a520f01ae6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d7631b4566ab101b5030fcbc87a55a520f01ae6 commit 5d7631b4566ab101b5030fcbc87a55a520f01ae6 Author: Greg Lewis AuthorDate: 2023-02-02 04:49:05 +0000 Commit: Greg Lewis CommitDate: 2023-02-02 04:49:05 +0000 java/openjdk18: Fix the build on aarch64 * Apply a similar patch as was applied to java/openjdk17 * Remove a patch which has been upstreamed --- java/openjdk18/Makefile | 5 ++++ ...a-patch-src_hotspot_share_runtime_arguments.cpp | 21 +++++++++++++++ ...pot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.S | 31 ---------------------- 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/java/openjdk18/Makefile b/java/openjdk18/Makefile index 1b9120750fae..b06301482dab 100644 --- a/java/openjdk18/Makefile +++ b/java/openjdk18/Makefile @@ -171,6 +171,11 @@ CONFIGURE_ARGS+= --disable-dtrace .if ${ARCH} == powerpc64 && ${OSREL:C/\.[0-9]//} == 12 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp .endif +.if ${ARCH} == aarch64 +CONFIGURE_ARGS+= --with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers +MAKE_ENV+= JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers" +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_share_runtime_arguments.cpp +.endif .if empty(ICONV_LIB) ICONV_CFLAGS= -DLIBICONV_PLUG diff --git a/java/openjdk18/files/extra-patch-src_hotspot_share_runtime_arguments.cpp b/java/openjdk18/files/extra-patch-src_hotspot_share_runtime_arguments.cpp new file mode 100644 index 000000000000..80ef25c560f6 --- /dev/null +++ b/java/openjdk18/files/extra-patch-src_hotspot_share_runtime_arguments.cpp @@ -0,0 +1,21 @@ +--- src/hotspot/share/runtime/arguments.cpp.orig 2023-01-15 10:13:55.469227000 -0800 ++++ src/hotspot/share/runtime/arguments.cpp 2023-01-15 10:20:49.218102000 -0800 +@@ -1557,6 +1557,10 @@ + // set_use_compressed_oops(). + void Arguments::set_use_compressed_klass_ptrs() { + #ifdef _LP64 ++# if defined(__FreeBSD__) && defined(AARCH64) ++ FLAG_SET_DEFAULT(UseCompressedClassPointers, false); ++ FLAG_SET_ERGO(UseCompressedClassPointers, false); ++# else + // On some architectures, the use of UseCompressedClassPointers implies the use of + // UseCompressedOops. The reason is that the rheap_base register of said platforms + // is reused to perform some optimized spilling, in order to use rheap_base as a +@@ -1582,6 +1586,7 @@ + } + } + } ++# endif // __FreeBSD__ && AARCH64 + #endif // _LP64 + } + 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 deleted file mode 100644 index 35c926fd1a0a..000000000000 --- a/java/openjdk18/files/patch-src_hotspot_os__cpu_bsd__aarch64_atomic__bsd__aarch64.S +++ /dev/null @@ -1,31 +0,0 @@ ---- 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: