update to latest upstream

3 files changed, 27 insertions, 3232 deletions

diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 8376e715a..3101f53fa 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -4,26 +4,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		openjdk7
-PKG_VERSION:=		2.4.5
+PKG_VERSION:=		2.4.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		6dcc544657ade213d01017354a6f9858
+PKG_MD5SUM:=		f6b28633b9978fadc724247cfc264ff0
 PKG_DESCR:=		OpenJDK 7 Java VM
 PKG_SECTION:=		lang
 PKG_BUILDDEP:=		gettext-tiny-host glib-host flex-host bison-host qemu-host
 PKG_BUILDDEP+=		fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host 
 PKG_BUILDDEP+=		xineramaproto-host libXinerama-host recordproto-host libXi-host libXtst-host freetype-host
 PKG_BUILDDEP+=		renderproto-host libXrender-host alsa-lib-host libffi-host gcj-host ecj-host jikes-host 
-PKG_BUILDDEP+=		classpath-host jamvm-host ant-host cups-host openjdk7-host nss
+PKG_BUILDDEP+=		classpath-host jamvm-host openjdk7-host nss
 PKG_BUILDDEP+=		alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
 PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny
 PKG_BUILDDEP+=		libpng giflib gtk+ glib fontconfig
+HOST_BUILDDEP:=		ant-host cups-host
 PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi libgcc cups
 PKG_DEPENDS+=		libfreetype libxrender libx11 libxext libpthread nss libjpeg-turbo
 PKG_DEPENDS+=		libpng giflib libgtk glib fontconfig
 PKG_URL:=		http://openjdk.org/
 PKG_SITES:=		http://icedtea.classpath.org/download/source/
 
-DISTFILES:=		icedtea-$(PKG_VERSION).tar.gz
+DISTFILES:=		icedtea-$(PKG_VERSION).tar.xz
 WRKDIST=		${WRKDIR}/icedtea-${PKG_VERSION}
 
 GCJ_VER:=		4.8.2
@@ -88,7 +89,7 @@ CONFIGURE_ARGS+=	$(CONFIGURE_COMMON)
 CONFIGURE_ARGS+=	--disable-bootstrap
 
 CONFIGURE_ENV+=		LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
-MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin \
+MAKE_ENV+=		ALT_COMPILER_PATH=$(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin \
 			ALT_OPENWIN_HOME=$(STAGING_TARGET_DIR)/usr/ \
 			ALT_CUPS_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
 			ALT_FREETYPE_HEADERS_PATH=$(STAGING_TARGET_DIR)/usr/include/ \
@@ -122,7 +123,7 @@ HOST_CONFIGURE_ARGS+=\
 		--with-jdk-home=$(STAGING_HOST_DIR)/usr/lib/jvm \
 		--with-java=$(STAGING_HOST_DIR)/usr/bin/java \
 		--with-javac=$(STAGING_HOST_DIR)/usr/bin/ecj \
-		--with-ecj-jar=${STAGING_HOST_DIR}/usr/share/java/ecj.jar \
+		--with-ecj-jar=${DL_DIR}/ecj.jar \
 		--without-hotspot-build \
                 --disable-system-zlib \
                 --disable-system-jpeg \
diff --git a/package/openjdk7/patches/mips64el.patch b/package/openjdk7/patches/mips64el.patch
deleted file mode 100644
index 501167582..000000000
--- a/package/openjdk7/patches/mips64el.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur icedtea-2.3.9.orig/configure icedtea-2.3.9/configure
---- icedtea-2.3.9.orig/configure	2013-04-21 22:48:30.000000000 +0200
-+++ icedtea-2.3.9/configure	2013-05-13 12:43:02.000000000 +0200
-@@ -7159,6 +7159,11 @@
-       INSTALL_ARCH_DIR=mipsel
-       JRE_ARCH_DIR=mipsel
-        ;;
-+    mips64el)
-+      BUILD_ARCH_DIR=mipsel
-+      INSTALL_ARCH_DIR=mipsel
-+      JRE_ARCH_DIR=mipsel
-+       ;;
-     powerpc)
-       BUILD_ARCH_DIR=ppc
-       INSTALL_ARCH_DIR=ppc
diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch
index 2d7caa27b..2994a9f99 100644
--- a/package/openjdk7/patches/openadk.patch
+++ b/package/openjdk7/patches/openadk.patch
@@ -1,7 +1,7 @@
-diff -Nur icedtea-2.4.5.orig/Makefile.in icedtea-2.4.5/Makefile.in
---- icedtea-2.4.5.orig/Makefile.in	2014-01-29 09:28:28.000000000 +0100
-+++ icedtea-2.4.5/Makefile.in	2014-02-09 18:47:29.000000000 +0100
-@@ -704,7 +704,7 @@
+diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in
+--- icedtea-2.4.7.orig/Makefile.in	2014-04-16 06:20:44.689988653 +0200
++++ icedtea-2.4.7/Makefile.in	2014-05-01 13:34:58.421434811 +0200
+@@ -712,7 +712,7 @@
  	$(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
  
  # Bootstrapping patches
@@ -10,3200 +10,9 @@ diff -Nur icedtea-2.4.5.orig/Makefile.in icedtea-2.4.5/Makefile.in
  	patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
  	patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
  	patches/boot/demos.patch patches/boot/fphexconstants.patch \
-@@ -2120,7 +2120,7 @@
- # Optional native ecj
- stamps/native-ecj.stamp:
- 	mkdir -p stamps 
--@BUILD_NATIVE_ECJ_TRUE@	${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
-+@BUILD_NATIVE_ECJ_TRUE@	${GCJ} -lgcj -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
- @BUILD_NATIVE_ECJ_TRUE@	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
- 	touch $@
- 
-diff -Nur icedtea-2.4.5.orig/Makefile.in.orig icedtea-2.4.5/Makefile.in.orig
---- icedtea-2.4.5.orig/Makefile.in.orig	1970-01-01 01:00:00.000000000 +0100
-+++ icedtea-2.4.5/Makefile.in.orig	2014-01-29 09:28:28.000000000 +0100
-@@ -0,0 +1,3178 @@
-+# Makefile.in generated by automake 1.14 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-+
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+# Dependencies
-+VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-+am__make_running_with_option = \
-+  case $${target_option-} in \
-+      ?) ;; \
-+      *) echo "am__make_running_with_option: internal error: invalid" \
-+              "target option '$${target_option-}' specified" >&2; \
-+         exit 1;; \
-+  esac; \
-+  has_opt=no; \
-+  sane_makeflags=$$MAKEFLAGS; \
-+  if $(am__is_gnu_make); then \
-+    sane_makeflags=$$MFLAGS; \
-+  else \
-+    case $$MAKEFLAGS in \
-+      *\\[\ \	]*) \
-+        bs=\\; \
-+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-+    esac; \
-+  fi; \
-+  skip_next=no; \
-+  strip_trailopt () \
-+  { \
-+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-+  }; \
-+  for flg in $$sane_makeflags; do \
-+    test $$skip_next = yes && { skip_next=no; continue; }; \
-+    case $$flg in \
-+      *=*|--*) continue;; \
-+        -*I) strip_trailopt 'I'; skip_next=yes;; \
-+      -*I?*) strip_trailopt 'I';; \
-+        -*O) strip_trailopt 'O'; skip_next=yes;; \
-+      -*O?*) strip_trailopt 'O';; \
-+        -*l) strip_trailopt 'l'; skip_next=yes;; \
-+      -*l?*) strip_trailopt 'l';; \
-+      -[dEDm]) skip_next=yes;; \
-+      -[JT]) skip_next=yes;; \
-+    esac; \
-+    case $$flg in \
-+      *$$target_option*) has_opt=yes; break;; \
-+    esac; \
-+  done; \
-+  test $$has_opt = yes
-+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+
-+#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement
-+@LACKS_JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT_TRUE@am__append_1 = \
-+@LACKS_JAVA_UTIL_REGEX_MATCHER_QUOTEREPLACEMENT_TRUE@	$(SHARE)/java/util/regex/Matcher.java
-+
-+
-+#PR48033 - Missing javax.management.remote.JMXServiceURL
-+@LACKS_JAVAX_MANAGEMENT_REMOTE_JMXSERVICEURL_TRUE@am__append_2 = \
-+@LACKS_JAVAX_MANAGEMENT_REMOTE_JMXSERVICEURL_TRUE@	$(SHARE)/javax/management/remote/JMXServiceURL.java
-+
-+
-+#PR48034 - javax.management.modelmbean.ModelMBeanInfo
-+@LACKS_JAVAX_MANAGEMENT_MODELMBEAN_MODELMBEANINFO_TRUE@am__append_3 = \
-+@LACKS_JAVAX_MANAGEMENT_MODELMBEAN_MODELMBEANINFO_TRUE@	$(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java
-+
-+
-+#PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure 
-+@LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER_TRUE@am__append_4 = \
-+@LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER_TRUE@	$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
-+
-+
-+#PR56553 - SSLParameters support missing
-+@LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS_TRUE@am__append_5 = \
-+@LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS_TRUE@	$(SHARE)/javax/net/ssl/SSLContext.java
-+
-+@LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS_TRUE@am__append_6 = \
-+@LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS_TRUE@	$(SHARE)/javax/net/ssl/SSLEngine.java
-+
-+
-+#PR57008 - Add missing SslRMIServerSocketFactory constructor from 7
-+@LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7_TRUE@am__append_7 = \
-+@LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7_TRUE@	$(SHARE)/javax/rmi/ssl/SslRMIServerSocketFactory.java
-+
-+
-+# Conditional patches
-+@WITH_RHINO_TRUE@am__append_8 = \
-+@WITH_RHINO_TRUE@	patches/rhino.patch
-+
-+@BUILD_CACAO_TRUE@am__append_9 = \
-+@BUILD_CACAO_TRUE@	patches/cacao/launcher.patch \
-+@BUILD_CACAO_TRUE@	patches/cacao/memory.patch
-+
-+@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@am__append_10 = \
-+@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@	patches/cacao/memory.patch
-+
-+@ENABLE_CACAO_TRUE@am__append_11 = \
-+@ENABLE_CACAO_TRUE@	patches/cacao/ignore-tests.patch
-+
-+@ENABLE_PULSE_JAVA_TRUE@am__append_12 = \
-+@ENABLE_PULSE_JAVA_TRUE@	patches/pulse-soundproperties.patch
-+
-+@ENABLE_SYSTEMTAP_TRUE@am__append_13 = \
-+@ENABLE_SYSTEMTAP_TRUE@	patches/systemtap_gc.patch
-+
-+@ENABLE_NSS_TRUE@am__append_14 = patches/nss-config.patch
-+@WITH_PAX_TRUE@am__append_15 = \
-+@WITH_PAX_TRUE@	patches/test_gamma.patch \
-+@WITH_PAX_TRUE@	patches/pax-mark-rmic-java.patch
-+
-+@DISABLE_BOOTSTRAP_TOOLS_TRUE@am__append_16 = patches/boot/openjdk6-prefer_source.patch
-+@DISABLE_BOOTSTRAP_TOOLS_FALSE@am__append_17 = patches/boot/bootstrap-tools.patch
-+@VM_SUPPORTS_XBOOTCLASSPATH_FALSE@am__append_18 = \
-+@VM_SUPPORTS_XBOOTCLASSPATH_FALSE@	patches/boot/xbootclasspath.patch
-+
-+@WITH_PAX_FALSE@am__append_19 = patches/boot/test_gamma.patch
-+@CP39408_JAVAH_TRUE@am__append_20 = patches/boot/pr39408.patch
-+@CP40188_JAVAH_TRUE@am__append_21 = patches/boot/pr40188.patch \
-+@CP40188_JAVAH_TRUE@	patches/boot/javah.patch
-+
-+@CP45526_JAVAH_TRUE@am__append_22 = patches/boot/explicit-inner-class-headers.patch
-+@CP40616_TRUE@am__append_23 = patches/boot/pr40616.patch
-+@LACKS_JAVA_UTIL_SCANNER_TRUE@am__append_24 = $(SCANNER_PATCHES)
-+@CP40630_TRUE@@LACKS_JAVA_UTIL_SCANNER_FALSE@am__append_25 = $(SCANNER_PATCHES)
-+@JAVAC_LACKS_DIAMOND_TRUE@am__append_26 = patches/boot/ecj-diamond.patch
-+@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_TRUE@am__append_27 = patches/boot/compile-for-7-cacao-mem.patch
-+@BUILD_CACAO_TRUE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_28 = patches/boot/compile-for-7-cacao-mem.patch
-+@BUILD_CACAO_FALSE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_29 = patches/boot/compile-for-7.patch
-+@DTDTYPE_QNAME_TRUE@am__append_30 = patches/boot/jaxws-getdtdtype.patch
-+@NO_BYTECODE7_TRUE@am__append_31 = patches/boot/use_target_6_for_bootstrap_classes.patch 
-+@ENABLE_CACAO_TRUE@am__append_32 = \
-+@ENABLE_CACAO_TRUE@	ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
-+
-+@ENABLE_JAMVM_TRUE@am__append_33 = \
-+@ENABLE_JAMVM_TRUE@	ALT_HOTSPOT_IMPORT_PATH="$(JAMVM_IMPORT_PATH)"
-+
-+@DISABLE_OPTIMIZATIONS_TRUE@am__append_34 = \
-+@DISABLE_OPTIMIZATIONS_TRUE@	NO_OPTIMIZATIONS="true" \
-+@DISABLE_OPTIMIZATIONS_TRUE@	CC_NO_OPT="-O0 -g"
-+
-+@ENABLE_DOCS_FALSE@am__append_35 = \
-+@ENABLE_DOCS_FALSE@	NO_DOCS="true"
-+
-+@USE_ALT_JAR_TRUE@am__append_36 = \
-+@USE_ALT_JAR_TRUE@	ALT_JAR_CMD="$(ALT_JAR_CMD)"
-+
-+@HAS_HOTSPOT_REVISION_TRUE@am__append_37 = \
-+@HAS_HOTSPOT_REVISION_TRUE@	HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)"
-+
-+@WITH_RHINO_TRUE@am__append_38 = \
-+@WITH_RHINO_TRUE@	RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
-+
-+@USE_SYSTEM_ZLIB_TRUE@am__append_39 = \
-+@USE_SYSTEM_ZLIB_TRUE@	SYSTEM_ZLIB="true" \
-+@USE_SYSTEM_ZLIB_TRUE@	ZLIB_LIBS="${ZLIB_LIBS}" \
-+@USE_SYSTEM_ZLIB_TRUE@	ZLIB_CFLAGS="${ZLIB_CFLAGS}"
-+
-+@USE_SYSTEM_LCMS_TRUE@am__append_40 = \
-+@USE_SYSTEM_LCMS_TRUE@	USE_SYSTEM_LCMS="true" \
-+@USE_SYSTEM_LCMS_TRUE@	LCMS_LIBS="${LCMS2_LIBS}" \
-+@USE_SYSTEM_LCMS_TRUE@	LCMS_CFLAGS="${LCMS2_CFLAGS}"
-+
-+@USE_SYSTEM_JPEG_TRUE@am__append_41 = \
-+@USE_SYSTEM_JPEG_TRUE@	USE_SYSTEM_JPEG="true" \
-+@USE_SYSTEM_JPEG_TRUE@	JPEG_LIBS="${JPEG_LIBS}" \
-+@USE_SYSTEM_JPEG_TRUE@	JPEG_CFLAGS="${JPEG_CFLAGS}"
-+
-+@USE_SYSTEM_PNG_TRUE@am__append_42 = \
-+@USE_SYSTEM_PNG_TRUE@	USE_SYSTEM_PNG="true" \
-+@USE_SYSTEM_PNG_TRUE@	PNG_LIBS="${PNG_LIBS}" \
-+@USE_SYSTEM_PNG_TRUE@	PNG_CFLAGS="${PNG_CFLAGS}"
-+
-+@USE_SYSTEM_GIF_TRUE@am__append_43 = \
-+@USE_SYSTEM_GIF_TRUE@	USE_SYSTEM_GIF="true" \
-+@USE_SYSTEM_GIF_TRUE@	GIF_LIBS="${GIF_LIBS}" \
-+@USE_SYSTEM_GIF_TRUE@	GIF_CFLAGS="${GIF_CFLAGS}"
-+
-+@USE_SYSTEM_GTK_TRUE@am__append_44 = \
-+@USE_SYSTEM_GTK_TRUE@	USE_SYSTEM_GTK="true" \
-+@USE_SYSTEM_GTK_TRUE@	GTK_LIBS="${GTK_LIBS}" \
-+@USE_SYSTEM_GTK_TRUE@	GTK_CFLAGS="${GTK_CFLAGS}"
-+
-+@USE_SYSTEM_GIO_TRUE@am__append_45 = \
-+@USE_SYSTEM_GIO_TRUE@	USE_SYSTEM_GIO="true" \
-+@USE_SYSTEM_GIO_TRUE@	GIO_LIBS="${GIO_LIBS}" \
-+@USE_SYSTEM_GIO_TRUE@	GIO_CFLAGS="${GIO_CFLAGS}"
-+
-+@USE_SYSTEM_FONTCONFIG_TRUE@am__append_46 = \
-+@USE_SYSTEM_FONTCONFIG_TRUE@	USE_SYSTEM_FONTCONFIG="true" \
-+@USE_SYSTEM_FONTCONFIG_TRUE@	FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \
-+@USE_SYSTEM_FONTCONFIG_TRUE@	FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}"
-+
-+@USE_SYSCALL_COMPILATION_TRUE@am__append_47 = \
-+@USE_SYSCALL_COMPILATION_TRUE@	COMPILE_AGAINST_SYSCALLS="true"
-+
-+@ENABLE_JAR_COMPRESSION_TRUE@am__append_48 = \
-+@ENABLE_JAR_COMPRESSION_TRUE@	COMPRESS_JARS="true"
-+
-+@USE_SYSTEM_KERBEROS_TRUE@am__append_49 = \
-+@USE_SYSTEM_KERBEROS_TRUE@	SYSTEM_KRB5="true" \
-+@USE_SYSTEM_KERBEROS_TRUE@	KRB5_LIBS="${KRB5_LIBS}" \
-+@USE_SYSTEM_KERBEROS_TRUE@	KRB5_CFLAGS="${KRB5_CFLAGS}"
-+
-+@ADD_SHARK_BUILD_TRUE@am__append_50 = \
-+@ADD_SHARK_BUILD_TRUE@	--enable-shark
-+
-+subdir = .
-+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/configure $(am__configure_deps) \
-+	$(srcdir)/nss.cfg.in $(srcdir)/javac.in $(srcdir)/javap.in \
-+	$(srcdir)/javah.in $(srcdir)/tz.properties.in \
-+	$(srcdir)/pax-mark-vm.in \
-+	$(srcdir)/remove-intree-libraries.sh.in \
-+	$(top_srcdir)/tapset/hotspot.stp.in \
-+	$(top_srcdir)/tapset/hotspot_jni.stp.in \
-+	$(top_srcdir)/tapset/jstack.stp.in \
-+	$(top_srcdir)/tapset/hotspot_gc.stp.in AUTHORS COPYING \
-+	ChangeLog INSTALL NEWS README compile config.guess config.sub \
-+	install-sh missing
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno config.status.lineno
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_CLEAN_FILES = nss.cfg javac javap javah tz.properties \
-+	pax-mark-vm remove-intree-libraries.sh tapset/hotspot.stp \
-+	tapset/hotspot_jni.stp tapset/jstack.stp tapset/hotspot_gc.stp
-+CONFIG_CLEAN_VPATH_FILES =
-+AM_V_P = $(am__v_P_@AM_V@)
-+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-+am__v_P_0 = false
-+am__v_P_1 = :
-+AM_V_GEN = $(am__v_GEN_@AM_V@)
-+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-+am__v_GEN_0 = @echo "  GEN     " $@;
-+am__v_GEN_1 = 
-+AM_V_at = $(am__v_at_@AM_V@)
-+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-+am__v_at_0 = @
-+am__v_at_1 = 
-+SOURCES =
-+DIST_SOURCES =
-+am__can_run_installinfo = \
-+  case $$AM_UPDATE_INFO_DIR in \
-+    n|no|NO) false;; \
-+    *) (install-info --version) >/dev/null 2>&1;; \
-+  esac
-+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  if test -d "$(distdir)"; then \
-+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-+      && rm -rf "$(distdir)" \
-+      || { sleep 5 && rm -rf "$(distdir)"; }; \
-+  else :; fi
-+am__post_remove_distdir = $(am__remove_distdir)
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+DIST_TARGETS = dist-gzip
-+distuninstallcheck_listfiles = find . -type f -print
-+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-+distcleancheck_listfiles = find . -type f -print
-+ABS_CLIENT_LIBJVM_SO = @ABS_CLIENT_LIBJVM_SO@
-+ABS_JAVA_HOME_DIR = @ABS_JAVA_HOME_DIR@
-+ABS_SERVER_LIBJVM_SO = @ABS_SERVER_LIBJVM_SO@
-+ACLOCAL = @ACLOCAL@
-+ALSA_CFLAGS = @ALSA_CFLAGS@
-+ALSA_LIBS = @ALSA_LIBS@
-+ALT_CACAO_SRC_DIR = @ALT_CACAO_SRC_DIR@
-+ALT_CACAO_SRC_ZIP = @ALT_CACAO_SRC_ZIP@
-+ALT_CORBA_SRC_ZIP = @ALT_CORBA_SRC_ZIP@
-+ALT_HOTSPOT_SRC_ZIP = @ALT_HOTSPOT_SRC_ZIP@
-+ALT_JAMVM_SRC_ZIP = @ALT_JAMVM_SRC_ZIP@
-+ALT_JAR_CMD = @ALT_JAR_CMD@
-+ALT_JAXP_SRC_ZIP = @ALT_JAXP_SRC_ZIP@
-+ALT_JAXWS_SRC_ZIP = @ALT_JAXWS_SRC_ZIP@
-+ALT_JDK_SRC_ZIP = @ALT_JDK_SRC_ZIP@
-+ALT_LANGTOOLS_SRC_ZIP = @ALT_LANGTOOLS_SRC_ZIP@
-+ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
-+AMTAR = @AMTAR@
-+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-+ANT = @ANT@
-+ARCHFLAG = @ARCHFLAG@
-+ARCH_PREFIX = @ARCH_PREFIX@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
-+BUILD_OS_DIR = @BUILD_OS_DIR@
-+CACAO_IMPORT_PATH = @CACAO_IMPORT_PATH@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CHMOD = @CHMOD@
-+
-+# configure script arguments, quoted in single quotes
-+CONFIGURE_ARGS = @CONFIGURE_ARGS@
-+CPIO = @CPIO@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CUPS_LIBS = @CUPS_LIBS@
-+CXX = @CXX@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFAULT_LIBDIR = @DEFAULT_LIBDIR@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DIST_ID = @DIST_ID@
-+DIST_NAME = @DIST_NAME@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+ECJ = @ECJ@
-+ECJ_JAR = @ECJ_JAR@
-+EGREP = @EGREP@
-+ENABLE_CACAO = @ENABLE_CACAO@
-+ENABLE_JAMVM = @ENABLE_JAMVM@
-+ENABLE_SYSCALL_COMPILATION = @ENABLE_SYSCALL_COMPILATION@
-+ENABLE_SYSTEM_FONTCONFIG = @ENABLE_SYSTEM_FONTCONFIG@
-+ENABLE_SYSTEM_GIF = @ENABLE_SYSTEM_GIF@
-+ENABLE_SYSTEM_GIO = @ENABLE_SYSTEM_GIO@
-+ENABLE_SYSTEM_GTK = @ENABLE_SYSTEM_GTK@
-+ENABLE_SYSTEM_JPEG = @ENABLE_SYSTEM_JPEG@
-+ENABLE_SYSTEM_KERBEROS = @ENABLE_SYSTEM_KERBEROS@
-+ENABLE_SYSTEM_LCMS = @ENABLE_SYSTEM_LCMS@
-+ENABLE_SYSTEM_PNG = @ENABLE_SYSTEM_PNG@
-+ENABLE_SYSTEM_ZLIB = @ENABLE_SYSTEM_ZLIB@
-+ENABLE_WARNINGS = @ENABLE_WARNINGS@
-+EXEEXT = @EXEEXT@
-+FASTJAR = @FASTJAR@
-+FILE = @FILE@
-+FIND = @FIND@
-+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
-+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
-+FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
-+FREETYPE2_LIBS = @FREETYPE2_LIBS@
-+GAWK = @GAWK@
-+GCJ = @GCJ@
-+GETCONF = @GETCONF@
-+GIF_LIBS = @GIF_LIBS@
-+GIO_CFLAGS = @GIO_CFLAGS@
-+GIO_LIBS = @GIO_LIBS@
-+GREP = @GREP@
-+GTK_CFLAGS = @GTK_CFLAGS@
-+GTK_LIBS = @GTK_LIBS@
-+GZIP = @GZIP@
-+HG = @HG@
-+HGREV = @HGREV@
-+HOTSPOT_REVISION = @HOTSPOT_REVISION@
-+HSBUILD = @HSBUILD@
-+ICEDTEA_REVISION = @ICEDTEA_REVISION@
-+INSTALL = @INSTALL@
-+INSTALL_ARCH_DIR = @INSTALL_ARCH_DIR@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAR_ACCEPTS_STDIN_LIST = @JAR_ACCEPTS_STDIN_LIST@
-+JAR_KNOWS_ATFILE = @JAR_KNOWS_ATFILE@
-+JAR_KNOWS_J_OPTIONS = @JAR_KNOWS_J_OPTIONS@
-+JAVA = @JAVA@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JDK_REVISION = @JDK_REVISION@
-+JPEG_LIBS = @JPEG_LIBS@
-+JRE_ARCH_DIR = @JRE_ARCH_DIR@
-+KRB5_LIBS = @KRB5_LIBS@
-+LCMS2_CFLAGS = @LCMS2_CFLAGS@
-+LCMS2_LIBS = @LCMS2_LIBS@
-+LDD = @LDD@
-+LDFLAGS = @LDFLAGS@
-+LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
-+LIBFFI_LIBS = @LIBFFI_LIBS@
-+LIBOBJS = @LIBOBJS@
-+LIBPULSE_CFLAGS = @LIBPULSE_CFLAGS@
-+LIBPULSE_LIBS = @LIBPULSE_LIBS@
-+LIBS = @LIBS@
-+LINUX32 = @LINUX32@
-+LLVM_CFLAGS = @LLVM_CFLAGS@
-+LLVM_CONFIG = @LLVM_CONFIG@
-+LLVM_LDFLAGS = @LLVM_LDFLAGS@
-+LLVM_LIBS = @LLVM_LIBS@
-+LSB_RELEASE = @LSB_RELEASE@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAKE = @MAKE@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NATIVE2ASCII = @NATIVE2ASCII@
-+NSS_CFLAGS = @NSS_CFLAGS@
-+NSS_LIBDIR = @NSS_LIBDIR@
-+NSS_LIBS = @NSS_LIBS@
-+OBJEXT = @OBJEXT@
-+OPENJDK_BUILD_DIR = @OPENJDK_BUILD_DIR@
-+OPENJDK_SRC_DIR = @OPENJDK_SRC_DIR@
-+OS_PATH = @OS_PATH@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PARALLEL_JOBS = @PARALLEL_JOBS@
-+PATCH = @PATCH@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PAX_COMMAND = @PAX_COMMAND@
-+PAX_COMMAND_ARGS = @PAX_COMMAND_ARGS@
-+PKGVERSION = @PKGVERSION@
-+PKG_CONFIG = @PKG_CONFIG@
-+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-+PNG_CFLAGS = @PNG_CFLAGS@
-+PNG_LIBS = @PNG_LIBS@
-+PROJECT_NAME = @PROJECT_NAME@
-+RHINO_JAR = @RHINO_JAR@
-+RMIC = @RMIC@
-+SET_MAKE = @SET_MAKE@
-+SHA256SUM = @SHA256SUM@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+SYSTEM_JDK_DIR = @SYSTEM_JDK_DIR@
-+TAR = @TAR@
-+TZDATA_DIR = @TZDATA_DIR@
-+UNZIP = @UNZIP@
-+USING_CACAO = @USING_CACAO@
-+USING_ECJ = @USING_ECJ@
-+VERSION = @VERSION@
-+VERSION_SUFFIX = @VERSION_SUFFIX@
-+WGET = @WGET@
-+X11_CFLAGS = @X11_CFLAGS@
-+X11_LIBS = @X11_LIBS@
-+XINERAMA_CFLAGS = @XINERAMA_CFLAGS@
-+XINERAMA_LIBS = @XINERAMA_LIBS@
-+XPROTO_CFLAGS = @XPROTO_CFLAGS@
-+XPROTO_LIBS = @XPROTO_LIBS@
-+XRENDER_CFLAGS = @XRENDER_CFLAGS@
-+XRENDER_LIBS = @XRENDER_LIBS@
-+XSLTPROC = @XSLTPROC@
-+XTST_CFLAGS = @XTST_CFLAGS@
-+XTST_LIBS = @XTST_LIBS@
-+XT_CFLAGS = @XT_CFLAGS@
-+XT_LIBS = @XT_LIBS@
-+XVFB_RUN_CMD = @XVFB_RUN_CMD@
-+ZERO_ARCHDEF = @ZERO_ARCHDEF@
-+ZERO_BITSPERWORD = @ZERO_BITSPERWORD@
-+ZERO_ENDIANNESS = @ZERO_ENDIANNESS@
-+ZERO_LIBARCH = @ZERO_LIBARCH@
-+ZIP = @ZIP@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_FASTJAR = @ac_ct_FASTJAR@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+enable_downloading = @enable_downloading@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+JDK_UPDATE_VERSION = 51
-+BUILD_VERSION = b31
-+COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-+CORBA_CHANGESET = 3594dbde270d
-+JAXP_CHANGESET = 8fe156ad49e2
-+JAXWS_CHANGESET = 32ea8b1ed91a
-+JDK_CHANGESET = 9db88c18e114
-+LANGTOOLS_CHANGESET = dabd37b7e295
-+OPENJDK_CHANGESET = 410eb7fef869
-+CORBA_SHA256SUM = d1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d
-+JAXP_SHA256SUM = 0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3
-+JAXWS_SHA256SUM = 08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0
-+JDK_SHA256SUM = 285e5b8ccbb29f3f9f9ea9ea7856d1ed97465c57d091fbcd9b2e55a1ffbb543e
-+LANGTOOLS_SHA256SUM = 86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f
-+OPENJDK_SHA256SUM = 2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707
-+CACAO_VERSION = e215e36be9fc
-+CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
-+CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
-+CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
-+CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
-+JAMVM_VERSION = ac22c9948434e528ece451642b4ebde40953ee7e
-+JAMVM_SHA256SUM = 4662da1fe3e0e11d8fa685c7f2fc748576b9f3d3e37dc56b798dd6a5bd6b61e7
-+JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
-+JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
-+JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
-+ICEDTEA_PREFIX = icedtea7-forest-2.4
-+ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX)
-+OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
-+CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
-+CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
-+CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk7/
-+BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port
-+NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/
-+OPENJDK_URL = $(ICEDTEA_HG_URL)
-+CORBA_URL = $(ICEDTEA_HG_URL)/corba
-+JAXP_URL = $(ICEDTEA_HG_URL)/jaxp
-+JAXWS_URL = $(ICEDTEA_HG_URL)/jaxws
-+JDK_URL = $(ICEDTEA_HG_URL)/jdk
-+LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools
-+HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-+HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-+HS_URL = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-+
-+# Build directories
-+BUILD_DIR = @OPENJDK_BUILD_DIR@
-+BUILD_OUTPUT_DIR = $(abs_top_builddir)/$(BUILD_DIR)
-+DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug
-+BOOT_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-boot
-+BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
-+RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
-+CLS_DIR_BOOT = $(BOOT_BUILD_OUTPUT_DIR)/classes
-+SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
-+BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-+BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-+REWRITER_BUILD_DIR = $(abs_top_builddir)/rewriter.build
-+STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot
-+STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
-+JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
-+CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build
-+STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar
-+STAGE2_BOOT_RUNTIME = $(STAGE2_BOOT_DIR)/jre/lib/rt.jar
-+
-+# Source directories
-+SHARE = openjdk-boot/jdk/src/share/classes
-+SOLARIS = openjdk-boot/jdk/src/solaris/classes
-+LANGTOOLS = openjdk-boot/langtools/src/share/classes
-+CORBA = openjdk-boot/corba/src/share/classes
-+JAXWS = openjdk-boot/jaxws/src/share/jaxws_classes:openjdk-boot/jaxws/src/share/jaf_classes
-+PULSE_JAVA_DIR = $(abs_top_srcdir)/pulseaudio
-+PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
-+PULSE_JAVA_NATIVE_SRCS = $(wildcard $(PULSE_JAVA_NATIVE_SRCDIR)/*.c)
-+PULSE_JAVA_BUILDDIR = $(abs_top_builddir)/pulseaudio.build
-+PULSE_JAVA_NATIVE_BUILDDIR = $(PULSE_JAVA_BUILDDIR)/native
-+PULSE_JAVA_NATIVE_OBJECTS = \
-+	$(subst $(PULSE_JAVA_NATIVE_SRCDIR),$(PULSE_JAVA_NATIVE_BUILDDIR),$(patsubst %.c,%.o,$(PULSE_JAVA_NATIVE_SRCS)))
-+
-+PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
-+PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_BUILDDIR)/classes
-+OPENJDK_SOURCEPATH_DIRS = \
-+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS)
-+
-+SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
-+
-+# Sources used from OpenJDK.
-+ICEDTEA_BOOTSTRAP_CLASSES = $(am__append_1) $(am__append_2) \
-+	$(am__append_3) $(am__append_4) $(am__append_5) \
-+	$(am__append_6) $(am__append_7)
-+@NO_BYTECODE7_FALSE@IT_LANGUAGE_SOURCE_VERSION = 7
-+
-+# Settings for javac
-+@NO_BYTECODE7_TRUE@IT_LANGUAGE_SOURCE_VERSION = 6
-+@NO_BYTECODE7_FALSE@IT_CLASS_TARGET_VERSION = 7
-+@NO_BYTECODE7_TRUE@IT_CLASS_TARGET_VERSION = 6
-+IT_JAVAC_SETTINGS = -g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
-+IT_JAVACFLAGS = $(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
-+
-+# Flags
-+IT_CFLAGS = $(CFLAGS) $(ARCHFLAG)
-+@USE_HG_FALSE@OPENJDK_SRC_ZIP = openjdk.tar.gz
-+
-+# Conditional defintions
-+@USE_HG_TRUE@OPENJDK_SRC_ZIP = 
-+@USE_HG_FALSE@CORBA_SRC_ZIP = corba.tar.gz
-+@USE_HG_TRUE@CORBA_SRC_ZIP = 
-+@USE_HG_FALSE@JAXP_SRC_ZIP = jaxp.tar.gz
-+@USE_HG_TRUE@JAXP_SRC_ZIP = 
-+@USE_HG_FALSE@JAXWS_SRC_ZIP = jaxws.tar.gz
-+@USE_HG_TRUE@JAXWS_SRC_ZIP = 
-+@USE_HG_FALSE@JDK_SRC_ZIP = jdk.tar.gz
-+@USE_HG_TRUE@JDK_SRC_ZIP = 
-+@USE_HG_FALSE@LANGTOOLS_SRC_ZIP = langtools.tar.gz
-+@USE_HG_TRUE@LANGTOOLS_SRC_ZIP = 
-+@USE_HG_FALSE@HOTSPOT_SRC_ZIP = hotspot.tar.gz
-+@USE_HG_TRUE@HOTSPOT_SRC_ZIP = 
-+@ENABLE_PULSE_JAVA_TRUE@PULSE_JAVA_TARGET = stamps/pulse-java.stamp
-+@BOOTSTRAPPING_FALSE@MEMORY_LIMIT = -J-Xmx1024m
-+
-+# This should not depend on bootstrapping
-+# but on whether MEMORY_LIMIT is accepted
-+# as an argument to javac
-+@BOOTSTRAPPING_TRUE@MEMORY_LIMIT = 
-+@BOOTSTRAPPING_FALSE@PREFER_SOURCE = -Xprefer:source
-+@BOOTSTRAPPING_TRUE@PREFER_SOURCE = 
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_TRUE@ICEDTEA_BUILD_TARGET = jdk_only
-+@ENABLE_CACAO_TRUE@ICEDTEA_BUILD_TARGET = jdk_only
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@ICEDTEA_DEBUG_BUILD_TARGET = debug_build
-+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_TRUE@ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
-+@ENABLE_CACAO_TRUE@ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
-+@BOOTSTRAPPING_FALSE@BOOTSTRAP_DIRECTORY_STAMP = 
-+@BOOTSTRAPPING_TRUE@BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory-stage2.stamp
-+@BOOTSTRAPPING_FALSE@ICEDTEA_HOME = $(SYSTEM_JDK_DIR)
-+@BOOTSTRAPPING_TRUE@ICEDTEA_HOME = $(STAGE2_BOOT_DIR)
-+@BOOTSTRAPPING_FALSE@INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage2.stamp
-+@BOOTSTRAPPING_TRUE@INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-stage1.stamp
-+@CP_SUPPORTS_REFLINK_TRUE@REFLINK = --reflink=auto
-+@OPENJDK_SRC_DIR_HARDLINKABLE_FALSE@OPENJDK_SRC_DIR_LINK = $(REFLINK)
-+@OPENJDK_SRC_DIR_HARDLINKABLE_TRUE@OPENJDK_SRC_DIR_LINK = -l
-+@SRC_DIR_HARDLINKABLE_FALSE@SRC_DIR_LINK = $(REFLINK)
-+@SRC_DIR_HARDLINKABLE_TRUE@SRC_DIR_LINK = -l
-+@DISABLE_HOTSPOT_TESTS_FALSE@HOTSPOT_TEST_SUITE = hotspot
-+@DISABLE_JDK_TESTS_FALSE@JDK_TEST_SUITE = jdk
-+@DISABLE_LANGTOOLS_TESTS_FALSE@LANGTOOLS_TEST_SUITE = langtools
-+@DISABLE_TESTS_FALSE@TEST_SUITES = $(HOTSPOT_TEST_SUITE) $(JDK_TEST_SUITE) $(LANGTOOLS_TEST_SUITE)
-+@DISABLE_TESTS_FALSE@TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES))
-+
-+# Target to ensure a patched OpenJDK tree containing Zero & Shark
-+# and any overlays is available in $(abs_top_builddir)/openjdk
-+OPENJDK_TREE = stamps/overlay.stamp stamps/add-nss.stamp
-+
-+# Target to ensure a patched OpenJDK bootstrap tree containing
-+# Zero & Shark, any other overlays and the bootstrapping patches
-+# is available in $(abs_top_builddir)/openjdk-boot
-+OPENJDK_BOOT_TREE = stamps/patch-boot.stamp
-+
-+# Sources list
-+REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
-+CRYPTO_CHECK_SRCS = $(top_srcdir)/TestCryptoLevel.java
-+
-+# Patch list
-+ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
-+	$(am__append_11) $(am__append_12) $(am__append_13) \
-+	$(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
-+
-+# Bootstrapping patches
-+ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
-+	patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
-+	patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
-+	patches/boot/demos.patch patches/boot/fphexconstants.patch \
-+	patches/boot/fontconfig.patch \
-+	patches/boot/generated-comments.patch \
-+	patches/boot/icedteart.patch patches/boot/jar.patch \
-+	patches/boot/symbols.patch patches/boot/tobin.patch \
-+	patches/boot/tools.jar.patch patches/boot/jopt.patch \
-+	patches/boot/jaxp-dependency.patch \
-+	patches/boot/genstubs-nofork.patch \
-+	patches/boot/getannotation-cast.patch \
-+	patches/boot/break-processbuilder-dependency.patch \
-+	patches/boot/revert-6973616.patch \
-+	patches/boot/revert-6941137.patch \
-+	patches/boot/ecj-stringswitch.patch \
-+	patches/boot/langtools-force-old-jdk.patch \
-+	patches/boot/corba-dependencies.patch \
-+	patches/boot/jaxws-langtools-dependency.patch \
-+	patches/boot/jaxws-jdk-dependency.patch \
-+	patches/boot/hotspot/${HSBUILD}/jdk-dependency.patch \
-+	patches/boot/ecj-multicatch.patch \
-+	patches/boot/ecj-trywithresources.patch \
-+	patches/boot/ecj-autoboxing.patch patches/boot/xsltproc.patch \
-+	patches/boot/ecj-odd.patch $(am__append_16) $(am__append_17) \
-+	$(am__append_18) $(am__append_19) $(am__append_20) \
-+	$(am__append_21) $(am__append_22) $(am__append_23) \
-+	$(am__append_24) $(am__append_25) $(am__append_26) \
-+	$(am__append_27) $(am__append_28) $(am__append_29) \
-+	$(am__append_30) $(am__append_31) $(DISTRIBUTION_BOOT_PATCHES)
-+
-+# Patches for when java.util.Scanner is missing
-+# or has the bug #40630 (all these classes rely
-+# on Scanner#hasNextLine() looping behaviour)
-+SCANNER_PATCHES = patches/boot/scanner-spp.patch \
-+	patches/boot/scanner-sbcs.patch \
-+	patches/boot/scanner-dbcs.patch \
-+	patches/boot/scanner-charsets.patch
-+
-+
-+# OpenJDK build environment.
-+@ZERO_BUILD_TRUE@ICEDTEA_ZERO_BUILD = true
-+@SHARK_BUILD_TRUE@ICEDTEA_SHARK_BUILD = true
-+ICEDTEA_NAME = IcedTea
-+@HAS_ICEDTEA_REVISION_TRUE@ICEDTEA_REV = +${ICEDTEA_REVISION}
-+@HAS_PKGVERSION_TRUE@ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
-+@ENABLE_WERROR_FALSE@WERROR_STATUS = false
-+@ENABLE_WERROR_TRUE@WERROR_STATUS = true
-+ICEDTEA_ENV = ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" ANT="$(ANT)" \
-+	BUILD_NUMBER="$(BUILD_VERSION)" \
-+	JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \
-+	JRE_RELEASE_VERSION="1.7.0_$(COMBINED_VERSION)" \
-+	MILESTONE="fcs" LANG="C" \
-+	PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \
-+	ALT_BOOTDIR="$(BOOT_DIR)" BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
-+	ICEDTEA_RT="$(RUNTIME)" CLASSPATH="" LD_LIBRARY_PATH="" \
-+	ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
-+	SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
-+	ZERO_LIBARCH="$(ZERO_LIBARCH)" \
-+	ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
-+	ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
-+	ZERO_ARCHDEF="$(ZERO_ARCHDEF)" ZERO_ARCHFLAG="$(ARCHFLAG)" \
-+	LIBFFI_CFLAGS="$(LIBFFI_CFLAGS)" LIBFFI_LIBS="$(LIBFFI_LIBS)" \
-+	LLVM_CFLAGS="$(LLVM_CFLAGS)" LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \
-+	LLVM_LIBS="$(LLVM_LIBS)" FT2_CFLAGS="$(FREETYPE2_CFLAGS)" \
-+	FT2_LIBS="$(FREETYPE2_LIBS)" \
-+	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
-+	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" JAVAC="" JAVA_HOME="" \
-+	JDK_HOME="" QUIETLY="" ANT_RESPECT_JAVA_HOME="TRUE" \
-+	DISTRIBUTION_ID="$(DIST_ID)" DERIVATIVE_ID="$(ICEDTEA_NAME) \
-+	$(PACKAGE_VERSION)$(ICEDTEA_REV)" \
-+	ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" DEBUG_CLASSFILES="true" \
-+	DEBUG_BINARIES="true" DISABLE_INTREE_EC="true" \
-+	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" VERBOSE="$(VERBOSE)" \
-+	STATIC_CXX="false" BUILD_GCC="$(CC)" BUILD_CXX="$(CXX)" \
-+	USE_SYSTEM_CUPS="true" CUPS_LIBS="${CUPS_LIBS}" \
-+	CUPS_CFLAGS="${CUPS_CFLAGS}" STRIP_POLICY=no_strip \
-+	JAVAC_WARNINGS_FATAL="$(WERROR_STATUS)" \
-+	COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \
-+	UNLIMITED_CRYPTO="true" $(am__append_32) $(am__append_33) \
-+	$(am__append_34) $(am__append_35) $(am__append_36) \
-+	$(am__append_37) $(am__append_38) $(am__append_39) \
-+	$(am__append_40) $(am__append_41) $(am__append_42) \
-+	$(am__append_43) $(am__append_44) $(am__append_45) \
-+	$(am__append_46) $(am__append_47) $(am__append_48) \
-+	$(am__append_49)
-+
-+# OpenJDK boot build environment.
-+ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
-+	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
-+	BOOTCLASSPATH_CLS="-bootclasspath $(CLS_DIR_BOOT)" \
-+	BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(RUNTIME)" \
-+	GENSRCDIR="$(abs_top_builddir)/generated.build" \
-+	JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
-+	JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
-+	JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \
-+	DISABLE_NIMBUS="true" \
-+	NO_DOCS="true" \
-+	ALT_OUTPUTDIR="$(BOOT_BUILD_OUTPUT_DIR)" \
-+	XSLT="$(XSLTPROC)"
-+
-+
-+# Source files
-+GENERATED_FILES = $(top_srcdir)/generated/com/sun/java/swing/plaf/gtk/resources/