From nobody Sun Jan 12 21:43:23 2025 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 4YWTR44w1Cz5jsgN; Sun, 12 Jan 2025 21:43:28 +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 4YWTQz1r3Sz4fYt; Sun, 12 Jan 2025 21:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736718203; 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=uQ/1xU2uIJtF8Q0j6SVcLbQIlun7uXQSoC3K+5DX0ZU=; b=hye8TNQ/JZ/rsQCy/ppbeKyCohzEk2osB4iPmlaEQePY7WR4yUXQgSjefDMDdnv3s62Fec k9485bUgSp74yDlJbmUDuJeRbqfzQqtSB8DHxEth74CMpM7HriLb+NrBgHyqE4vQvgEhYL sbd2PhpIh0vP+GfpqNDifVJA4NWbRF6d0tTBTaG7PIYCUZHNXYjQjq44UQ0K0wzbzbiFad jiIEDNXe75+KNwYQvBmdwS6XYtivC1ufk8ChBFLaYOLVpoK9fkGsbnrMrhzMQZ3bBanNEh 2PxsRrmyVxN1WK/Oi/I/Yj1uVaI9cOyB/gIL9AwW7yVYgrLBRZfQGpwTXLMUMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736718203; 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=uQ/1xU2uIJtF8Q0j6SVcLbQIlun7uXQSoC3K+5DX0ZU=; b=R2Y0JRu+Mg2DEzp0fpDOBGDI2evoe8bKXU7AmKsEZJwaUytFXF7GAVDMc34A/SyDURHCl0 yeE2HCIkL+79aCI0BEDjxMcyqApK276BQpog64rwD9y1KNqp14Ud5dAooMGO+Rd12sQw6Y W1MzPqPsaAakjiuzD/uTk/txiDLbgfpdradttR/8pJTk//T8eqVgEHm4M/ibwGSrq7+iiP jo/805w9h0icp34uzHq3rbxzpol4YybdM6JlmOwJCP6fQKWZeOmgyw3zB8TByI/lYIN1Lm 7IMFICw6xc9P2a9RKPz7NvAJz/M6zeuqHS3+hkAF73gtZ4EFHy1HXaRsWVRktQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736718203; a=rsa-sha256; cv=none; b=Xd+GdCb0UH9tjP7FPKy2eEZu8Nyr7nHuZXXify1RUe2lgN7scG/pFjygbU3Lr0Wa6aNyF8 oAc5gzs5uEAkx8UAex9fDlDPcTtLDNi69ffbz8glDP/4OvXewEI44/q6jPz+YJ0VFxbWFz w5VSNOgDw+pmdJW9b+bwEiMs8B45k2nUSD67C/ImrlyH6CJrGmPfTnn5GHGd7scCsJr+IU TEQQ6d0OoUAnJUCJf2AFgXdgFSd0XcOryWsO+GKp9QhLqMM6Var2y1f6gCJeTwUYqxTzpo hKH0AKN/LDaUZrk7HMGMgfWilyf6HmOU775kLgTbYaL3rZBBE5poEnDaTdUCzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YWTQz185mz12V5; Sun, 12 Jan 2025 21:43:23 +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 50CLhNoJ097480; Sun, 12 Jan 2025 21:43:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50CLhNY5097476; Sun, 12 Jan 2025 21:43:23 GMT (envelope-from git) Date: Sun, 12 Jan 2025 21:43:23 GMT Message-Id: <202501122143.50CLhNY5097476@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 5b9206709f00 - main - java/openjdk11: add support for powerpc 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b9206709f00cd440f33774ae0a5fd879da5f245 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b9206709f00cd440f33774ae0a5fd879da5f245 commit 5b9206709f00cd440f33774ae0a5fd879da5f245 Author: Piotr Kubaj AuthorDate: 2025-01-11 13:09:17 +0000 Commit: Piotr Kubaj CommitDate: 2025-01-12 21:37:03 +0000 java/openjdk11: add support for powerpc --- java/openjdk11/Makefile | 9 +++++++-- ...-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 7e2f7ace60a1..8a5ebd5059b2 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -12,7 +12,7 @@ WWW= https://openjdk.java.net/ LICENSE= GPLv2 -ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le +ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ @@ -49,7 +49,7 @@ MAKE_ENV= LANG="C" \ CPP=${CPP} \ MAKEFLAGS="" -JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc64/ppc64/} +JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc/ppc/} JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} .if defined(BUILD_JRE) JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre @@ -143,7 +143,12 @@ BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk11 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 .endif +.if ${ARCH} == powerpc +CONFIGURE_ARGS+= --with-jvm-variants=zero +JDK_BUILD_JVM= zero +.else JDK_BUILD_JVM= server +.endif MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} diff --git a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp new file mode 100644 index 000000000000..d05e5b4ab266 --- /dev/null +++ b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__zero_os__bsd__zero.cpp @@ -0,0 +1,21 @@ +--- src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp.orig 2025-01-10 18:09:55 UTC ++++ src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp +@@ -432,18 +432,6 @@ extern "C" { + // Implementations of atomic operations not supported by processors. + // -- http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Atomic-Builtins.html + +-#ifndef _LP64 +-extern "C" { +- long long unsigned int __sync_val_compare_and_swap_8( +- volatile void *ptr, +- long long unsigned int oldval, +- long long unsigned int newval) { +- ShouldNotCallThis(); +- return 0; // silence compiler warnings +- } +-}; +-#endif // !_LP64 +- + #ifndef PRODUCT + void os::verify_stack_alignment() { + }