Skip to content
Snippets Groups Projects
Unverified Commit e13c8113 authored by Mikael Urankar's avatar Mikael Urankar Committed by Ronald Klop
Browse files

java/openjdk8: fix build on 32 bit arm

Fixes:
In file included from /wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/os/bsd/vm/os_perf_bsd.cpp:61:
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:184:1: error: static declaration of 'breakpoint' follows non-static declaration
  184 | breakpoint(void)
      | ^
/wrkdirs/usr/ports/java/openjdk8/work/jdk8u-jdk8u422-b05.1/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp:224:17: note: previous declaration is here
  224 | extern "C" void breakpoint();
      |                 ^

- bumped portrevision to easily spot if future bug reports are about this change.

PR:	281991
Approved by:	early maintainer timeout java@ (the build is broken and the patch does not affect other architectures)
Obtained from:	Mikael Urankar <mikael@> via Attachment 254105 in bug #255662
parent 602c5267
Branches
Tags
No related merge requests found
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= LOCAL/jkim:jtreg
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
......
--- hotspot/src/os/bsd/vm/os_perf_bsd.cpp.orig 2024-10-10 08:36:27 UTC
+++ hotspot/src/os/bsd/vm/os_perf_bsd.cpp
@@ -57,6 +57,12 @@
* with the same name.
*/
#define _MACHINE_PCB_H_
+ /*
+ * do not redefine breakpoint on armv7
+ */
+ #ifdef __arm__
+ #define _MACHINE_CPUFUNC_H_
+ #endif
#endif
#include <sys/user.h>
#endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment