--- a/make/gensrc/GensrcX11Wrappers.gmk	Tue Mar 13 11:33:57 2018 +0100
+++ b/make/gensrc/GensrcX11Wrappers.gmk	Thu Mar 15 09:33:36 2018 +0100
@@ -35,31 +35,25 @@
 
 # The pre-calculated offset file are stored here:
 GENSRC_X11WRAPPERS_DATADIR := $(TOPDIR)/make/data/x11wrappergen
+GENSRC_X11WRAPPERS_DATA := $(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(OPENJDK_TARGET_CPU_BITS).txt
 
 # Always generate 64-bit version on 64-bit systems.
 # Always generate 32-bit version on 32-bit systems.
 # On all 64-bit systems, except Linux, also generate 32-bit version.
-ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
   GENSRC_X11WRAPPERS_DATA_64 = $(GENSRC_X11WRAPPERS_DATADIR)/sizes-64.txt
-  ifneq ($(OPENJDK_TARGET_OS), linux)
     GENSRC_X11WRAPPERS_DATA_32 = $(GENSRC_X11WRAPPERS_DATADIR)/sizes-32.txt
   else
     GENSRC_X11WRAPPERS_DATA_32 = IGNORE
-  endif
-else
   GENSRC_X11WRAPPERS_DATA_64 = IGNORE
   GENSRC_X11WRAPPERS_DATA_32 = $(GENSRC_X11WRAPPERS_DATADIR)/sizes-32.txt
-endif
-
 # Make something we can depend on
 GENSRC_X11WRAPPERS_DATAFILES := $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt \
     $(filter-out IGNORE, $(GENSRC_X11WRAPPERS_DATA_32) $(GENSRC_X11WRAPPERS_DATA_64))
-
 # Run the tool on the offset files to generate several Java classes used in awt.
-$(GENSRC_X11WRAPPERS_MARKER): $(BUILD_TOOLS_JDK) $(GENSRC_X11WRAPPERS_DATAFILES)
+$(GENSRC_X11WRAPPERS_MARKER): $(BUILD_TOOLS_JDK) $(GENSRC_X11WRAPPERS_DATA) \
+    $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt
 	$(call MakeDir, $(GENSRC_X11WRAPPERS_OUTPUTDIR))
 	$(call LogInfo, Generating X11 wrapper source files)
-	$(TOOL_WRAPPERGENERATOR) gen_java $(GENSRC_X11WRAPPERS_OUTPUTDIR) $(GENSRC_X11WRAPPERS_DATADIR)/xlibtypes.txt $(GENSRC_X11WRAPPERS_DATA_32) $(GENSRC_X11WRAPPERS_DATA_64)
 	$(TOUCH) $@
 
 GENSRC_JAVA_DESKTOP += $(GENSRC_X11WRAPPERS_MARKER)