java/openjdk8: Fix build on armv6/7

PR:		255326
Reported by:	tech-lists@zyxst.net
Approved by:	portmgr (tier-2 / build fix blanket)
This commit is contained in:
Mikael Urankar 2021-05-14 10:30:52 +02:00
parent 0c42339a18
commit 1025536a1c
2 changed files with 42 additions and 0 deletions

View file

@ -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() {

View file

@ -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>