From nobody Wed Aug 07 16:47:09 2024 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 4WfGL613MHz5SkvH; Wed, 07 Aug 2024 16:47:10 +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 4WfGL56Cfzz43y0; Wed, 7 Aug 2024 16:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723049229; 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=ZRjD19iS5Mjm8zhlwY22wPgKMUScrBtmgjNYKToDetw=; b=LY+jxjaQeZzaKFPKsl3bpDJceOgGOsaZzBm6BFDV8vDAZMFi2sJccjdTJ7cAlM1e/sq0J/ CYRbhS+u59SeHhfX639SjxmFtvY9yV8VYPaON0QpqjAARtr9QwWtfZSV+ldcjuJxrEEma9 f4ZkhsS3brHnP5GJyp+W1EALBFWaJAGYBT61fpyoODk2snYMLz7gR1nHGASuTSm8xtwm+P Q/Omg8BOpoadDfruhbSC9d+RmJY/E9MROo8pG7TtPxA90wVWN1wnw+xZnDzuzYtW9s0EkG FAlyivbkn3hhQlMdILx6an6m4jXUB4tF8E8QgCs+PEB2qBE9Df8E/PSBvTkkjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723049229; a=rsa-sha256; cv=none; b=dQiPbp4gUnxVubqmbdBe4mjTzg/gVpY5Xo0X7x3PQ6CXGwuyG9J1tbKDQmWKWJMvIIlb4I sk+YksISHWPDmQjqY1TdXUHCec/8hVkKObvC44fXQ62/X2nZMAjK5xKRfogTjn0Tsczbht W+axlui4MAdZkvYXcNhV0IqHz2z0Rt57EZi4fJ80xTSoPBLj07MScV7dDoIjB5T5XLUNbY Z3CXFVH0pFh1rNR/wSOSqm9rXKTXPjyOlvkbqqsS3E3h9Zt/ZxpsedIGTlYc/xhEIrKE2v j+dkaiplNA252DVNBYqnAQVpZMSis8zBYAKQZqUwPkFXv4XmLfmNVflDO/nidw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723049229; 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=ZRjD19iS5Mjm8zhlwY22wPgKMUScrBtmgjNYKToDetw=; b=xKvDj05Rae1eDSNrq5VXyRD6jUO7RptzBM5w7oNo4D9sYZVN08ks7hLW6oULhz9/6PxT7/ ngn4Wxzza+ECo6ByQQcTfKNNcdnJ0gpcS+qTBo/8f6OKyoY1z4KP5duHTFsw5H9r5B0UdG LG9V6iuL55Bm2Msep42qdsoN+fQAPSSATykZSvN9mXR14677o9DuDTSnNY+mOVkRtprdrL oVd4iyfLstVL8IE86ryOxTkmXTJqjB8YmwPUOfDEazn3fj115Ofw2iynIsHKhLkgMe4mgd V//9c3fJili/bPpox6ZlZ3drcZMnBW1fZX4zqo3s0LIIYq+x0808fxgz7v6iNQ== 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 4WfGL55j71zxxP; Wed, 7 Aug 2024 16:47:09 +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 477Gl9cr042008; Wed, 7 Aug 2024 16:47:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477Gl9Lp042005; Wed, 7 Aug 2024 16:47:09 GMT (envelope-from git) Date: Wed, 7 Aug 2024 16:47:09 GMT Message-Id: <202408071647.477Gl9Lp042005@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 55925767376b - main - java/openjdk8: fix build with clang 19 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55925767376bb8d4ffe1a0304555988464c25599 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=55925767376bb8d4ffe1a0304555988464c25599 commit 55925767376bb8d4ffe1a0304555988464c25599 Author: Dimitry Andric AuthorDate: 2024-08-01 10:34:13 +0000 Commit: Dimitry Andric CommitDate: 2024-08-07 16:44:09 +0000 java/openjdk8: fix build with clang 19 Clang 19 is now more strict about undefined integral expressions used as constants in enum, which results in errors compiling java/openjdk8, similar to: /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/share/vm/oops/cpCache.hpp:195:34: error: expression is not an integral constant expression 195 | option_bits_mask = ~(((-1) << tos_state_shift) | (field_index_mask | parameter_size_mask)) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/share/vm/oops/cpCache.hpp:195:42: note: left shift of negative value -1 195 | option_bits_mask = ~(((-1) << tos_state_shift) | (field_index_mask | parameter_size_mask)) | ^ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/share/vm/code/dependencies.hpp:173:27: error: expression is not an integral constant expression 173 | all_types = ((1 << TYPE_LIMIT) - 1) & ((-1) << FIRST_TYPE), | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/share/vm/code/dependencies.hpp:173:59: note: left shift of negative value -1 173 | all_types = ((1 << TYPE_LIMIT) - 1) & ((-1) << FIRST_TYPE), | ^ In file included from /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp:43: /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h:226:33: error: expression is not an integral constant expression 226 | AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use. | ^~~~~~~~ /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/jdk/src/share/native/com/sun/java/util/jar/pack/constants.h:226:37: note: left shift of negative value -1 226 | AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use. | ^ In openjdk11 and later, the (-1) constants have been replaced by the unsigned variant (~0u), which fixes these errors. PR: 280559 Approved by: glewis (maintainer) MFH: 2024Q3 --- .../files/patch-hotspot_src_share_vm_code_dependencies.hpp | 11 +++++++++++ .../files/patch-hotspot_src_share_vm_oops_cpCache.hpp | 11 +++++++++++ ...dk_src_share_native_com_sun_java_util_jar_pack_constants.h | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/java/openjdk8/files/patch-hotspot_src_share_vm_code_dependencies.hpp b/java/openjdk8/files/patch-hotspot_src_share_vm_code_dependencies.hpp new file mode 100644 index 000000000000..8b0a6e6f8342 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_share_vm_code_dependencies.hpp @@ -0,0 +1,11 @@ +--- hotspot/src/share/vm/code/dependencies.hpp.orig 2024-07-27 18:28:39 UTC ++++ hotspot/src/share/vm/code/dependencies.hpp +@@ -170,7 +170,7 @@ class Dependencies: public ResourceObj { + LG2_TYPE_LIMIT = 4, // assert(TYPE_LIMIT <= (1<