--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/makefiles/GensrcX11Wrappers.gmk	Thu Jun 07 20:40:50 2012 -0700
@@ -0,0 +1,97 @@
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+GENSRC_X11WRAPPERS :=
+GENSRC_X11WRAPPERS_TMP := $(JDK_OUTPUTDIR)/gensrc_x11wrappers
+
+GENSRC_SIZER_SRC := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
+
+GENSRC_SIZES :=
+
+ifeq ($(PLATFORM)-$(LIBARCH), solaris-i386)
+GENSRC_SIZES := sizes.32 sizes.64
+else ifeq ($(PLATFORM), solaris)
+isalist:=$(shell $(ISAINFO))
+ifneq (,$(findstring sparcv9, $(isalist)))
+# On sparcv9 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
+GENSRC_SIZES := sizes.32 sizes.64
+else
+ifneq (,$(findstring amd64, $(isalist)))
+# On amd64 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
+GENSRC_SIZES := sizes.32 sizes.64
+else # !sparcv9 : includes (32-bit) sparc, i586
+GENSRC_SIZES := sizes.32
+endif # amd64
+endif # sparcv9
+else # !solaris
+ifeq ($(PLATFORM), macosx)
+GENSRC_SIZES := sizes.32 sizes.64
+else # !macosx
+GENSRC_SIZES := sizes.$(ARCH_DATA_MODEL)
+endif # !macosx
+endif # solaris
+
+
+##########################################################################################
+
+$(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c : $(GENSRC_SIZER_SRC)/xlibtypes.txt
+	$(MKDIR) -p $(@D)
+	$(RM) $@
+	$(TOOL_WRAPPERGENERATOR) $(@D) $< "sizer" $*
+
+$(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c
+	(cd $(@D) && $(CC) -m$* -o $@ $< $(CFLAGS_JDKLIB) \
+              -I$(JDK_TOPDIR)/src/solaris/native/sun/awt \
+	      -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+	      -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils -lc)
+
+ifeq ($(PLATFORM)-$(LIBARCH), solaris-i386)
+
+$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.32 : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.32.exe
+	$< > $@.tmp
+	$(MV) $@.tmp $@
+
+$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 : $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes/sun/awt/X11/generator/sizes.64-$(PLATFORM)-$(LIBARCH)
+	$(MKDIR) -p $(@D)
+	$(CP) $< $@
+else
+
+$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.% : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe
+	$< > $@.tmp
+	$(MV) $@.tmp $@
+
+endif
+
+$(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes : $(foreach S,$(GENSRC_SIZES),$(GENSRC_X11WRAPPERS_TMP)/sizer/$(S))
+	$(MKDIR) -p $(@D)/sun/awt/X11
+	$(RM) $(@D)/sun/awt/X11/*
+	$(TOOL_WRAPPERGENERATOR) $(@D)/sun/awt/X11 $(GENSRC_SIZER_SRC)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes
+ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
+	$(ECHO) COMPARING $@ and $(GENSRC_SIZER_SRC)/sizes.64-$(PLATFORM)-i386
+	$(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.64 $(GENSRC_SIZER_SRC)/sizes.64-$(PLATFORM)-i386
+endif
+	$(TOUCH) $@
+
+GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes