From nobody Wed Sep 14 08:53:23 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 4MSDdH5X5tz4cl5J; Wed, 14 Sep 2022 08:53:23 +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 4MSDdH4lZJz3XBJ; Wed, 14 Sep 2022 08:53:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663145603; 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=4721RqJ8WQXqqg59872foMY7xCvbyT3IRVBMaA+aET0=; b=JayhlJaVxxhNxva0k2oZmPZaV2ciK8ZQz7pShSKCDtINkUATkB6ZyXEtwuStOC8UJsZwhn IPfWrJXrsKget+NFJ6G4yf2G0P6j8Cf0bMfS8lhWXFFOxPmuV5mQW3uuftwDSwWww26+N5 9sLh+a7GCIgTJziQ9MHGgVNVzIokbi9g4d5z1xAeaGz3e6kpBBa/ItRti9KsCxfvevc+Fp c2axB4zqgn95GVBWT/aRXgEiwBUkqZvj4n8cwqbw/PbY2mYhJiLkPPMLmPnT5/1fg7rQG0 4fhNiDawbdZVY/z0mZOfcqhd54xwY95IlwBdaPTyPZI2H3GRr3DWST2LmRQGkQ== 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 4MSDdH3pJ0zd1b; Wed, 14 Sep 2022 08:53:23 +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 28E8rNgw090216; Wed, 14 Sep 2022 08:53:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28E8rNJo090215; Wed, 14 Sep 2022 08:53:23 GMT (envelope-from git) Date: Wed, 14 Sep 2022 08:53:23 GMT Message-Id: <202209140853.28E8rNJo090215@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: a705af9bfceb - main - java/openjdk8: Restore workaround for aarch64 assertions 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a705af9bfceba0fafc2612898a7afcedcb7c1865 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663145603; 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=4721RqJ8WQXqqg59872foMY7xCvbyT3IRVBMaA+aET0=; b=Q+xVp3uaIuwD2G2UletVg8X0R/YFOtBkGURErtZDkR2GJ3VAEGhxI9f/cY5RABOmEAlqsa 65D0+yFAG9vR+XuAmPqmzxScI9FSFLdfUokFs8UclubLHEbvEmFHwvtX+HyfYj/x/9EO/p sx2hd3pFARfvUHl6noRxdStfyh6al3bWIKz96pQKbljvtMFYIwGRncBSdHYUwfhMpSNgHH k4uolzYKSxr19KG8ny0ezRVVx08z2s2x4EJjU7K2r03gr7PEDOBdWB6clvOcnLSRzV9cGw oJ7DTt36rV35sP/yO0ximuT15q8fCMmg8DXBnrde1vb3WFvE3odlVacFEyAnJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663145603; a=rsa-sha256; cv=none; b=asNrWJxMoR7uavtdyxKU5HzHM3+TEq3UEiPoND4egxo/fa1jqfTm3ddySTxzS6JBClKStE DcArMVfScC38Pxl+/2J9lix3bnylfjBQF5wOzoX/0owYUBaF8z+FKDvzO3orPCR31bLkKW J/jj3odfm8EbrezHWPi4a+0DIAASDiynKDc9XlB7EJwmkUZrtpexqCTNtExNu7y3d+4Y0y i9nxMWehgRyLpVvUQ3PrNq6ZWZxJANlij/u89jvpUvAJgcw0IsIGq29GJsPTMOT6zjgwKt zIFF/OI0eRIPe61ebVBBO/crJQMHTTekSe4kowuFyykIWPROaqOE6zB5+pOx9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=a705af9bfceba0fafc2612898a7afcedcb7c1865 commit a705af9bfceba0fafc2612898a7afcedcb7c1865 Author: Dimitry Andric AuthorDate: 2022-09-14 08:52:30 +0000 Commit: Dimitry Andric CommitDate: 2022-09-14 08:52:48 +0000 java/openjdk8: Restore workaround for aarch64 assertions See also . Even though the upstream fix has been applied to this version of the JDK, some users still report the assertion "guarantee(val < (1U << nbits)) failed: Field too big for insn" occurring, when it is built with recent versions of clang. Therefore, restore the workaround that uses clang 12 to build the JDK on aarch64. PR: 264065 MFH: 2022Q3 --- java/openjdk8/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 424b00ec9720..55def79f9ee0 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -204,6 +204,16 @@ LIB_DEPENDS+= libffi.so:devel/libffi .if ${COMPILER_TYPE} == clang MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true CONFIGURE_ENV+= LIBCXX="-lc++" +.if ${COMPILER_VERSION} >= 130 && ${ARCH} == aarch64 +# PR258954: see . Even though the +# upstream fix has been applied to this version of the JDK, users still report +# the assertion "guarantee(val < (1U << nbits)) failed: Field too big for insn" +# occurring, when it is built with recent versions of clang. +LLVM_VER= 12 +BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} +CC= ${LOCALBASE}/bin/clang${LLVM_VER} +CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} +.endif .endif # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html