summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMikael Urankar <mikael@FreeBSD.org>2021-05-14 10:30:52 +0200
committerMikael Urankar <mikael@FreeBSD.org>2021-05-14 10:30:52 +0200
commit1025536a1c76b990b4d38df2b27b8fc96cea76c6 (patch)
tree533cee8c8b2c3ced6c1d26ea6cb9bd44e031c506 /java
parent0c42339a18b2dbe273d52ce989d67850d4c2d5a4 (diff)
downloadfreebsd-ports-1025536a1c76b990b4d38df2b27b8fc96cea76c6.zip
java/openjdk8: Fix build on armv6/7
PR: 255326 Reported by: tech-lists@zyxst.net Approved by: portmgr (tier-2 / build fix blanket)
Diffstat (limited to 'java')
-rw-r--r--java/openjdk8/files/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp24
-rw-r--r--java/openjdk8/files/patch-hotspot_src_os_bsd_vm_os__perf__bsd.cpp18
2 files changed, 42 insertions, 0 deletions
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 <mach/task_info.h>
+ #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 <sys/user.h>
+ #endif
+ #include <sys/sched.h>