1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00

Fix DTrace support for 32 bit platforms and re-enable it.

PR:		236876
This commit is contained in:
Greg Lewis 2019-03-29 17:06:20 +00:00
parent a0fb87e4ec
commit 51cf7dc135
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=497169
2 changed files with 18 additions and 4 deletions

View File

@ -89,10 +89,6 @@ JDK_BUILD_TYPE= release
.include <bsd.port.pre.mk>
.if ${ARCH} == i386
CONFIGURE_ARGS+= --disable-dtrace
.endif
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \
${LOCALBASE}/bootstrap-openjdk11

View File

@ -0,0 +1,18 @@
--- make/hotspot/lib/JvmDtraceObjects.gmk
+++ make/hotspot/lib/JvmDtraceObjects.gmk
@@ -201,8 +201,13 @@ ifeq ($(call check-jvm-feature, dtrace), true)
)
endif
- DTRACE_FLAGS := -64 -G
- DTRACE_CPP_FLAGS := -D_LP64 -x c
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
+ DTRACE_FLAGS := -32 -G
+ DTRACE_CPP_FLAGS := -x c
+ else
+ DTRACE_FLAGS := -64 -G
+ DTRACE_CPP_FLAGS := -D_LP64 -x c
+ endif
# Make sure we run our selected compiler for preprocessing instead of letting
# the dtrace tool pick it on it's own.