--- a/make/hotspot/gensrc/GensrcDtrace.gmk	Fri Mar 01 12:12:01 2019 +0100
+++ b/make/hotspot/gensrc/GensrcDtrace.gmk	Fri Mar 01 12:20:36 2019 +0100
@@ -87,14 +87,14 @@
     # Argument 1: Output filename
     # Argument 2: dtrace-gen-offset tool command line option
     define SetupDtraceOffsetsGeneration
-      $$(eval $$(call SetupExecute, dtrace_offset_$2, \
+      $$(eval $$(call SetupExecute, dtrace_offset_$$(strip $2), \
           INFO := Generating dtrace $2 file, \
           DEPS := $$(BUILD_DTRACE_GEN_OFFSETS), \
           OUTPUT_FILE := $1, \
           COMMAND := ( $$(DTRACE_GEN_OFFSETS_TOOL) -$$(strip $2) > $1 ), \
       ))
 
-      TARGETS += $$(dtrace_offset_$2_TARGET)
+      TARGETS += $$(dtrace_offset_$$(strip $2)_TARGET)
     endef
 
     JVM_OFFSETS_H := $(DTRACE_GENSRC_DIR)/JvmOffsets.h