From nobody Sat Feb 11 19:08:54 2023 X-Original-To: dev-commits-ports-all@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 4PDgBG3r2gz3pvpZ; Sat, 11 Feb 2023 19:08:54 +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 4PDgBG3KMhz3DQH; Sat, 11 Feb 2023 19:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676142534; 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=yDU96BMoKmRGhs2Ax1QQh9ud+lrEI7XgTV5YNRe3b4s=; b=YMK4I/RsafbbFO9tMLKCi6WbPn0g1vSmAA9SMrAln5AhdhPETp3b8c7arZLmdrB9dkLl7/ c0dD2khJRe/S+KyxywOEX6FwzFt55je1DviK4AeNkccT36rQicg+EOicJZ+QJT4SmDcSj9 TlJQFTNE3VrbmSMdN2hXh/lQvQXBJee+7LF8x5gRWp3zxU89FK/dxVcJQXw8gC6+29+iE+ jBYtwuosKgIVdVebx8MJP3yEtfValQWkuBlv/6x6cpgGuIpv49PBRYUnAQWWIQo5MQBkOy 4OtYtdWfhHtPlR67p57AaK/4/z9HppOV+TuhrFIZZFi7eaU6sgmxgzeIMaW9cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676142534; 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=yDU96BMoKmRGhs2Ax1QQh9ud+lrEI7XgTV5YNRe3b4s=; b=ZghF31EXWqvvQp/OSDQfsIP2a4JxJJo6J419nPpBbpHfl9jMY/kZZW5wZajrBmiFTnXlGe St7VGAI6JiU8wWCduU8Arh+hKlmomNnglqq9b0gUHfjscR1vGympdjl/bRxqu1kuVXptuc ZxjQPh4Rqnt3kiFBkgUAKLsQu5G/qm8tOvmD4fHSshkyJbEZehjgqgwZ3u/HnqJ1ue/Mcm HHlc1MGVQpiBGQut2ElRYS2aEmmETedaf83tUGNUDSvsnBETlJ7dF7WZrVqD3+y9FQXH9U y0n3AZA80cczC3hXuiQPxVPuIj3QxwtW2KivlTQY6F9eG5TM1+B/JCWYRrxWQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676142534; a=rsa-sha256; cv=none; b=PD+z2IUrjgSrcVlT6HuRKVcwc+yXfKoBNu54e05XRdksZ9ZQ0Xo0lL2EgRk9NeEWRyRIr8 MBp/0rOIWS3mDaRZwWYdmWDWYSoAWLoaaJZ3TELlvs6eif+bcuBT+03RIFD43S0WEjoSS+ pd1Zbjz5e8U3Qt+yp4ysO/O8KROIw5ZNedjQAsB6DfDaF/YgPXdVsx/vMr48W6rVOzpIoy JPuolI/6CAB233aCPqYnzkCVFa4bM4F3CyY/z6p+EYNPmBeg0Hsu29dLsnKAOPCAfLmWdm /0zF/kmzUkQxukj7sfCIa6e9oAfKIpxLE5jGehgJYHIxL12Dp5a9QM749QzD3Q== 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 4PDgBG2NsHz185F; Sat, 11 Feb 2023 19:08:54 +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 31BJ8s4E074594; Sat, 11 Feb 2023 19:08:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31BJ8sLX074593; Sat, 11 Feb 2023 19:08:54 GMT (envelope-from git) Date: Sat, 11 Feb 2023 19:08:54 GMT Message-Id: <202302111908.31BJ8sLX074593@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: fd7028d74968 - main - java/openjdk19: Fix the build on aarch64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: fd7028d74968d3f692fd42e81514d561398aaa02 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd7028d74968d3f692fd42e81514d561398aaa02 commit fd7028d74968d3f692fd42e81514d561398aaa02 Author: Greg Lewis AuthorDate: 2023-02-11 19:08:28 +0000 Commit: Greg Lewis CommitDate: 2023-02-11 19:08:28 +0000 java/openjdk19: Fix the build on aarch64 * Apply a similar patch as was applied to java/openjdk17 --- java/openjdk19/Makefile | 5 +++++ ...ra-patch-src_hotspot_share_runtime_arguments.cpp | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/java/openjdk19/Makefile b/java/openjdk19/Makefile index a652a90aa78e..abf11ebb221b 100644 --- a/java/openjdk19/Makefile +++ b/java/openjdk19/Makefile @@ -157,6 +157,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/openjdk19/files/extra-patch-src_hotspot_share_runtime_arguments.cpp b/java/openjdk19/files/extra-patch-src_hotspot_share_runtime_arguments.cpp new file mode 100644 index 000000000000..80ef25c560f6 --- /dev/null +++ b/java/openjdk19/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 + } +