From 51cf7dc1350c35e376a024fb921c2c49ae9bc5ab Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Fri, 29 Mar 2019 17:06:20 +0000 Subject: Fix DTrace support for 32 bit platforms and re-enable it. PR: 236876 --- java/openjdk11/Makefile | 4 ---- .../files/patch-make_hotspot_lib_JvmDtraceObjects.gmk | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk (limited to 'java') diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index a7fd3dd0536c..aab32398480a 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -89,10 +89,6 @@ JDK_BUILD_TYPE= release .include -.if ${ARCH} == i386 -CONFIGURE_ARGS+= --disable-dtrace -.endif - BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \ ${LOCALBASE}/bootstrap-openjdk11 diff --git a/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk b/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk new file mode 100644 index 000000000000..a3bc5762dedb --- /dev/null +++ b/java/openjdk11/files/patch-make_hotspot_lib_JvmDtraceObjects.gmk @@ -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. -- cgit