From owner-dev-commits-ports-all@freebsd.org Fri May 14 08:33:19 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5CF3D63DB35; Fri, 14 May 2021 08:33:19 +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 4FhMHM2BYCz4sVt; Fri, 14 May 2021 08:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3378E7290; Fri, 14 May 2021 08:33:19 +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 14E8XJYE091473; Fri, 14 May 2021 08:33:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14E8XJs6091472; Fri, 14 May 2021 08:33:19 GMT (envelope-from git) Date: Fri, 14 May 2021 08:33:19 GMT Message-Id: <202105140833.14E8XJs6091472@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 1025536a1c76 - main - java/openjdk8: Fix build on armv6/7 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1025536a1c76b990b4d38df2b27b8fc96cea76c6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 May 2021 08:33:19 -0000 The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=1025536a1c76b990b4d38df2b27b8fc96cea76c6 commit 1025536a1c76b990b4d38df2b27b8fc96cea76c6 Author: Mikael Urankar AuthorDate: 2021-05-14 08:30:52 +0000 Commit: Mikael Urankar CommitDate: 2021-05-14 08:30:52 +0000 java/openjdk8: Fix build on armv6/7 PR: 255326 Reported by: tech-lists@zyxst.net Approved by: portmgr (tier-2 / build fix blanket) --- ...spot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp | 24 ++++++++++++++++++++++ .../patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp | 18 ++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp new file mode 100644 index 000000000000..bfda45b71e85 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp @@ -0,0 +1,24 @@ +--- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig 2021-04-26 16:05:58 UTC ++++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp +@@ -446,21 +446,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() { diff --git a/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp b/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp new file mode 100644 index 000000000000..c040f715d4f4 --- /dev/null +++ b/java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp @@ -0,0 +1,18 @@ +--- hotspot/src/os/bsd/vm/os_perf_bsd.cpp.orig 2021-04-26 16:00:48 UTC ++++ hotspot/src/os/bsd/vm/os_perf_bsd.cpp +@@ -43,6 +43,15 @@ + #include + #else + #ifndef __NetBSD__ ++ #ifdef __FreeBSD__ ++ /* ++ * Older versions of FreeBSD accidentally include machine/frame.h from ++ * sys/user.h header. Disable this bad behavior, because a ++ * 'non-standard' structure 'frame' conflict with an internal structure ++ * with the same name. ++ */ ++ #define _MACHINE_PCB_H_ ++ #endif + #include + #endif + #include