From nobody Tue Jan 24 05:19:33 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 4P1Fdd4H5dz3bKb7; Tue, 24 Jan 2023 05:19:33 +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 4P1Fdd3mV6z4P2p; Tue, 24 Jan 2023 05:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674537573; 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=NHG4bNS5kD2DhmR0FualSb4Tr8rusgpAQYIEm69IabU=; b=E34HqCHwGShEl3RvoaHDzSW3lARA0aMHCyOla26sye7NkQjlJFje5C1hSVTZCwLHSmmXpv o9tOjQysmWW3T7AINtsJ7DIvKIODac5mJeEliN/n8hOIIMn5xvmDjTiZKmAUQd7pD1Hq2L 3EOmM9tdAUvz1j6Z2JXoku8yApnFVF42cPGcTY0T8aiDS75X7Tx9h23HT4h90AZgzwYX2C l1K33tUvJh1aL7A6CUykZi+Dpf161Blsk2fYgY5ULPxNaoAPHKDfdcc+6Ri1Sod9FtXZkc dhAiE4F5cH5lHvBKHwl8WiYcYKJgXzeRrVlQSBxMrP1umyuQzKNPKAX8p8w2EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674537573; 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=NHG4bNS5kD2DhmR0FualSb4Tr8rusgpAQYIEm69IabU=; b=oVF9JB5BzTZ4d/evcZ1sNjhsRSny/LsWkaXF3rIMCwl15mVw0CL+CkxHURtcUTJjO3qvkB iOtLycG9CA7rShJxXeWcyvlXyAtISWIz8ut3QruQj3ZShHQs8p2rgxsVR0ySjTWp5jCfuo tYoWWVPTrLUIn9GwNMoCzV7eroOLoi0MZxLSjWu2Oetgm4lV6jARAonDc0+UCvgvBmd9RU XZ2z1RPOwtOqu5SMGsjVihZnnpnWCsHBTkXHyl0iRJTk7EBIstJe6mc6vda7reTx2rJBLP PZPOlCAmvuYvMPX1ERo0LjI8DQ0MA44RqjfH8gvG1ki+T3pJwuxLqJ4An4Glsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674537573; a=rsa-sha256; cv=none; b=wVNtal+r9buGT9dptwZGPlz6c5Te1ehSpZKsXg0OPtOhBjwxTe2mnzPBeScNLepPfesuKQ SZfVP/wv+kb/k3V6VBOWpQHywOQ9q+tPBKhtZKxQ1ERbshvZvlXooRsEt2s0do6c0rKWwP iOSIS73t9EVxDu4UQNMlGTTLavX9LqIwGED1CiesJngfl1Qch8Rt+QAiTgzAM9g9qwEGL3 RaUTPve6btz/B6WueyJRYL3mkHDeWhuztb3jVltxqZHdTOTlt3EWcwpXOq5UAqFqUcBtPW au+LDm7CZtWMnqXl2sn/WyhcycOZPkM3vxERjklOtXx6fkmBspkemi34Huhaqw== 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 4P1Fdd2QYVzxSt; Tue, 24 Jan 2023 05:19:33 +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 30O5JXoL020084; Tue, 24 Jan 2023 05:19:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O5JXZm020083; Tue, 24 Jan 2023 05:19:33 GMT (envelope-from git) Date: Tue, 24 Jan 2023 05:19:33 GMT Message-Id: <202301240519.30O5JXZm020083@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: b39d592147e2 - main - java/openjdk17: Fix the build on some aarch64 machines 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: b39d592147e2c549d009e01dba155f14128e600f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=b39d592147e2c549d009e01dba155f14128e600f commit b39d592147e2c549d009e01dba155f14128e600f Author: Greg Lewis AuthorDate: 2023-01-24 05:15:43 +0000 Commit: Greg Lewis CommitDate: 2023-01-24 05:19:21 +0000 java/openjdk17: Fix the build on some aarch64 machines * Disable CompressedClassPointers on aarch64. This fixes the build on some aarch64 machines where it previously failed, e.g. RPI4, and doesn't seem to affect the build on others (AWS aarch64 hardware). This is based on and uses a patch initially created by ronald@ PR: 260187 Tested by: ronald@ --- java/openjdk17/Makefile | 5 +++++ ...ra-patch-src_hotspot_share_runtime_arguments.cpp | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index 38dc8ac87719..d880897b027c 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -161,6 +161,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/openjdk17/files/extra-patch-src_hotspot_share_runtime_arguments.cpp b/java/openjdk17/files/extra-patch-src_hotspot_share_runtime_arguments.cpp new file mode 100644 index 000000000000..80ef25c560f6 --- /dev/null +++ b/java/openjdk17/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 + } +