Attachment #254105 for bug #255662

Lines 49-54 MAKE_ENV= LANG="C" \ Link Here

(-)b/java/openjdk11/Makefile (+1 lines)
49	CXX=${CXX} \	49	CXX=${CXX} \
50	CPP=${CPP} \	50	CPP=${CPP} \
51	MAKEFLAGS=""	51	MAKEFLAGS=""
		52	# LOG=debug
52		53
53	JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc64/ppc64/}	54	JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc64/ppc64/}
54	JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}	55	JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}

Added Link Here

(-)b/java/openjdk11/files/patch-make_hotspot_lib_CompileJvm.gmk (+11 lines)
1	--- make/hotspot/lib/CompileJvm.gmk.orig 2024-10-04 16:07:55.502680000 +0200
2	+++ make/hotspot/lib/CompileJvm.gmk 2024-10-04 16:07:03.672629000 +0200
3	@@ -109,7 +109,7 @@ ifeq ($(call And, $(call isTargetOs, linux) $(call isT
4	ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, arm)), true)
5	JVM_EXCLUDE_PATTERNS += arm_64
6
7	-else ifeq ($(call And, $(call isTargetOs, bsd) $(call isTargetCpu, bsd-arm)), true)
8	+else ifeq ($(call And, $(call isTargetOs, bsd) $(call isTargetCpu, arm)), true)
9	JVM_EXCLUDE_PATTERNS += arm_64
10
11	else ifeq ($(call And, $(call isTargetOs, linux) $(call isTargetCpu, aarch64)), true)




This patch fixes the following error:

In file included from jdk11u-jdk-11.0.24-8-1/src/hotspot/os/bsd/os_perf_bsd.cpp:47:
In file included from /usr/include/sys/user.h:51:
In file included from /usr/include/vm/pmap.h:88:
In file included from /usr/include/machine/pmap.h:48:
In file included from /usr/include/sys/systm.h:46:
/usr/include/machine/cpufunc.h:185:1: error: static declaration of 'breakpoint' follows non-static declaration
  185 | breakpoint(void)
      | ^
/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/hotspot/share/utilities/breakpoint.hpp:31:17: note: previous declaration is here
   31 | extern "C" void breakpoint();



--- src/hotspot/os/bsd/os_perf_bsd.cpp.orig	2024-10-07 16:08:13.559278000 +0200
+++ src/hotspot/os/bsd/os_perf_bsd.cpp	2024-10-07 16:09:09.010766000 +0200
@@ -43,6 +43,10 @@
        * with the same name.
        */
       #define _MACHINE_PCB_H_
+     /*
+      * do not redefine breakpoint on armv7
+      */
+      #define _MACHINE_CPUFUNC_H_
     #endif
     #include <sys/user.h>
   #endif




This patch fixes the following error:

In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c:40:
In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc_impl.h:30:
/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h:79:13: error: cannot combine with previous 'int' declaration specifier
   79 | typedef int bool;
      |             ^
/usr/include/stdbool.h:37:14: note: expanded from macro 'bool'
   37 | #define bool    _Bool


--- src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h.orig	2024-10-07 16:02:52.117023000 +0200
+++ src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h	2024-10-07 16:02:15.020023000 +0200
@@ -76,9 +76,11 @@ typedef int bool;
 
 // This C bool type must be int for compatibility with BSD calls and
 // it would be a mistake to equivalence it to C++ bool on many platforms
+#if defined(__FreeBSD__) && !defined(__bool_true_false_are_defined)
 typedef int bool;
 #define true  1
 #define false 0
+#endif  // FreeBSD && !__bool_true_false_are_defined
 
 #endif // __APPLE__
 

Return to bug 255662

Added Link Here

(-)b/java/openjdk11/files/patch-src_hotspot_os_bsd_os__perf__bsd.cpp (+28 lines)
1	This patch fixes the following error:
2
3	In file included from jdk11u-jdk-11.0.24-8-1/src/hotspot/os/bsd/os_perf_bsd.cpp:47:
4	In file included from /usr/include/sys/user.h:51:
5	In file included from /usr/include/vm/pmap.h:88:
6	In file included from /usr/include/machine/pmap.h:48:
7	In file included from /usr/include/sys/systm.h:46:
8	/usr/include/machine/cpufunc.h:185:1: error: static declaration of 'breakpoint' follows non-static declaration
9	185 \| breakpoint(void)
10	\| ^
11	/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/hotspot/share/utilities/breakpoint.hpp:31:17: note: previous declaration is here
12	31 \| extern "C" void breakpoint();
13
14
15
16	--- src/hotspot/os/bsd/os_perf_bsd.cpp.orig 2024-10-07 16:08:13.559278000 +0200
17	+++ src/hotspot/os/bsd/os_perf_bsd.cpp 2024-10-07 16:09:09.010766000 +0200
18	@@ -43,6 +43,10 @@
19	* with the same name.
20	*/
21	#define _MACHINE_PCB_H_
22	+ /*
23	+ * do not redefine breakpoint on armv7
24	+ */
25	+ #define _MACHINE_CPUFUNC_H_
26	#endif
27	#include <sys/user.h>
28	#endif

Added Link Here

(-)b/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_libproc.h (-1 / +25 lines)
0	-	1	This patch fixes the following error:
		2
		3	In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c:40:
		4	In file included from /usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc_impl.h:30:
		5	/usr/ports/java/openjdk11/work/jdk11u-jdk-11.0.24-8-1/src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h:79:13: error: cannot combine with previous 'int' declaration specifier
		6	79 \| typedef int bool;
		7	\| ^
		8	/usr/include/stdbool.h:37:14: note: expanded from macro 'bool'
		9	37 \| #define bool _Bool
		10
		11
		12	--- src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h.orig 2024-10-07 16:02:52.117023000 +0200
		13	+++ src/jdk.hotspot.agent/bsd/native/libsaproc/libproc.h 2024-10-07 16:02:15.020023000 +0200
		14	@@ -76,9 +76,11 @@ typedef int bool;
		15
		16	// This C bool type must be int for compatibility with BSD calls and
		17	// it would be a mistake to equivalence it to C++ bool on many platforms
		18	+#if defined(__FreeBSD__) && !defined(__bool_true_false_are_defined)
		19	typedef int bool;
		20	#define true 1
		21	#define false 0
		22	+#endif // FreeBSD && !__bool_true_false_are_defined
		23
		24	#endif // __APPLE__
		25