--- old/make/gensrc/Gensrc-jdk.jlink.gmk	2019-02-07 17:49:15.701603308 +0100
+++ new/make/gensrc/Gensrc-jdk.jlink.gmk	2019-02-07 17:49:15.496603778 +0100
@@ -29,8 +29,19 @@
 
 include GensrcProperties.gmk
 
+JLINK_SRC_SUBDIRS += $(TOPDIR)/src/jdk.jlink/share/classes
+JLINK_SRC_SUBDIRS := $(OPENJDK_TARGET_OS)/classes
+ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
+  JLINK_SRC_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/classes
+endif
+JLINK_SRC_SUBDIRS += share/classes
+
+JLINK_RESOURCES_DIRS :=
+$(foreach sub, $(JLINK_SRC_SUBDIRS), \
+    $(eval JLINK_RESOURCES_DIRS += $(TOPDIR)/src/jdk.jlink/$(sub)/jdk/tools/jlink/resources) )
+
 $(eval $(call SetupCompileProperties, JLINK_PROPERTIES, \
-    SRC_DIRS := $(TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jlink/resources, \
+    SRC_DIRS := $(JLINK_RESOURCES_DIRS), \
     CLASS := ListResourceBundle, \
 ))