FYI: Update IcedTea tree with latest IcedTea6 changes
Andrew John Hughes
gnu_andrew at member.fsf.org
Sun Jun 22 12:33:38 PDT 2008
I've updated the IcedTea tree to take in the latest changes
from the IcedTea6 tree. The attached patch details post-merge
changes needed to make the tree compile.
ChangeLog:
2008-06-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/icedtea-component.patch:
Removed.
2008-06-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
Remove unneeded component patch.
* Makefile.in,
* configure:
Regenerated.
* patches/icedtea-copy-plugs.patch,
* patches/icedtea-core-build.patch,
* patches/icedtea-ecj.patch,
* patches/icedtea-sparc64-linux.patch:
Regenerated against OpenJDK b26.
2008-06-20 Gary Benson <gbenson at redhat.com>
* patches/icedtea-zero-build.patch: Correctly set CPU.
2008-06-20 Gary Benson <gbenson at redhat.com>
* patches/icedtea-core-build.patch: Defuzz.
2008-06-19 Lillian Angel <langel at redhat.com>
Fixes Bug #159
* patches/icedtea-component.patch: New file.
* Makefile.am (ICEDTEA_PATCHES): Add above patch.
* Makefile.in: Regenerated.
2008-06-18 Keith Seitz <keiths at redhat.com>
* patches/icedtea-dnd-updatecursor.patch: New file.
* Makefile.am (ICEDTEA_PATCHES): Add above patch.
* Makefile.in: Regenerated.
2008-06-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR icedtea/140:
* Makefile.am: Add icedtea-jscheme.patch and
remove jscheme jar files and scripts after
unzipping OpenJDK.
* Makefile.in: Regenerated.
* patches/icedtea-ecj.patch: Updated for post-jscheme
tree.
* patches/icedtea-jscheme.patch: Added.
2008-06-11 Lillian Angel <langel at redhat.com>
* Makefile.am: Added JDK_UPDATE_VERSION to environment. Some applets,
like the Sun's verify Java version applet, check for the "_" in the
version string. Our version string format is now correct:
java version "1.7.0_0"
OpenJDK Runtime Environment (build 1.7.0_0-b26)
OpenJDK Server VM (build 1.7.0_0-b26, mixed mode)
* Makefile.in: Regenerated.
2008-06-10 Lillian Angel <langel at redhat.com>
* Makefile.in: Regenerated.
* aclocal.m4: Likewise.
* configure: Likewise.
* generated/sun/misc/Version.java: Likewise.
* generated/sun/tools/jconsole/Version.java: Likewise.
2008-06-10 Matthias Klose <doko at ubuntu.com>
* patches/icedtea-no-bcopy.patch: New.
* Makefile.am (ICEDTEA_PATCHES): Add patch.
* Makefile.in: Regenerate.
2008-06-10 Tom Callaway <tcallawa at redhat.com>
Dennis Gilmore <dennis at ausil.us>
* patches/icedtea-sparc64-linux.patch,
patches/icedtea-sparc-ptracefix.patch,
patches/icedtea-sparc-trapsfix.patch: New.
* Makefile.am (ICEDTEA_PATCHES): Add above patches.
* Makefile.am (stamps/bootstrap-directory-ecj.stamp): Create
symlink to $(SYSTEM_GCJ_DIR)/jre/lib/$(JRE_ARCH_DIR).
* acinclude.m4: Set JRE_ARCH_DIR.
* Makefile.in, configure: Regenerate.
2008-06-09 Joshua Sumali <jsumali at redhat.com>
* rt/net/sourceforge/jnlp/Parser.java: Remove comments from xml before
starting the application.
* rt/net/sourceforge/nanoxml/XMLElement.java: Be more tolerant to double
dashes in xml comments.
(sanitizeInput(InputStreamReader, PipedOutputStream)): New method.
(expectedInput(String, char)): New method.
2008-06-08 Mark Wielaard <mark at klomp.org>
* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
Import Gervill CVS source reformatting.
2008-06-08 Mark Wielaard <mark at klomp.org>
* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound:
Import Gervill fixes from CVS. See CHANGES.txt.
* overlays/openjdk/jdk/test/com/sun/media/sound: Likewise.
2008-06-08 Mark Wielaard <mark at klomp.org>
* Makefile.am (ZERO_PATCHES): Add
patches/icedtea-eclipse-hotspot-6614100-7b24.patch.
* Makefile.in: Regenerate.
* patches/icedtea-eclipse-hotspot-6614100-7b24.patch: New patch.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 6a9207d80a39 Makefile.am
--- a/Makefile.am Sun Jun 22 01:28:42 2008 +0100
+++ b/Makefile.am Sun Jun 22 20:27:09 2008 +0100
@@ -353,7 +353,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-no-bcopy.patch \
patches/icedtea-jscheme.patch \
patches/icedtea-dnd-updatecursor.patch \
- patches/icedtea-component.patch \
$(GCC_PATCH) \
$(DISTRIBUTION_PATCHES) \
patches/icedtea-xslfix.patch \
diff -r 6a9207d80a39 Makefile.in
--- a/Makefile.in Sun Jun 22 01:28:42 2008 +0100
+++ b/Makefile.in Sun Jun 22 20:27:09 2008 +0100
@@ -251,18 +251,8 @@ target_alias = @target_alias@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
OPENJDK_VERSION = b26
-||||||| /tmp/Makefile.in~base.9SzsA6
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
-=======
-OPENJDK_DATE = 30_may_2008
-OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
-OPENJDK_VERSION = b10
JSCHEME_DIR = openjdk/corba/src/share/classes/com/sun/tools/corba/se/logutil
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
@NETX_PLUGIN_FALSE at NETX_PATCH =
@NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -281,32 +271,16 @@ LINUX_DIR = linux-$(BUILD_ARCH_DIR)
LINUX_DIR = linux-$(BUILD_ARCH_DIR)
BUILD_OUTPUT_DIR = openjdk/build/$(LINUX_DIR)
ICEDTEA_BUILD_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)
-=======
$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_RT = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
-=======
$(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_CLS_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/$(BUILD_OUTPUT_DIR)/classes
-=======
$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_BOOT_DIR = \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/bootstrap/jdk1.6.0
-=======
$(abs_top_builddir)/bootstrap/jdk1.6.0
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_ENDORSED_DIR = \
$(ICEDTEA_BOOT_DIR)/lib/endorsed
@@ -318,26 +292,12 @@ JDK_UPDATE_VERSION = 0
@ZERO_BUILD_TRUE at ICEDTEA_ZERO_BUILD = yes
ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
- "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-||||||| /tmp/Makefile.in~base.9SzsA6
- "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
- "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-=======
"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
- "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
-=======
"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR)" \
"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR)" \
@@ -355,54 +315,24 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
-=======
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_1) \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
$(am__append_2) $(am__append_3)
# OpenJDK ecj build environment.
ICEDTEA_BUILD_DIR_ECJ = \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/
-||||||| /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/
-=======
- $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_CLS_DIR_ECJ = \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
$(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/classes
-||||||| /tmp/Makefile.in~base.9SzsA6
- $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
-=======
- $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$(ICEDTEA_BOOT_DIR)" \
"ANT_HOME=$(SYSTEM_ANT_DIR)" "BUILD_NUMBER=$(OPENJDK_VERSION)" \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
- "JRE_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.7.0-$(OPENJDK_VERSION)" "LANG=C" \
- "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-||||||| /tmp/Makefile.in~base.9SzsA6
- "JRE_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0-$(OPENJDK_VERSION)" "LANG=C" \
- "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
-=======
"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
- "JRE_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
- "HOTSPOT_RELEASE_VERSION=1.6.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "JRE_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
+ "HOTSPOT_RELEASE_VERSION=1.7.0_$(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)" \
"LANG=C" "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \
-=======
"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
@@ -426,27 +356,15 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
"FT2_LIB=$(FREETYPE2_LIBS)" \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- "HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_4) \
-=======
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" "JAVAC=" $(am__append_4) \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
$(am__append_5) $(am__append_6)
# OpenJDK Source Preparation Targets
# ==================================
# Download OpenJDK sources.
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
OPENJDK_URL = http://hg.openjdk.java.net/jdk7/jdk7
@USE_ALT_OPENJDK_SRC_ZIP_FALSE at OPENJDK_SRC_ZIP =
-||||||| /tmp/Makefile.in~base.9SzsA6
-OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
-=======
-OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
@USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
@GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch
@@ -468,15 +386,9 @@ ZERO_PATCHES = \
patches/icedtea-signed-types.patch \
patches/icedtea-test-atomic-operations.patch \
patches/icedtea-zero.patch \
- patches/icedtea-ia64-bugfix.patch \
- patches/icedtea-eclipse-hotspot-6614100-7b24.patch
+ patches/icedtea-ia64-bugfix.patch
-
-# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
-NON_ZERO_PATCHES = \
- patches/icedtea-eclipse-hotspot-6614100-6b06.patch
-
- at ZERO_BUILD_FALSE@ZERO_PATCHES_COND = $(NON_ZERO_PATCHES)
+ at ZERO_BUILD_FALSE@ZERO_PATCHES_COND =
@ZERO_BUILD_TRUE at ZERO_PATCHES_COND = $(ZERO_PATCHES)
ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \
patches/icedtea-version.patch \
@@ -505,40 +417,27 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
- patches/icedtea-arm-uname.patch \
+ patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
patches/icedtea-ia64-fdlibm.patch \
patches/icedtea-LCMS-setTagData.patch \
patches/icedtea-color-createcontext.patch \
+ patches/icedtea-color-profiles.patch \
patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
patches/icedtea-directaudio-close-trick.patch \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
- patches/icedtea-override-redirect-metacity.patch \
- $(ZERO_PATCHES_COND) $(GCC_PATCH) $(DISTRIBUTION_PATCHES) \
- patches/icedtea-xslfix.patch patches/icedtea-override.patch \
- $(am__append_7)
-||||||| /tmp/Makefile.in~base.9SzsA6
- patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \
- patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \
- $(DISTRIBUTION_PATCHES) $(am__append_7)
-=======
- patches/icedtea-sparc.patch \
patches/icedtea-sparc64-linux.patch \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
+ $(ZERO_PATCHES_COND) \
+ patches/icedtea-eclipse-hotspot-6614100-7b24.patch \
patches/icedtea-no-bcopy.patch patches/icedtea-jscheme.patch \
- patches/icedtea-dnd-updatecursor.patch \
- patches/icedtea-component.patch $(GCC_PATCH) \
- $(DISTRIBUTION_PATCHES) $(am__append_7)
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
+ patches/icedtea-dnd-updatecursor.patch $(GCC_PATCH) \
+ $(DISTRIBUTION_PATCHES) patches/icedtea-xslfix.patch \
+ patches/icedtea-override.patch $(am__append_7)
# Patch OpenJDK for plug replacements and ecj.
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
-ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
-=======
ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
@WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
@WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP =
@WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP =
@@ -954,84 +853,24 @@ clean-clone:
rm -rf openjdk
# Link ports sources into tree
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
stamps/ports.stamp: stamps/clone.stamp
for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
ln -sf $$target $$link; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/ports.stamp: stamps/extract.stamp
- for target in ports/hotspot/build/*/makefiles/* \
- ports/hotspot/src/*/*; do \
- link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
- ln -sf $$PWD/$$target $$link; \
-=======
-stamps/ports.stamp: stamps/extract.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
- link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
- ln -sf $$target $$link; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
done
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux
-=======
ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/build/linux
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
-=======
ln -sf $(abs_top_builddir)/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
-=======
ln -sf $(abs_top_builddir)/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
mkdir -p stamps
touch stamps/ports.stamp
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
stamps/patch.stamp: stamps/clone.stamp
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/extract.stamp: stamps/download.stamp
- if ! test -d openjdk ; \
- then \
- mkdir openjdk ; \
- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
- chmod -R ug+w openjdk ; \
- fi
- mkdir -p stamps
- touch stamps/extract.stamp
-
-clean-extract:
- rm -f stamps/extract.stamp
-
-stamps/patch.stamp: stamps/extract.stamp
-=======
-stamps/extract.stamp: stamps/download.stamp
- if ! test -d openjdk ; \
- then \
- mkdir openjdk ; \
- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
- chmod -R ug+w openjdk ; \
- rm -rf $(JSCHEME_DIR)/lib; \
- rm -rf $(JSCHEME_DIR)/scripts; \
- fi
- mkdir -p stamps
- touch stamps/extract.stamp
-
-clean-extract:
- rm -f stamps/extract.stamp
-
-stamps/patch.stamp: stamps/extract.stamp
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
all_patches_ok=yes; \
cd $(abs_top_builddir)/openjdk/jdk; \
for p in $(OPENJDK_PATCHES) ; \
@@ -1051,18 +890,10 @@ stamps/patch.stamp: stamps/extract.stamp
do \
if test x$${all_patches_ok} == "xyes" \
&& echo Checking $$p \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- && $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $$p ; \
-=======
&& $(PATCH) -l -p0 --dry-run -s -t -f -F 0 < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
then \
echo Applying $$p ; \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- $(PATCH) -l -p0 < $$p ; \
-=======
$(PATCH) -l -p0 < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
else \
test x$${all_patches_ok} == "xyes" && all_patches_ok=$$p ; \
fi ; \
@@ -1081,7 +912,6 @@ clean-patch:
for p in $(ICEDTEA_PATCHES) ; \
do \
echo Checking $$p ; \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
then \
echo Reverting $$p ; \
@@ -1095,20 +925,9 @@ clean-patch:
do \
echo Checking $$p ; \
if $(PATCH) -l -p1 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
- if $(PATCH) -l -p0 -R --dry-run -s -t -f < $$p ; \
-=======
- if $(PATCH) -l -p0 -R --dry-run -s -t -f < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
then \
echo Reverting $$p ; \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
$(PATCH) -l -p1 -R < $(abs_top_srcdir)/$$p ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
- $(PATCH) -l -p0 -R < $$p ; \
-=======
- $(PATCH) -l -p0 -R < $(abs_top_srcdir)/$$p ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
else \
all_patches_ok=no ; \
fi ; \
@@ -1119,11 +938,7 @@ clean-patch:
fi
stamps/overlay.stamp: stamps/patch.stamp
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- cp -r overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
-=======
cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ && touch stamps/overlay.stamp
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
# OpenJDK ecj Source Preparation Targets
# ======================================
@@ -1141,45 +956,19 @@ clean-clone-ecj:
rm -rf openjdk-ecj
# Link ports sources into tree
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/*/*; do \
link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
ln -sf $$target $$link; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
- for target in ports/hotspot/build/*/makefiles/* \
- ports/hotspot/src/*/*; do \
- link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
- ln -sf $$PWD/$$target $$link; \
-=======
-stamps/ports-ecj.stamp: stamps/extract-ecj.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/src/*/*; do \
- link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'); \
- ln -sf $$target $$link; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
done
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux
-=======
ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/build/linux
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
if ! test "x$(ICEDTEA_CORE_BUILD)$(CACAO)" = "xno"; then \
mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
-=======
ln -sf $(abs_top_builddir)/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
if ! test "x$(ICEDTEA_ZERO_BUILD)$(CACAO)" = "xno"; then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
-=======
ln -sf $(abs_top_builddir)/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
mkdir -p stamps
touch stamps/ports-ecj.stamp
@@ -1213,13 +1002,7 @@ clean-patch-ecj:
# bootstrap/icedtea.
stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
rm -rf bootstrap/icedtea
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
ln -s $(abs_top_builddir)/openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
-||||||| /tmp/Makefile.in~base.9SzsA6
- ln -s $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
-=======
- ln -s $(abs_top_builddir)/openjdk-ecj/control/build/$(LINUX_DIR)/j2sdk-image/ bootstrap/icedtea
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
if ! test -d bootstrap/icedtea/include; then \
ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
fi
@@ -1287,35 +1070,16 @@ stamps/bootstrap-directory-ecj.stamp:
--with-gcj-home=/path/to/java-gcj-devel ; \
exit 1; \
fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- if test -f bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
-=======
if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- mkdir -p bootstrap/ecj/lib ; \
- ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
- $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
-=======
mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
$(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- if test -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
-=======
if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
then \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- bootstrap/ecj/jre/lib/rt.jar; \
-=======
cp $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
$(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
mkdir -p stamps
touch stamps/bootstrap-directory-ecj.stamp
@@ -1353,18 +1117,10 @@ icedtea: stamps/bootstrap-directory-syml
cp -pPRf gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- cp rt/net/sourceforge/jnlp/resources/about.jnlp \
-=======
cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2re-image/lib
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- cp rt/net/sourceforge/jnlp/resources/about.jnlp \
-=======
cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/about.jnlp \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
@@ -1384,18 +1140,10 @@ icedtea-debug: stamps/bootstrap-director
cp -pPRf gcjwebplugin.so \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- cp rt/net/sourceforge/jnlp/resources/default.jnlp \
-=======
cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- cp rt/net/sourceforge/jnlp/resources/default.jnlp \
-=======
cp $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources/default.jnlp \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
extra-lib/about.jar \
$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
@echo "IcedTea (debug build) is served:" \
@@ -1504,53 +1252,25 @@ clean-copy:
# tools.jar class files.
stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \
-=======
for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/* \
hotspot-tools/$$copy_dir ; \
done
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-
- for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \
-=======
-
- for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/langtools/src/share/classes/$$copy_dir/* \
hotspot-tools/$$copy_dir ; \
done
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-
- for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \
-=======
-
- for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/corba/src/share/classes/$$copy_dir/* \
hotspot-tools/$$copy_dir ; \
done
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \
-||||||| /tmp/Makefile.in~base.9SzsA6
-
- for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \
-=======
-
- for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jaxws-copy-files.txt` ; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
do \
mkdir -p hotspot-tools/$$copy_dir ; \
cp -pPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \
@@ -1569,22 +1289,12 @@ stamps/hotspot-tools-class-files.stamp:
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-source 1.5 \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
-=======
-sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
-bootclasspath '' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
-source 1.5 \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
-sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
-||||||| /tmp/Makefile.in~base.9SzsA6
- -sourcepath rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated \
-=======
- -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
-bootclasspath '' @$< ; \
fi
mkdir -p stamps
@@ -1612,26 +1322,13 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
if test -d bootstrap/ecj ; \
then \
mkdir -p bootstrap/ecj/lib/; \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- ln -sf $(abs_top_srcdir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
- $(abs_top_srcdir)/bootstrap/ecj/lib/tools.jar; \
-=======
ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
$(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
fi
# rt-closed.jar class files.
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@
-||||||| /tmp/Makefile.in~base.9SzsA6
-rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
- find rt -name '*.java' | sort > $@
-=======
-rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
- find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' | sort -u > $@
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
stamps/rt-class-files.stamp: rt-source-files.txt
mkdir -p lib/rt
@@ -1639,33 +1336,15 @@ stamps/rt-class-files.stamp: rt-source-f
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
-source 1.5 \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
-sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
-||||||| /tmp/Makefile.in~base.9SzsA6
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
-=======
- -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
-bootclasspath '' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
-source 1.5 \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
-=======
-sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
-bootclasspath '' @$< ; \
-<<<<<<< /home/andrew/projects/openjdk/icedtea/Makefile.in.orig.515328204
fi
cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
-||||||| /tmp/Makefile.in~base.9SzsA6
- fi
- cp -r rt/net/sourceforge/jnlp/resources \
-=======
- fi
- cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
touch stamps/rt-class-files.stamp
@@ -1693,11 +1372,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
# extras -- used to create about.jar for javaws.
extra-source-files.txt:
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- find extra -name '*.java' | sort > $@
-=======
find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
stamps/extra-class-files.stamp: extra-source-files.txt \
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
@@ -1706,11 +1381,7 @@ stamps/extra-class-files.stamp: extra-so
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
-source 1.5 \
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
-=======
-sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
-bootclasspath '' @extra-source-files.txt ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
@@ -1718,11 +1389,7 @@ stamps/extra-class-files.stamp: extra-so
-sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
-bootclasspath '' @extra-source-files.txt ; \
fi
-<<<<<<< /tmp/Makefile.in~base.9SzsA6
- cp -r extra/net/sourceforge/jnlp/about/resources \
-=======
cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
->>>>>>> /tmp/Makefile.in~other.PQ4a7P
extra-lib/net/sourceforge/jnlp/about
mkdir -p stamps
touch $@
diff -r 6a9207d80a39 configure
--- a/configure Sun Jun 22 01:28:42 2008 +0100
+++ b/configure Sun Jun 22 20:27:09 2008 +0100
@@ -13171,11 +13171,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-<<<<<<< /tmp/configure~base._zwsjU
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
-=======
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
->>>>>>> /tmp/configure~other.lgMy65
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 6a9207d80a39 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch Sun Jun 22 01:28:42 2008 +0100
+++ b/patches/icedtea-copy-plugs.patch Sun Jun 22 20:27:09 2008 +0100
@@ -1,83 +1,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
-diff -urN openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
---- openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2007-10-12 04:01:56.000000000 -0400
-+++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2007-10-12 17:17:28.000000000 -0400
-@@ -78,6 +78,9 @@
- */
- public long timeStamp ;
-
-+ // TODO: IcedTea: I am a stub.
-+ static public int trapAuthenticationFailure = 0;
-+
-
-
- /**
---- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2008-02-14 16:23:01.000000000 -0500
-+++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2008-02-14 16:22:15.000000000 -0500
-@@ -1628,7 +1628,7 @@
- }
-
- private static String[] getAnnotationValue(Constructor<?> constructor) {
-- ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
-+ ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
- return (annotation != null)
- ? annotation.value()
- : null;
---- penjdk6/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-02-12 04:05:12.000000000 -0500
-+++ openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-02-14 17:27:39.000000000 -0500
-@@ -1154,7 +1154,7 @@
- Set<BitSet> getterIndexSets = newSet();
- for (Constructor<?> constr : annotatedConstrList) {
- String[] propertyNames =
-- constr.getAnnotation(propertyNamesClass).value();
-+ ((ConstructorProperties)constr.getAnnotation(propertyNamesClass)).value();
-
- Type[] paramTypes = constr.getGenericParameterTypes();
- if (paramTypes.length != propertyNames.length) {
---- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2008-05-23 20:13:24.000000000 +0100
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-05-23 20:22:20.000000000 +0100
- com/sun/jmx/snmp/SnmpDataTypeEnums.class \
- com/sun/jmx/snmp/SnmpDefinitions.class \
- com/sun/jmx/snmp/SnmpOid.class \
--com/sun/jmx/snmp/SnmpOidDatabase.class \
--com/sun/jmx/snmp/SnmpOidDatabaseSupport.class \
- com/sun/jmx/snmp/SnmpOidRecord.class \
- com/sun/jmx/snmp/SnmpOidTable.class \
- com/sun/jmx/snmp/SnmpOidTableSupport.class \
- com/sun/jmx/snmp/SnmpParameters.class \
- com/sun/jmx/snmp/SnmpPduPacket.class \
- com/sun/jmx/snmp/SnmpPeer.class \
-+rt/com/sun/jmx/snmp/SnmpSession.class \
- com/sun/jmx/snmp/SnmpTimeticks.class \
- com/sun/jmx/snmp/SnmpVarBind.class \
- com/sun/jmx/snmp/SnmpVarBindList.class \
--com/sun/jmx/snmp/Timestamp.class \
- com/sun/jmx/snmp/daemon/SendQ.class \
- com/sun/jmx/snmp/daemon/SnmpInformRequest.class \
--com/sun/jmx/snmp/daemon/SnmpQManager.class \
--com/sun/jmx/snmp/daemon/SnmpRequestCounter.class \
--com/sun/jmx/snmp/daemon/SnmpResponseHandler.class \
--com/sun/jmx/snmp/daemon/SnmpSendServer.class \
--com/sun/jmx/snmp/daemon/SnmpSession.class \
--com/sun/jmx/snmp/daemon/SnmpSocket.class \
--com/sun/jmx/snmp/daemon/SnmpTimerServer.class \
--com/sun/jmx/snmp/daemon/WaitQ.class
-+com/sun/jmx/snmp/daemon/SnmpSession.class
-
- # Class list temp files (used by both import and export of plugs)
-
-+PLUG_GNU_CLASS_NAMES = gnu
-+
-+PLUG_JAVAX_CLASS_NAMES = javax/jnlp
-+
-+PLUG_NETX_CLASS_NAMES = net
-+
- PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
--PLUG_CLASS_AREAS = jmf
-+PLUG_CLASS_AREAS = jmf gnu javax netx
- PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
-
- # Create jargs file command
-@@ -93,11 +90,32 @@
+diff -Nru openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk openjdk/jdk/make/common/internal/BinaryPlugs.gmk
+--- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2008-06-22 02:47:03.000000000 +0100
++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-06-22 02:51:22.000000000 +0100
+@@ -147,6 +147,21 @@
@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
$(ECHO) "$$i" >> $@; \
done
@@ -96,10 +20,12 @@ diff -urN openjdk.orig/jdk/src/share/cla
+ @for i in $(PLUG_NETX_CLASS_NAMES) ; do \
+ $(ECHO) "$$i" >> $@ ; \
+ done
- $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
+ $(PLUG_TEMPDIR)/sound.clist:
@$(prep-target)
- $(CAT) $(PLUG_CLISTS) > $@
- $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
+ @for i in $(PLUG_SOUND_CLASS_NAMES) ; do \
+@@ -159,6 +174,12 @@
+ $(plug-create-jargs)
+ $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
$(plug-create-jargs)
+$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
+ $(plug-create-jargs)
@@ -110,7 +36,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
$(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
$(plug-create-jargs)
-@@ -183,9 +201,9 @@
+@@ -183,9 +204,9 @@
# Import classes command
define import-binary-plug-classes
@@ -122,23 +48,40 @@ diff -urN openjdk.orig/jdk/src/share/cla
endef # import-binary-plug-classes
# Import specific area classes (the classes are always created)
-@@ -194,12 +212,21 @@
- $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
-+import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
-+ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
-+import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist
-+ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/javax.clist)
-+import-binary-plug-netx-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/netx.clist
-+ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/netx.clist)
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-05-27 22:30:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java 2008-06-22 02:48:42.000000000 +0100
+@@ -1154,7 +1154,7 @@
+ Set<BitSet> getterIndexSets = newSet();
+ for (Constructor<?> constr : annotatedConstrList) {
+ String[] propertyNames =
+- constr.getAnnotation(propertyNamesClass).value();
++ ((ConstructorProperties)constr.getAnnotation(propertyNamesClass)).value();
- # Import all classes from the jar file
+ Type[] paramTypes = constr.getGenericParameterTypes();
+ if (paramTypes.length != propertyNames.length) {
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2008-05-27 22:30:15.000000000 +0100
++++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2008-06-22 02:48:42.000000000 +0100
+@@ -78,6 +78,9 @@
+ */
+ public long timeStamp ;
- import-binary-plug-jar: \
-- import-binary-plug-jmf-classes
-+ import-binary-plug-jmf-classes \
-+ import-binary-plug-gnu-classes \
-+ import-binary-plug-javax-classes \
-+ import-binary-plug-netx-classes
++ // TODO: IcedTea: I am a stub.
++ static public int trapAuthenticationFailure = 0;
++
- # Binary plug start/complete messages
+ /**
+diff -Nru openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java
+--- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java 2008-05-27 22:30:16.000000000 +0100
++++ openjdk/jdk/src/share/classes/java/beans/MetaData.java 2008-06-22 02:48:42.000000000 +0100
+@@ -1564,7 +1564,7 @@
+ }
+
+ private static String[] getAnnotationValue(Constructor<?> constructor) {
+- ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
++ ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
+ return (annotation != null)
+ ? annotation.value()
+ : null;
diff -r 6a9207d80a39 patches/icedtea-core-build.patch
--- a/patches/icedtea-core-build.patch Sun Jun 22 01:28:42 2008 +0100
+++ b/patches/icedtea-core-build.patch Sun Jun 22 20:27:09 2008 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/corba/make/common
diff -Nru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk
---- openjdk.orig/corba/make/common/Defs-linux.gmk 2008-05-16 22:13:14.000000000 +0100
-+++ openjdk/corba/make/common/Defs-linux.gmk 2008-05-23 23:04:55.000000000 +0100
+--- openjdk.orig/corba/make/common/Defs-linux.gmk 2008-05-27 22:28:05.000000000 +0100
++++ openjdk/corba/make/common/Defs-linux.gmk 2008-06-22 03:10:05.000000000 +0100
@@ -250,7 +250,12 @@
# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
# the library itself should not.
@@ -16,8 +16,8 @@ diff -Nru openjdk.orig/corba/make/common
JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
diff -Nru openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
---- openjdk.orig/hotspot/build/linux/makefiles/defs.make 2008-05-16 22:13:31.000000000 +0100
-+++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-05-23 23:04:55.000000000 +0100
+--- openjdk.orig/hotspot/build/linux/makefiles/defs.make 2008-05-27 22:28:29.000000000 +0100
++++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-06-22 03:10:05.000000000 +0100
@@ -97,6 +97,7 @@
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
@@ -32,8 +32,8 @@ diff -Nru openjdk.orig/hotspot/build/lin
endif
+endif
diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile 2008-05-16 22:13:31.000000000 +0100
-+++ openjdk/hotspot/make/Makefile 2008-05-23 23:09:47.000000000 +0100
+--- openjdk.orig/hotspot/make/Makefile 2008-05-27 22:28:29.000000000 +0100
++++ openjdk/hotspot/make/Makefile 2008-06-22 03:10:05.000000000 +0100
@@ -91,6 +91,15 @@
all_debug: jvmg jvmg1 jvmgkernel docs export_debug
all_optimized: optimized optimized1 optimizedkernel docs export_optimized
@@ -104,18 +104,10 @@ diff -Nru openjdk.orig/hotspot/make/Make
# Bin files (windows)
ifeq ($(OSNAME),windows)
-@@ -264,6 +292,7 @@ endif
-
- # Xusage file
- $(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt: $(XUSAGE)
-+$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt: $(XUSAGE)
- $(prep-target)
- $(RM) $@.temp
- $(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
-diff -r 79d639c8a75f openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-12 04:14:24.000000000 -0500
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-02-14 17:39:45.000000000 -0500
-@@ -89,8 +89,12 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-27 22:28:30.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-06-22 03:10:05.000000000 +0100
+@@ -94,8 +94,12 @@
#ifdef TIERED
#define VMTYPE "Server"
#else
@@ -130,9 +122,267 @@ diff -r 79d639c8a75f openjdk/hotspot/src
#endif // TIERED
#endif // KERNEL
+diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp.orig openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig
+--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp.orig 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig 2008-05-27 22:28:30.000000000 +0100
+@@ -0,0 +1,254 @@
++/*
++ * Copyright 1998-2007 Sun Microsystems, Inc. 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.
++ *
++ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ *
++ */
++
++# include "incls/_precompiled.incl"
++# include "incls/_vm_version.cpp.incl"
++
++const char* Abstract_VM_Version::_s_vm_release = Abstract_VM_Version::vm_release();
++const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Version::internal_vm_info_string();
++bool Abstract_VM_Version::_supports_cx8 = false;
++unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U;
++
++#ifndef HOTSPOT_RELEASE_VERSION
++ #error HOTSPOT_RELEASE_VERSION must be defined
++#endif
++#ifndef JRE_RELEASE_VERSION
++ #error JRE_RELEASE_VERSION must be defined
++#endif
++#ifndef HOTSPOT_BUILD_TARGET
++ #error HOTSPOT_BUILD_TARGET must be defined
++#endif
++
++#ifdef PRODUCT
++ #define VM_RELEASE HOTSPOT_RELEASE_VERSION
++#else
++ #define VM_RELEASE HOTSPOT_RELEASE_VERSION "-" HOTSPOT_BUILD_TARGET
++#endif
++
++// HOTSPOT_RELEASE_VERSION must follow the release version naming convention
++// <major_ver>.<minor_ver>-b<nn>[-<identifier>][-<debug_target>]
++int Abstract_VM_Version::_vm_major_version = 0;
++int Abstract_VM_Version::_vm_minor_version = 0;
++int Abstract_VM_Version::_vm_build_number = 0;
++bool Abstract_VM_Version::_initialized = false;
++int Abstract_VM_Version::_parallel_worker_threads = 0;
++bool Abstract_VM_Version::_parallel_worker_threads_initialized = false;
++
++void Abstract_VM_Version::initialize() {
++ if (_initialized) {
++ return;
++ }
++ char* vm_version = os::strdup(HOTSPOT_RELEASE_VERSION);
++
++ // Expecting the next vm_version format:
++ // <major_ver>.<minor_ver>-b<nn>[-<identifier>]
++ char* vm_major_ver = vm_version;
++ assert(isdigit(vm_major_ver[0]),"wrong vm major version number");
++ char* vm_minor_ver = strchr(vm_major_ver, '.');
++ assert(vm_minor_ver != NULL && isdigit(vm_minor_ver[1]),"wrong vm minor version number");
++ vm_minor_ver[0] = '\0'; // terminate vm_major_ver
++ vm_minor_ver += 1;
++ char* vm_build_num = strchr(vm_minor_ver, '-');
++ assert(vm_build_num != NULL && vm_build_num[1] == 'b' && isdigit(vm_build_num[2]),"wrong vm build number");
++ vm_build_num[0] = '\0'; // terminate vm_minor_ver
++ vm_build_num += 2;
++
++ _vm_major_version = atoi(vm_major_ver);
++ _vm_minor_version = atoi(vm_minor_ver);
++ _vm_build_number = atoi(vm_build_num);
++
++ os::free(vm_version);
++ _initialized = true;
++}
++
++#if defined(_LP64)
++ #define VMLP "64-Bit "
++#else
++ #define VMLP ""
++#endif
++
++#ifdef KERNEL
++ #define VMTYPE "Kernel"
++#else // KERNEL
++#ifdef TIERED
++ #define VMTYPE "Server"
++#else
++ #define VMTYPE COMPILER1_PRESENT("Client") \
++ COMPILER2_PRESENT("Server")
++#endif // TIERED
++#endif // KERNEL
++
++#ifndef HOTSPOT_VM_DISTRO
++ #error HOTSPOT_VM_DISTRO must be defined
++#endif
++#define VMNAME HOTSPOT_VM_DISTRO " " VMLP VMTYPE " VM"
++
++const char* Abstract_VM_Version::vm_name() {
++ return VMNAME;
++}
++
++
++const char* Abstract_VM_Version::vm_vendor() {
++#ifdef VENDOR
++ return XSTR(VENDOR);
++#else
++ return "Sun Microsystems Inc.";
++#endif
++}
++
++
++const char* Abstract_VM_Version::vm_info_string() {
++ switch (Arguments::mode()) {
++ case Arguments::_int:
++ return UseSharedSpaces ? "interpreted mode, sharing" : "interpreted mode";
++ case Arguments::_mixed:
++ return UseSharedSpaces ? "mixed mode, sharing" : "mixed mode";
++ case Arguments::_comp:
++ return UseSharedSpaces ? "compiled mode, sharing" : "compiled mode";
++ };
++ ShouldNotReachHere();
++ return "";
++}
++
++// NOTE: do *not* use stringStream. this function is called by
++// fatal error handler. if the crash is in native thread,
++// stringStream cannot get resource allocated and will SEGV.
++const char* Abstract_VM_Version::vm_release() {
++ return VM_RELEASE;
++}
++
++#define OS LINUX_ONLY("linux") \
++ WINDOWS_ONLY("windows") \
++ SOLARIS_ONLY("solaris")
++
++#define CPU IA32_ONLY("x86") \
++ IA64_ONLY("ia64") \
++ AMD64_ONLY("amd64") \
++ SPARC_ONLY("sparc")
++
++const char *Abstract_VM_Version::vm_platform_string() {
++ return OS "-" CPU;
++}
++
++const char* Abstract_VM_Version::internal_vm_info_string() {
++ #ifndef HOTSPOT_BUILD_USER
++ #define HOTSPOT_BUILD_USER unknown
++ #endif
++
++ #ifndef HOTSPOT_BUILD_COMPILER
++ #ifdef _MSC_VER
++ #if _MSC_VER == 1100
++ #define HOTSPOT_BUILD_COMPILER "MS VC++ 5.0"
++ #elif _MSC_VER == 1200
++ #define HOTSPOT_BUILD_COMPILER "MS VC++ 6.0"
++ #elif _MSC_VER == 1310
++ #define HOTSPOT_BUILD_COMPILER "MS VC++ 7.1"
++ #elif _MSC_VER == 1400
++ #define HOTSPOT_BUILD_COMPILER "MS VC++ 8.0"
++ #else
++ #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
++ #endif
++ #elif defined(__SUNPRO_CC)
++ #if __SUNPRO_CC == 0x420
++ #define HOTSPOT_BUILD_COMPILER "Workshop 4.2"
++ #elif __SUNPRO_CC == 0x500
++ #define HOTSPOT_BUILD_COMPILER "Workshop 5.0 compat=" XSTR(__SUNPRO_CC_COMPAT)
++ #elif __SUNPRO_CC == 0x520
++ #define HOTSPOT_BUILD_COMPILER "Workshop 5.2 compat=" XSTR(__SUNPRO_CC_COMPAT)
++ #elif __SUNPRO_CC == 0x580
++ #define HOTSPOT_BUILD_COMPILER "Workshop 5.8"
++ #elif __SUNPRO_CC == 0x590
++ #define HOTSPOT_BUILD_COMPILER "Workshop 5.9"
++ #else
++ #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC)
++ #endif
++ #elif defined(__GNUC__)
++ #define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__
++ #else
++ #define HOTSPOT_BUILD_COMPILER "unknown compiler"
++ #endif
++ #endif
++
++
++ return VMNAME " (" VM_RELEASE ") for " OS "-" CPU
++ " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__
++ " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER;
++}
++
++unsigned int Abstract_VM_Version::jvm_version() {
++ return ((Abstract_VM_Version::vm_major_version() & 0xFF) << 24) |
++ ((Abstract_VM_Version::vm_minor_version() & 0xFF) << 16) |
++ (Abstract_VM_Version::vm_build_number() & 0xFF);
++}
++
++
++void VM_Version_init() {
++ VM_Version::initialize();
++
++#ifndef PRODUCT
++ if (PrintMiscellaneous && Verbose) {
++ os::print_cpu_info(tty);
++ }
++#endif
++}
++
++unsigned int Abstract_VM_Version::nof_parallel_worker_threads(
++ unsigned int num,
++ unsigned int den,
++ unsigned int switch_pt) {
++ if (FLAG_IS_DEFAULT(ParallelGCThreads)) {
++ assert(ParallelGCThreads == 0, "Default ParallelGCThreads is not 0");
++ // For very large machines, there are diminishing returns
++ // for large numbers of worker threads. Instead of
++ // hogging the whole system, use a fraction of the workers for every
++ // processor after the first 8. For example, on a 72 cpu machine
++ // and a chosen fraction of 5/8
++ // use 8 + (72 - 8) * (5/8) == 48 worker threads.
++ unsigned int ncpus = (unsigned int) os::active_processor_count();
++ return (ncpus <= switch_pt) ?
++ ncpus :
++ (switch_pt + ((ncpus - switch_pt) * num) / den);
++ } else {
++ return ParallelGCThreads;
++ }
++}
++
++unsigned int Abstract_VM_Version::calc_parallel_worker_threads() {
++ return nof_parallel_worker_threads(5, 8, 8);
++}
++
++
++// Does not set the _initialized flag since it is
++// a global flag.
++unsigned int Abstract_VM_Version::parallel_worker_threads() {
++ if (!_parallel_worker_threads_initialized) {
++ if (FLAG_IS_DEFAULT(ParallelGCThreads)) {
++ _parallel_worker_threads = VM_Version::calc_parallel_worker_threads();
++ } else {
++ _parallel_worker_threads = ParallelGCThreads;
++ }
++ _parallel_worker_threads_initialized = true;
++ }
++ return _parallel_worker_threads;
++}
diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2008-05-23 22:59:36.000000000 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2008-05-23 23:04:55.000000000 +0100
+--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2008-06-22 03:01:01.000000000 +0100
++++ openjdk/jdk/make/common/Defs-linux.gmk 2008-06-22 03:10:05.000000000 +0100
@@ -258,7 +258,12 @@
# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
# the library itself should not.
@@ -148,8 +398,8 @@ diff -Nru openjdk.orig/jdk/make/common/D
JAVALIB = -ljava $(JVMLIB)
diff -Nru openjdk.orig/jdk/make/java/redist/Makefile openjdk/jdk/make/java/redist/Makefile
---- openjdk.orig/jdk/make/java/redist/Makefile 2008-05-16 22:15:14.000000000 +0100
-+++ openjdk/jdk/make/java/redist/Makefile 2008-05-23 23:04:55.000000000 +0100
+--- openjdk.orig/jdk/make/java/redist/Makefile 2008-05-27 22:30:14.000000000 +0100
++++ openjdk/jdk/make/java/redist/Makefile 2008-06-22 03:10:05.000000000 +0100
@@ -95,10 +95,12 @@
endif # INCLUDE_SA
@@ -181,8 +431,8 @@ diff -Nru openjdk.orig/jdk/make/java/red
endif # PLATFORM
diff -Nru openjdk.orig/make/hotspot-rules.gmk openjdk/make/hotspot-rules.gmk
---- openjdk.orig/make/hotspot-rules.gmk 2008-05-23 23:04:41.000000000 +0100
-+++ openjdk/make/hotspot-rules.gmk 2008-05-23 23:04:55.000000000 +0100
+--- openjdk.orig/make/hotspot-rules.gmk 2008-05-27 22:27:57.000000000 +0100
++++ openjdk/make/hotspot-rules.gmk 2008-06-22 03:10:05.000000000 +0100
@@ -72,6 +72,10 @@
HOTSPOT_TARGET = all_fastdebug
endif
diff -r 6a9207d80a39 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch Sun Jun 22 01:28:42 2008 +0100
+++ b/patches/icedtea-ecj.patch Sun Jun 22 20:27:09 2008 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk-ecj.orig/corba/make/co
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
---- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2008-05-26 01:35:35.000000000 +0100
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2008-06-22 19:05:57.000000000 +0100
@@ -42,7 +42,7 @@
# the rmic iiop backend needs some classes that are part of the impl/util
# package. These classes use log wrappers, so they must be built after
@@ -12,7 +12,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
--- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2008-05-26 01:35:35.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2008-06-22 19:05:57.000000000 +0100
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -52,1531 +52,9 @@ diff -Nru openjdk-ecj.orig/corba/make/co
+# Include
+#
+include $(BUILDDIR)/common/Classes.gmk
---- iopenjdk/jdk/make/common/Rules.gmk 2007-10-12 03:54:05.000000000 -0400
-+++ openjdk-ecj/jdk/make/common/Rules.gmk 2007-11-07 11:02:53.000000000 -0500
-@@ -235,8 +235,9 @@
- $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
- $(CAT) $(JAVA_SOURCE_LIST); \
- $(ECHO) "# Running javac:"; \
-- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \
-+ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- fi
- @$(java-vm-cleanup)
-
- _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
-
-+
-+ifdef ALT_LANGTOOLS_DIST
-+ LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST))
-+else
-+ LANGTOOLS_DIST =
-+endif
-+
- #
- # Get platform definitions
- #
-@@ -129,8 +136,6 @@
- # for build tool jar files
- BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars
- ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
--# for generated java source files
--GENSRCDIR = $(OUTPUTDIR)/gensrc
- # for generated C source files (not javah)
- GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc
- # for imported source files
-@@ -231,7 +236,7 @@
- # We define an intermediate variable for Java files because
- # we use its value later to help define $SOURCEPATH
-
--VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
-+VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
- VPATH.java = $(VPATH0.java)
- vpath %.java $(VPATH.java)
- vpath %.class $(CLASSBINDIR)
-diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk
---- openjdk-ecj.orig/corba/make/common/Rules.gmk 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Rules.gmk 2008-05-26 01:35:35.000000000 +0100
-@@ -197,8 +197,10 @@
- $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
- $(CAT) $(JAVA_SOURCE_LIST); \
- $(ECHO) "# Running javac:"; \
-- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
-+ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
-+ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- fi
- @$(java-vm-cleanup)
-
-diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
---- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-05-26 01:35:42.000000000 +0100
-@@ -117,31 +117,13 @@
- JAVACFLAGS += $(OTHER_JAVACFLAGS)
-
- # Needed for javah
--JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
-+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
-
--# Langtools
--ifdef LANGTOOLS_DIST
-- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
-- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
-- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
-- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
-- JAVAC_CMD = $(BOOT_JAVA_CMD) \
-- "-Xbootclasspath/p:$(JAVAC_JAR)" \
-- -jar $(JAVAC_JAR) $(JAVACFLAGS)
-- JAVAH_CMD = $(BOOT_JAVA_CMD) \
-- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
-- -jar $(JAVAH_JAR) $(JAVAHFLAGS)
-- JAVADOC_CMD = $(BOOT_JAVA_CMD) \
-- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
-- -jar $(JAVADOC_JAR)
--else
-- # If no explicit tools, use boot tools (add VM flags in this case)
-- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
-+# If no explicit tools, use boot tools (add VM flags in this case)
-+JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- $(JAVACFLAGS)
-- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
-+JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
- $(JAVAHFLAGS)
-- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
--endif
-
- # Override of what javac to use (see deploy workspace)
- ifdef JAVAC
-diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
---- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2008-05-26 01:35:35.000000000 +0100
-@@ -93,8 +93,6 @@
- POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
-
- $(POAGENERATEDFILES):: $(POA.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL)
-- $(RM) -r $(POAHELHOLFILES)
-
- poa.compile: $(POAGENERATEDFILES)
-
-@@ -110,10 +108,6 @@
-
- # Generating and deleting unused files to reduce images size
- $(DYNANYFILES): $(DYNAMIC_ANY.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL)
-- $(RM) $(DYNANY_DIR)/*POA*
-- $(RM) $(DYNANY_DIR)/*Holder*
-- $(RM) $(DYNANYDELETEFILES)
-
- dynany.compile: $(DYNANYFILES)
-
-@@ -125,12 +119,6 @@
- TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions"
-
- $(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
--# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
-
- tr.compile: $(TRGENERATEDFILES)
-
-@@ -144,7 +132,6 @@
- # _NamingContextImplBase.java and _BindingIteratorImplBase.java files
- # to GENSRC directory. Note that these two classes are deprecated.
- $(NSGENERATEDFILES): $(NAMESERVICE.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL)
-
- ns.compile: $(NSGENERATEDFILES)
-
-@@ -156,8 +143,6 @@
- IOPDELETEFILES = $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%)
-
- $(IOPGENERATEDFILES):: $(IOP.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL)
-- $(RM) -r $(IOPDELETEFILES)
-
- iop.compile: $(IOPGENERATEDFILES)
-
-@@ -169,8 +154,6 @@
- CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%)
-
- $(CORBAXGENERATEDFILES):: $(CORBAX.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL)
-- $(RM) $(CORBAXDUPLICATEFILES)
-
- corbax.compile: $(CORBAXGENERATEDFILES)
-
-@@ -181,7 +164,6 @@
- MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%)
-
- $(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL)
-
- messaging.compile: $(MESSAGINGGENERATEDFILES)
-
-@@ -195,8 +177,6 @@
- PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
-
- $(PIGENERATEDFILES):: $(INTERCEPTORS.IDL)
-- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -pkgPrefix PortableInterceptor org.omg -pkgPrefix Dynamic org.omg -pkgPrefix IOP org.omg -corba 3.0 -D CORBA3 $(INTERCEPTORS.IDL)
-- $(RM) $(PIHELHOLFILES)
-
- pi.compile: $(PIGENERATEDFILES)
-
-diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile
---- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2008-05-26 01:35:35.000000000 +0100
-@@ -173,7 +173,6 @@
- ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
-
- $(ACTIVATIONFILES): $(ACTIVATION.IDL)
-- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
-
- activation.idl.compile: $(ACTIVATIONFILES)
-
-@@ -196,7 +195,6 @@
-
- # REVISIT: remove -oldImplBase
- $(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
-- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
-
- portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
-
-diff -Nru openjdk-ecj.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm
---- openjdk-ecj.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm 2008-05-26 01:35:42.000000000 +0100
-@@ -332,7 +332,6 @@
- (.printMsg pw "// Log wrapper class for Sun private system exceptions in group @" (list group)))
- (.println pw "//")
- (.printMsg pw "// Generated by mc.scm version @, DO NOT EDIT BY HAND!" (list version-string))
-- (.printMsg pw "// Generated from input file @ on @" (list infile (java.util.Date.)))
- (.println pw)))
-
- (define (write-factory-method class-name exception-group-name pw)
-diff -Nru openjdk-ecj.orig/hotspot/build/linux/Makefile openjdk-ecj/hotspot/build/linux/Makefile
---- openjdk-ecj.orig/hotspot/build/linux/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/hotspot/build/linux/Makefile 2008-05-26 01:35:35.000000000 +0100
-@@ -249,28 +249,24 @@
-
- $(TARGETS_C2): $(SUBDIRS_C2)
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_TIERED): $(SUBDIRS_TIERED)
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_C1): $(SUBDIRS_C1)
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_CORE): $(SUBDIRS_CORE)
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-diff -Nru openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make openjdk-ecj/hotspot/build/linux/makefiles/sa.make
---- openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make 2008-05-26 01:35:42.000000000 +0100
-@@ -72,7 +72,7 @@
- $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
- mkdir -p $(SA_CLASSDIR); \
- fi
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
- $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
- $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
-diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile
---- openjdk-ecj.orig/jaxp/make/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jaxp/make/Makefile 2008-05-26 01:35:42.000000000 +0100
-@@ -80,7 +80,7 @@
- endif
-
- ifdef ALT_BOOTDIR
-- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-+ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
- endif
-
- ifdef ALT_OUTPUTDIR
-diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
---- openjdk-ecj.orig/jaxp/make/build.xml 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jaxp/make/build.xml 2008-05-26 01:35:42.000000000 +0100
-@@ -71,7 +71,10 @@
- <mkdir dir="${build.toolclasses.dir}"/>
- <javac srcdir="${make.tools.dir}/StripProperties"
- destdir="${build.toolclasses.dir}/"
-- classpath="${ant.home}/lib/ant.jar"/>
-+ classpath="${ant.home}/lib/ant.jar"
-+ fork="true"
-+ executable="${javac.executable}"
-+ source="1.5"/>
- <taskdef name="pstrip"
- classname="StripPropertiesTask"
- classpath="${build.toolclasses.dir}/"/>
-@@ -85,7 +88,9 @@
- destdir="${build.classes.dir}"
- memoryInitialSize="${javac.memoryInitialSize}"
- memoryMaximumSize="${javac.memoryMaximumSize}"
-- target="${javac.target}">
-+ target="${javac.target}"
-+ executable="${javac.executable}"
-+ source="1.5">
- <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
- <compilerarg line="${javac.version.opt}"/>
- </javac>
-diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile
---- openjdk-ecj.orig/jaxws/make/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jaxws/make/Makefile 2008-05-26 01:35:42.000000000 +0100
-@@ -80,8 +80,8 @@
- endif
-
- ifdef ALT_BOOTDIR
-- ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
-- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-+ ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
-+ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
- endif
-
- ifdef ALT_OUTPUTDIR
-diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties
---- openjdk-ecj.orig/jaxws/make/build.properties 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.properties 2008-05-26 01:35:35.000000000 +0100
-@@ -37,7 +37,7 @@
- # set the following to -version to verify the versions of javac being used
- javac.version.opt =
- # in time, there should be no exceptions to -Xlint:all
--javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror
-+javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial
-
- # JVM memory size
- javac.memoryInitialSize = 128m
-diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml
---- openjdk-ecj.orig/jaxws/make/build.xml 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.xml 2008-05-26 01:35:42.000000000 +0100
-@@ -84,7 +84,10 @@
- <mkdir dir="${build.toolclasses.dir}"/>
- <javac srcdir="${make.tools.dir}/StripProperties"
- destdir="${build.toolclasses.dir}/"
-- classpath="${ant.home}/lib/ant.jar"/>
-+ fork="true"
-+ executable="${javac.executable}"
-+ classpath="${ant.home}/lib/ant.jar"
-+ source="1.5"/>
- <taskdef name="pstrip"
- classname="StripPropertiesTask"
- classpath="${build.toolclasses.dir}/"/>
-@@ -96,12 +99,14 @@
- <javac fork="true"
- srcdir="${src.classes.dir}"
- destdir="${build.classes.dir}"
-+ executable="${javac.executable}"
- memoryInitialSize="${javac.memoryInitialSize}"
- memoryMaximumSize="${javac.memoryMaximumSize}"
- target="${javac.target}"
-- excludes="com/sun/tools/internal/txw2/**">
-- <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/>
-- <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
-+ excludes="com/sun/tools/internal/txw2/**"
-+ source="1.5">
-+ <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
-+ <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
- <compilerarg line="${javac.version.opt}"/>
- <compilerarg line="${javac.no.jdk.warnings}"/>
- </javac>
-diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
---- openjdk-ecj.orig/jdk/make/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/Makefile 2008-05-26 01:35:35.000000000 +0100
-@@ -239,7 +239,7 @@
-
- all build:: sanity-all post-sanity-all
-
--SUBDIRS = tools java javax org sun sunw com jpda mkdemo mksample launchers
-+SUBDIRS = tools java javax org sun sunw com jpda mksample launchers
- all build::
- $(SUBDIRS-loop)
-
-diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk
---- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2008-05-26 01:35:35.000000000 +0100
-@@ -43,7 +43,8 @@
- @$(prep-target)
- @$(MKDIR) -p $(BUILDTOOLCLASSDIR)
- $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
-- -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
-+ -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \
-+ $(BUILDTOOL_MAIN_SOURCE_FILE)
- $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
- -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
- $(JAR_JFLAGS) || $(RM) $@
-diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk
---- openjdk-ecj.orig/jdk/make/common/Release.gmk 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Release.gmk 2008-05-26 01:35:42.000000000 +0100
-@@ -649,10 +649,11 @@
- $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
- $(prep-target)
- $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
--$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
-+$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
- $(prep-target)
-- $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
-- @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
-+ (cd $(CLASSBINDIR) && \
-+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
-+ $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
- @$(java-vm-cleanup)
-
- # Create jsse.jar containing SunJSSE implementation classes
-@@ -708,10 +709,11 @@
- $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
- $(prep-target)
- $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
--$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
-+$(RT_JAR): $(RT_JAR_FILELIST) $(JAR_MANIFEST_FILE)
- $(prep-target)
-- $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
-- @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
-+ (cd $(CLASSBINDIR) && \
-+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
-+ $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
- @$(java-vm-cleanup)
-
- # Meta-index construction to make core class loaders lazier
-@@ -949,19 +951,6 @@
- @$(java-vm-cleanup)
- $(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
- @#
-- @# lib/ct.sym
-- @#
-- $(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym
-- $(JAVAC_CMD) -XDprocess.packages -proc:only \
-- -processor com.sun.tools.javac.sym.CreateSymbols \
-- -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
-- -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
-- $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS)
-- $(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \
-- -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS)
-- @$(java-vm-cleanup)
-- $(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym
-- @#
- @# CORBA supported orb.idl and ir.idl should be copied to lib
- @#
- $(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
-@@ -1038,16 +1027,6 @@
- $(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher
- $(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
- $(RM) -r $(JDK_IMAGE_DIR)/src
-- @#
-- @# demo, include
-- @#
-- $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
-- $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
-- $(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR)
-- @#
-- @# Swing BeanInfo generation
-- @#
-- $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
- ifneq ($(PLATFORM), windows)
- $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
- endif # !windows
-diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk
---- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Rules.gmk 2008-05-26 01:41:27.000000000 +0100
-@@ -237,8 +237,9 @@
- $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
- $(CAT) $<.filtered; \
- $(ECHO) "# Running javac:"; \
-- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
-- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
-+ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \
-+ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
- fi
- @$(java-vm-cleanup)
-
-@@ -304,6 +305,8 @@
- $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
- $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
- @$(java-vm-cleanup)
-+ -mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \
-+ $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h
- @$(TOUCH) $@
-
- classheaders.clean:
-diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk~ openjdk-ecj/jdk/make/common/Rules.gmk~
---- openjdk-ecj.orig/jdk/make/common/Rules.gmk~ 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/Rules.gmk~ 2008-05-26 01:35:35.000000000 +0100
-@@ -0,0 +1,339 @@
-+#
-+# Copyright 1995-2007 Sun Microsystems, Inc. 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. Sun designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+# CA 95054 USA or visit www.sun.com if you need additional information or
-+# have any questions.
-+#
-+
-+#
-+#
-+# Rules shared by all Java makefiles.
-+#
-+# Used to apply to source file $<, checks code conventions, issues warnings.
-+define check-conventions
-+ if [ "$(CONVENTION_WATCH)" = "true" ] ; then \
-+ if [ "`$(CAT) -n -v -t $< | $(EGREP) -v '\@\(\#\)' | $(EGREP) '\^[MLI]'`" != "" ] ; then \
-+ $(ECHO) "WARNING: File contains tabs, ^M, or ^L characters: $<"; \
-+ if [ "$(CONVENTION_DETAILS)" = "true" ] ; then \
-+ $(CAT) -n -v -t $< | $(EGREP) -v '\@\(\#\)' | $(EGREP) '\^[MLI]' ; \
-+ fi; \
-+ fi; \
-+ fi
-+endef
-+
-+# Make sure the default rule is all
-+rules_default_rule: all
-+
-+#
-+# Directory set up. (Needed by deploy workspace)
-+#
-+$(CLASSDESTDIR) $(CLASSHDRDIR) $(OBJDIR) $(OUTPUTDIR) $(BINDIR) $(LIBDIR) $(LIBDIR)/$(LIBARCH) $(TEMPDIR) $(EXTDIR):
-+ $(MKDIR) -p $@
-+
-+#
-+# All source tree areas for java/properties files (a few may be closed)
-+#
-+ifdef OPENJDK
-+ ALL_CLASSES_SRC = $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
-+else
-+ ALL_CLASSES_SRC = \
-+ $(CLOSED_SHARE_SRC)/classes $(CLOSED_PLATFORM_SRC)/classes \
-+ $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
-+endif
-+
-+#
-+# If AUTO_FILES_PROPERTIES_DIRS used, automatically find properties files
-+#
-+ifdef AUTO_FILES_PROPERTIES_DIRS
-+ AUTO_FILES_PROPERTIES_FILTERS1 = $(SCM_DIRs) 'X-*' '*-X-*' ',*'
-+ AUTO_FILES_PROPERTIES_FILTERS1 += $(AUTO_PROPERTIES_PRUNE)
-+ FILES_properties_find_filters1 = $(AUTO_FILES_PROPERTIES_FILTERS1:%=-name % -prune -o)
-+ FILES_properties_auto1 := \
-+ $(shell \
-+ for dir in $(ALL_CLASSES_SRC) ; do \
-+ if [ -d $$dir ] ; then \
-+ ( $(CD) $$dir; \
-+ for sdir in $(AUTO_FILES_PROPERTIES_DIRS); do \
-+ if [ -d $$sdir ] ; then \
-+ $(FIND) $$sdir $(FILES_properties_find_filters1) \
-+ -name '*.properties' -print ; \
-+ fi ; \
-+ done \
-+ ); \
-+ fi; \
-+ done \
-+ )
-+else
-+ FILES_properties_auto1 =
-+endif # AUTO_FILES_PROPERTIES_DIRS
-+
-+# Add any automatically found properties files to the properties file list
-+FILES_properties += $(FILES_properties_auto1)
-+
-+#
-+# Get Resources help
-+#
-+include $(JDK_TOPDIR)/make/common/internal/Resources.gmk
-+
-+#
-+# Compiling .java files.
-+#
-+
-+#
-+# Automatically add to FILES_java if AUTO_FILES_JAVA_DIRS is defined
-+#
-+# There are two basic types of sources, normal source files and the
-+# generated ones. The Normal sources will be located in:
-+# $(ALL_CLASSES_SRC)
-+# The generated sources, which might show up late to dinner, are at:
-+# $(GENSRCDIR)
-+# and since they could be generated late, we need to be careful that
-+# we look for these sources late and not use the ':=' assignment which
-+# might miss their generation.
-+
-+ifdef AUTO_FILES_JAVA_DIRS
-+ # Filter out these files or directories
-+ AUTO_FILES_JAVA_SOURCE_FILTERS1 = $(SCM_DIRs) 'X-*' '*-X-*' '*-template.java' ',*'
-+ AUTO_FILES_JAVA_SOURCE_FILTERS2 =
-+ AUTO_FILES_JAVA_SOURCE_FILTERS1 += $(AUTO_JAVA_PRUNE)
-+ AUTO_FILES_JAVA_SOURCE_FILTERS2 += $(AUTO_JAVA_PRUNE)
-+
-+ # First list is the normal sources that should always be there,
-+ # by using the ':=', which means we do this processing once.
-+ FILES_java_find_filters1 = $(AUTO_FILES_JAVA_SOURCE_FILTERS1:%=-name % -prune -o)
-+ FILES_java_auto1 := \
-+ $(shell \
-+ for dir in $(ALL_CLASSES_SRC) ; do \
-+ if [ -d $$dir ] ; then \
-+ ( $(CD) $$dir; \
-+ for sdir in $(AUTO_FILES_JAVA_DIRS); do \
-+ if [ -d $$sdir ] ; then \
-+ $(FIND) $$sdir $(FILES_java_find_filters1) \
-+ -name '*.java' -print ; \
-+ fi ; \
-+ done \
-+ ); \
-+ fi; \
-+ done \
-+ )
-+ # Second list is the generated sources that should be rare, but will likely
-+ # show up late and we need to look for them at the last minute, so we
-+ # cannot use the ':=' assigment here. But if this gets expanded multiple
-+ # times, the if tests should make them relatively cheap.
-+ FILES_java_find_filters2 = $(AUTO_FILES_JAVA_SOURCE_FILTERS2:%=-name % -prune -o)
-+ FILES_java_auto2 = \
-+ $(shell \
-+ for dir in $(GENSRCDIR); do \
-+ if [ -d $$dir ] ; then \
-+ ( $(CD) $$dir; \
-+ for sdir in $(AUTO_FILES_JAVA_DIRS); do \
-+ if [ -d $$sdir ] ; then \
-+ $(FIND) $$sdir $(FILES_java_find_filters2) \
-+ -name '*.java' -print ; \
-+ fi ; \
-+ done \
-+ ); \
-+ fi; \
-+ done \
-+ )
-+else
-+ FILES_java_auto1 =
-+ FILES_java_auto2 =
-+endif
-+
-+# Add all found java sources to FILES_java macro (if AUTO_FILES_JAVA_DIRS used)
-+FILES_java += $(FILES_java_auto1) $(FILES_java_auto2)
-+
-+# File that will hold java source names that need compiling
-+JAVA_SOURCE_LIST=$(TEMPDIR)/.classes.list
-+
-+# Add a java source to the list
-+define add-java-file
-+$(ECHO) "$?" >> $(JAVA_SOURCE_LIST)
-+$(check-conventions)
-+endef
-+
-+ifdef DEMOS
-+$(CLASSDESTDIR)/%.class: $(SOURCEPATH)/%.java
-+ @$(add-java-file)
-+#Redirect zh_HK java files to tmp directory which created from zh_TW
-+#$(CLASSDESTDIR)/%_zh_HK.class: $(JDK_L10N_TMP_OUTPUTDIR)/%_zh_HK.java
-+# @$(add-java-file)
-+else
-+
-+#
-+# Rules for closed files
-+#
-+# If filenames are duplicated between open/closed workspaces, prefer
-+# the closed files.
-+#
-+# Rule ordering in this Makefile is important: some targets depend
-+# on closed files replacing open ones, and thus the closed file rules
-+# must be found before the open ones.
-+#
-+# Don't reorder without consulting teams that depend on this behavior.
-+#
-+ifndef OPENJDK
-+$(CLASSDESTDIR)/%.class: $(CLOSED_PLATFORM_SRC)/classes/%.java
-+ @$(add-java-file)
-+$(CLASSDESTDIR)/%.class: $(CLOSED_SHARE_SRC)/classes/%.java
-+ @$(add-java-file)
-+endif
-+
-+$(CLASSDESTDIR)/%.class: $(GENSRCDIR)/%.java
-+ @$(add-java-file)
-+$(CLASSDESTDIR)/%.class: $(PLATFORM_SRC)/classes/%.java
-+ @$(add-java-file)
-+$(CLASSDESTDIR)/%.class: $(SHARE_SRC)/classes/%.java
-+ @$(add-java-file)
-+
-+#Redirect zh_HK java files to tmp directory which created from zh_TW
-+$(CLASSDESTDIR)/%_zh_HK.class: $(JDK_L10N_TMP_OUTPUTDIR)/%_zh_HK.java
-+ @$(add-java-file)
-+endif
-+
-+# List of class files needed
-+FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
-+
-+# Got to include exported files.
-+FILES_class += $(FILES_export:%.java=$(CLASSDESTDIR)/%.class)
-+
-+# Construct list of java sources we need to compile
-+source_list_prime:
-+ @$(MKDIR) -p $(TEMPDIR)
-+# Note that we slip resources in so that compiled properties files get created:
-+$(JAVA_SOURCE_LIST) : source_list_prime resources $(FILES_class)
-+ @$(TOUCH) $@
-+
-+.delete.classlist:
-+ @$(RM) $(JAVA_SOURCE_LIST)
-+
-+# Make sure all newer sources are compiled (in a batch)
-+classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
-+
-+.compile.classlist : $(JAVA_SOURCE_LIST)
-+ @$(MKDIR) -p $(CLASSDESTDIR)
-+ @$(RM) $<.filtered
-+ @$(CAT) $< | $(NAWK) 'length>0' | $(SORT) -u > $<.filtered
-+ @if [ `$(CAT) $<.filtered | $(WC) -l` -ge 1 ] ; then \
-+ $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
-+ $(CAT) $<.filtered; \
-+ $(ECHO) "# Running javac:"; \
-+ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
-+ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
-+ fi
-+ @$(java-vm-cleanup)
-+
-+clobber clean::
-+ $(RM) $(JAVA_SOURCE_LIST)
-+
-+ifndef DONT_CLOBBER_CLASSES
-+ ifndef PACKAGE
-+ DONT_CLOBBER_CLASSES = true
-+ else
-+ DONT_CLOBBER_CLASSES = false
-+ endif
-+endif
-+
-+packages.clean:
-+ifeq ($(DONT_CLOBBER_CLASSES),false)
-+ ifdef AUTO_FILES_JAVA_DIRS
-+ @for sdir in $(AUTO_FILES_JAVA_DIRS); do \
-+ $(ECHO) "$(RM) -r $(CLASSDESTDIR)/$$sdir"; \
-+ $(RM) -r $(CLASSDESTDIR)/$$sdir; \
-+ done
-+ else
-+ $(RM) -r $(CLASSDESTDIR)/$(PKGDIR)
-+ endif
-+endif
-+
-+ifdef DEMOS
-+classes.clean:
-+ $(RM) -r $(DEMODST) $(CLASSDESTDIR)
-+else
-+classes.clean: packages.clean
-+ $(RM) $(JAVA_SOURCE_LIST)
-+endif
-+
-+#
-+# C and C++ make dependencies
-+#
-+include $(JDK_TOPDIR)/make/common/internal/NativeCompileRules.gmk
-+
-+#
-+# Running Javah to generate stuff into CClassHeaders.
-+#
-+
-+ifdef FILES_export
-+
-+CLASSES.export = $(subst /,.,$(FILES_export:%.java=%))
-+CLASSES.export += $(subst /,.,$(FILES_export2:%.java=%))
-+CLASSES.export += $(subst /,.,$(FILES_export3:%.java=%))
-+CLASSES_export = $(FILES_export:%.java=$(CLASSDESTDIR)/%.class)
-+CLASSES_export += $(FILES_export2:%.java=$(CLASSDESTDIR)/%.class)
-+CLASSES_export += $(FILES_export3:%.java=$(CLASSDESTDIR)/%.class)
-+
-+# Fix when deploy workspace makefiles don't depend on this name
-+#CLASSHDR_DOTFILE=$(CLASSHDRDIR)/.classheaders
-+
-+CLASSHDR_DOTFILE=$(OBJDIR)/.class.headers.$(ARCH)
-+
-+classheaders: classes $(CLASSHDR_DOTFILE)
-+
-+$(CLASSHDR_DOTFILE): $(CLASSES_export)
-+ $(prep-target)
-+ @$(ECHO) "# Running javah:"
-+ $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
-+ $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
-+ @$(java-vm-cleanup)
-+ -mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \
-+ $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h
-+ @$(TOUCH) $@
-+
-+classheaders.clean:
-+ $(RM) $(CLASSHDR_DOTFILE)
-+ $(RM) -r $(CLASSHDRDIR)
-+
-+else # FILES_export
-+
-+classheaders: classes
-+
-+classheaders.clean:
-+
-+endif # FILES_export
-+
-+clean clobber:: classheaders.clean classes.clean .delete.classlist
-+
-+#
-+# Default dependencies
-+#
-+
-+all: build
-+
-+build: classheaders
-+
-+default: all
-+
-+.PHONY: all build clean clobber \
-+ .delete.classlist classes .compile.classlist classes.clean \
-+ classheaders classheaders.clean \
-+ batch_compile
-+
-diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
---- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-05-26 01:35:42.000000000 +0100
-@@ -118,30 +118,19 @@
- JAVACFLAGS += $(OTHER_JAVACFLAGS)
-
- # Needed for javah
--JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
-+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
-
- # Langtools
- ifdef LANGTOOLS_DIST
-- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
-- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
-- JAVAC_CMD = $(BOOT_JAVA_CMD) \
-- "-Xbootclasspath/p:$(JAVAC_JAR)" \
-- -jar $(JAVAC_JAR) $(JAVACFLAGS)
-- JAVAH_CMD = $(BOOT_JAVA_CMD) \
-- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
-- -jar $(JAVAH_JAR) $(JAVAHFLAGS)
- JAVADOC_CMD = $(BOOT_JAVA_CMD) \
- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
- -jar $(JAVADOC_JAR)
--else
-- # If no explicit tools, use boot tools (add VM flags in this case)
- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- $(JAVACFLAGS)
- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
- $(JAVAHFLAGS)
-- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
- endif
-
- # Override of what javac to use (see deploy workspace)
-diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile
---- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/nio/Makefile 2008-05-26 01:35:35.000000000 +0100
-@@ -31,7 +31,7 @@
- PACKAGE = java.nio
- LIBRARY = nio
- PRODUCT = java
--OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
-+OTHER_JAVACFLAGS += -Xlint:serial -Werror
- include $(BUILDDIR)/common/Defs.gmk
-
- NIO_SRC = $(SHARE_SRC)/classes/java/nio
-diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile
---- openjdk-ecj.orig/jdk/make/java/text/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/java/text/Makefile 2008-05-26 01:35:35.000000000 +0100
-@@ -80,8 +80,8 @@
- -sourcepath $(TEXT_SRCDIR) \
- $(TEXT_SOURCES)
- $(MKDIR) -p $(TEXT_CLASSDIR)
-- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
-- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
-+ $(BOOT_JAVA_CMD) -cp $(TEXT_CLASSES):$(GENERATEBREAKITERATORDATA_JARFILE):$(ICEDTEA_CLS_DIR) \
-+ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
- -o $(TEXT_CLASSDIR) \
- -spec $(UNICODEDATA)/UnicodeData.txt
- @$(java-vm-cleanup)
-diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/awt/Makefile 2008-05-26 01:35:35.000000000 +0100
-@@ -400,10 +400,9 @@
- COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
-
- $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
-- $(COMPILEFONTCONFIG_JARFILE)
-- $(prep-target)
-- $(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@
-- $(CHMOD) 444 $(@)
-+ $(COMPILEFONTCONFIG_JARFILE)
-+ $(CP) -f $(GENSRCDIR)/fontconfig/* $(LIBDIR)
-+ $(CHMOD) 444 $(LIBDIR)/*.bfc
- @$(java-vm-cleanup)
-
- fontconfigs.clean :
-diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile
---- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2008-05-26 01:35:35.000000000 +0100
-@@ -62,7 +62,8 @@
- $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
- $(RM) -r $(@D)
- $(prep-target)
-- $(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
-+ $(BOOT_JAVA_CMD) -cp $(ICEDTEA_CLS_DIR):$(BUILDTOOLJARDIR)/javazic.jar \
-+ build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
- @$(java-vm-cleanup)
-
- $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
-diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile
---- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/text/Makefile 2008-05-26 01:35:35.000000000 +0100
-@@ -85,8 +85,9 @@
- $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
- -sourcepath $(TEXT_SRCDIR) \
- $(BIRULES) $(BIINFO)
-- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
-- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
-+ $(BOOT_JAVA_CMD) \
-+ -cp $(TEXT_CLASSES):$(ICEDTEA_CLS_DIR):$(GENERATEBREAKITERATORDATA_JARFILE) \
-+ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
- -o $(CLASSDESTDIR)/sun/text/resources \
- -spec $(UNICODEDATA)/UnicodeData.txt \
- -language th
-diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile
---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2008-05-26 01:39:25.000000000 +0100
-@@ -276,11 +276,7 @@
-
- TEMPDIR_CLASSES = $(TEMPDIR)/classes
-
--$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java
-- @$(prep-target)
-- $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
--
--$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS)
-+$(TEMPDIR)/.gen_icons: $(ICONS)
- $(prep-target)
- for i in $(ICONS); do \
- filename=`basename $$i`; \
-@@ -290,20 +286,14 @@
- $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \
- $(ECHO) "public static int[] $$name = { " >> $$classname; \
-- $(CAT) $$i | \
-- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \
-- -Djava.awt.headless=true \
-- sun.awt.X11.ToBin >> $$classname; \
-+ $(ECHO) "0,0" >> $$classname ; \
- $(ECHO) "}; }" >> $$classname; \
- classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
- $(RM) $$classname; \
- $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \
- $(ECHO) "public static long[] $$name = { " >> $$classname; \
-- $(CAT) $$i | \
-- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \
-- -Djava.awt.headless=true \
-- sun.awt.X11.ToBin >> $$classname; \
-+ $(ECHO) "0,0" >> $$classname ; \
- $(ECHO) "}; }" >> $$classname; \
- done
- $(TOUCH) $@
-diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile~ openjdk-ecj/jdk/make/sun/xawt/Makefile~
---- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile~ 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile~ 2008-05-26 01:39:20.000000000 +0100
-@@ -0,0 +1,304 @@
-+#
-+# Copyright 2002-2008 Sun Microsystems, Inc. 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. Sun designates this
-+# particular file as subject to the "Classpath" exception as provided
-+# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+# CA 95054 USA or visit www.sun.com if you need additional information or
-+# have any questions.
-+#
-+
-+BUILDDIR = ../..
-+PACKAGE = sun.awt.X11
-+LIBRARY = mawt
-+LIBRARY_OUTPUT = xawt
-+LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/xawt
-+PRODUCT = sun
-+
-+include $(BUILDDIR)/common/Defs.gmk
-+
-+GEN_DIR=$(GENSRCDIR)/sun/awt/X11
-+
-+CLASSES_INIT += $(TEMPDIR)/.gen.wrappers $(TEMPDIR)/.gen_icons touch.wrappers
-+
-+.PHONY: generated.clean
-+
-+#
-+# Files
-+#
-+include FILES_c_unix.gmk
-+include FILES_export_unix.gmk
-+AUTO_FILES_JAVA_DIRS = sun/awt/X11
-+AUTO_JAVA_PRUNE = WrapperGenerator.java
-+
-+LDFLAGS += -L$(OPENWIN_LIB)
-+
-+ifeq ($(PLATFORM), linux)
-+LDFLAGS += -lpthread
-+dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
-+endif
-+
-+# Since this library will be living in a subdirectory below the other libraries
-+# we need to add an extra runpath so that libraries in the upper directory
-+# are found at runtime.
-+LD_RUNPATH_EXTRAS = ..
-+
-+#
-+# Rules.
-+#
-+include $(BUILDDIR)/common/Mapfile-vers.gmk
-+include $(BUILDDIR)/common/Library.gmk
-+
-+#
-+# Add to the ambient vpath to pick up files in subdirectories
-+#
-+vpath %.c $(SHARE_SRC)/native/sunawt/alphacomposite
-+vpath %.c $(PLATFORM_SRC)/native/sun/xawt
-+vpath %.c $(PLATFORM_SRC)/native/sun/awt
-+vpath %.c $(SHARE_SRC)/native/sun/awt/debug
-+vpath %.c $(SHARE_SRC)/native/sun/awt/image
-+vpath %.c $(SHARE_SRC)/native/sun/awt/image/gif
-+vpath %.c $(SHARE_SRC)/native/sun/awt/image/cvutils
-+vpath %.c $(SHARE_SRC)/native/sun/awt/shell
-+vpath %.c $(SHARE_SRC)/native/sun/java2d
-+vpath %.c $(SHARE_SRC)/native/sun/java2d/loops
-+vpath %.c $(SHARE_SRC)/native/sun/java2d/pipe
-+vpath %.c $(SHARE_SRC)/native/sun/awt/medialib
-+vpath %.cpp $(SHARE_SRC)/native/sun/image
-+vpath %.c $(SHARE_SRC)/native/sun/font
-+vpath %.c $(PLATFORM_SRC)/native/sun/awt/robot_child
-+vpath %.c $(SHARE_SRC)/native/sun/java2d/opengl
-+vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl
-+vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11
-+
-+OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \
-+ $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi
-+
-+ifeq ($(PLATFORM), solaris)
-+CPPFLAGS += -DFUNCPROTO=15
-+dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
-+endif
-+
-+CPPFLAGS += -I$(CUPS_HEADERS_PATH)
-+
-+CPPFLAGS += -DXAWT -DXAWT_HACK \
-+ -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \
-+ -I$(PLATFORM_SRC)/native/sun/awt \
-+ -I$(PLATFORM_SRC)/native/sun/xawt \
-+ -I$(PLATFORM_SRC)/native/sun/jdga \
-+ -I$(SHARE_SRC)/native/sun/awt/debug \
-+ -I$(SHARE_SRC)/native/sun/awt/image/cvutils \
-+ -I$(SHARE_SRC)/native/sun/java2d \
-+ -I$(SHARE_SRC)/native/sun/java2d/loops \
-+ -I$(SHARE_SRC)/native/sun/awt/image/cvutils \
-+ -I$(SHARE_SRC)/native/sun/awt/image \
-+ -I$(SHARE_SRC)/native/sun/font \
-+ -I$(PLATFORM_SRC)/native/sun/java2d \
-+ -I$(SHARE_SRC)/native/sun/java2d/pipe \
-+ -I$(SHARE_SRC)/native/sun/java2d/opengl \
-+ -I$(PLATFORM_SRC)/native/sun/java2d/opengl \
-+ -I$(PLATFORM_SRC)/native/sun/java2d/x11 \
-+ -I$(SHARE_SRC)/native/sun/dc/path \
-+ -I$(SHARE_SRC)/native/sun/dc/doe \
-+ -I$(SHARE_SRC)/native/sun/awt/alphacomposite \
-+ -I$(SHARE_SRC)/native/sun/awt/medialib \
-+ -I$(PLATFORM_SRC)/native/sun/awt/medialib \
-+ -I$(PLATFORM_SRC)/native/sun/font \
-+ -I$(SHARE_SRC)/native/sun/awt \
-+ -I$(PLATFORM_SRC)/native/sun/awt
-+
-+ifeq ($(PLATFORM), linux)
-+# Allows for builds on Debian GNU Linux, X11 is in a different place
-+ CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
-+ -I/usr/include/X11/extensions \
-+ -I$(OPENWIN_HOME)/include
-+endif
-+
-+ifeq ($(PLATFORM), solaris)
-+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
-+endif
-+
-+ifeq ($(MILESTONE), internal)
-+ CPPFLAGS += -DINTERNAL_BUILD
-+endif
-+
-+#
-+# Generation of wrappers
-+#
-+SIZER_DIR=$(GEN_DIR)/generator
-+SIZER = $(SIZER_DIR)/sizer
-+SIZER_32_C = $(SIZER).32.c
-+SIZER_64_C = $(SIZER).64.c
-+CFLAGS_32=$(CFLAGS)
-+CFLAGS_64=$(CFLAGS)
-+
-+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.
-+# On sparcv9 CFLAGS already contain $(XARCH_OPTION/64), so to generate 32-bit sizer we need to change this option.
-+CFLAGS_32=$(subst $(XARCH_OPTION/64),$(XARCH_OPTION/32),$(CFLAGS))
-+SIZERS = $(SIZER).32 $(SIZER).64
-+SIZERS_C = $(SIZER_32_C) $(SIZER_64_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64
-+CFLAGS_64=$(CFLAGS) $(XARCH_OPTION/64)
-+else
-+ifneq (,$(findstring amd64, $(isalist)))
-+# On amd64 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL.
-+# On amd64 CFLAGS already contain $(XARCH_OPTION/64), so to generate 32-bit sizer we need to change this option.
-+CFLAGS_32=$(subst $(XARCH_OPTION/64),$(XARCH_OPTION/32),$(CFLAGS))
-+SIZERS = $(SIZER).32 $(SIZER).64
-+SIZERS_C = $(SIZER_32_C) $(SIZER_64_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64
-+CFLAGS_64=$(CFLAGS) $(XARCH_OPTION/64)
-+else # !sparcv9 : includes (32-bit) sparc, i586
-+SIZERS = $(SIZER).32
-+SIZERS_C = $(SIZER_32_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
-+endif # amd64
-+endif # sparcv9
-+
-+else # !solaris
-+
-+ifeq ($(ARCH_DATA_MODEL), 32)
-+SIZERS = $(SIZER).32
-+SIZERS_C = $(SIZER_32_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32
-+else # !32
-+SIZERS = $(SIZER).64
-+SIZERS_C = $(SIZER_64_C)
-+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
-+endif # 32
-+
-+endif # solaris
-+
-+# XXX Hack for 6185483 - use hard-coded sizes.
-+# Add the 64-bit platforms that need to be included into 32-bit build
-+# and have sizes.64-$(PLATFORM)-$(LIBARCH) hardcoded in the workspace
-+ifeq ($(PLATFORM)-$(LIBARCH), solaris-i386)
-+# If you define DOHACK=true for some combination of $(PLATFORM)-$(LIBARCH),
-+# make sure you have sizes.64-$(PLATFORM)-$(LIBARCH) pre-generated in
-+# $(PLATFORM_SRC)/classes/sun/awt/X11/generator/
-+DOHACK=true
-+endif # Hack
-+
-+ifeq ($(DOHACK), true)
-+PREDEFINED_SIZES_TMPL=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/sizes.64-$(PLATFORM)-$(LIBARCH)
-+PREDEFINED_SIZES=$(WRAPPER_GENERATOR_DIR)/sizes.64
-+SIZES += $(WRAPPER_GENERATOR_DIR)/sizes.64
-+endif
-+
-+ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
-+DOCOMPARE=true
-+endif
-+# 64 bit sizers are generated on platform-libarch (left) for use
-+# on platform-libarch (right) and stored under the latter name.
-+# Do compare manually stored and automatically generated pair(s)
-+# if DOCOMPARE=true, just after the generation.
-+STORED_SIZES_TMPL_solaris_amd64=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/sizes.64-solaris-i386
-+
-+WRAPPER_GENERATOR_JAVA=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/WrapperGenerator.java
-+WRAPPER_GENERATOR_DIR=$(GENSRCDIR)/sun/awt/X11/generator
-+WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator
-+WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class
-+XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
-+
-+$(SIZERS): $(SIZERS_C)
-+ $(prep-target)
-+ $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
-+
-+$(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
-+ $(prep-target)
-+ $(BOOT_JAVAC_CMD) -d $(WRAPPER_GENERATOR_TEMPDIR) $(WRAPPER_GENERATOR_JAVA)
-+
-+$(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
-+ $(prep-target)
-+ $(MKDIR) -p $(WRAPPER_GENERATOR_TEMPDIR)
-+ $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
-+ $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@)))
-+
-+$(SIZES): $(SIZERS)
-+ @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \
-+ $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \
-+ $(CP) $(PREDEFINED_SIZES_TMPL) $@; \
-+ $(CHMOD) +w $@;\
-+ else \
-+ $(ECHO) GENERATING $@; \
-+ $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \
-+ fi
-+ @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \
-+ $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
-+ $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \
-+ fi
-+
-+$(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES)
-+ $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \
-+ $(GEN_DIR) $(XLIBTYPES) "gen" $(WRAPPER_GENERATOR_DIR)/sizes
-+
-+touch.wrappers: $(TEMPDIR)/.gen.wrappers
-+ $(MKDIR) -p $(TEMPDIR)
-+ $(TOUCH) $(TEMPDIR)/.gen.wrappers
-+
-+generated.clean:
-+ $(RM) -r $(WRAPPER_GENERATOR_TEMPDIR)
-+ $(RM) -r $(WRAPPER_GENERATOR_DIR)
-+ $(RM) -r $(GEN_DIR)/*.java
-+ $(RM) -r $(TEMPDIR)/.gen_icons
-+
-+ifdef OPENJDK
-+ ICONS_PATH_PREFIX=$(PLATFORM_SRC)
-+else
-+ ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris
-+endif
-+
-+ICONS = \
-+ $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
-+ $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \
-+ $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \
-+ $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
-+
-+TEMPDIR_CLASSES = $(TEMPDIR)/classes
-+
-+$(TEMPDIR)/.gen_icons: $(ICONS)
-+ $(prep-target)
-+ for i in $(ICONS); do \
-+ filename=`basename $$i`; \
-+ name=`$(ECHO) $$filename | $(TR) '\-.' '__'`; \
-+ classname=$(GEN_DIR)/XAWTIcon32_$$name.java; \
-+ $(RM) $$classname; \
-+ $(ECHO) "package sun.awt.X11;" >> $$classname ; \
-+ $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \
-+ $(ECHO) "public static int[] $$name = { " >> $$classname; \
-+ $(ECHO) "0,0" >> $$classname ; \
-+ $(ECHO) "}; }" >> $$classname; \
-+ classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
-+ $(RM) $$classname; \
-+ $(ECHO) "package sun.awt.X11;" >> $$classname ; \
-+ $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \
-+ $(ECHO) "public static long[] $$name = { " >> $$classname; \
-+ $(ECHO) "0,0" >> $$classname ; \
-+ $(ECHO) "}; }" >> $$classname; \
-+ done
-+ $(TOUCH) $@
-+
-+clean clobber:: generated.clean
-+
-+.PHONY: generated.clean robot_child
-+
-diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-05-26 01:35:35.000000000 +0100
-@@ -647,9 +647,6 @@
- throws FileNotFoundException, IOException {
- BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
- PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName)));
-- out.println(commentStart +
-- " This file was generated AUTOMATICALLY from a template file " +
-- new java.util.Date() + commentEnd);
- int marklen = commandMarker.length();
- LOOP: while(true) {
- try {
-@@ -876,7 +873,6 @@
- // liu : Add a comment showing the source of this table
- result.append(commentStart + " The following tables and code generated using:" +
- commentEnd + "\n ");
-- result.append(commentStart + ' ' + commandLineDescription + commentEnd + "\n ");
-
- if (plane == 0 && bLatin1 == false) {
- genCaseMapTableDeclaration(result);
-diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2008-05-26 01:35:42.000000000 +0100
-@@ -76,7 +76,7 @@
- * {@code 0x1.fffffffffffffP+1023} and also equal to
- * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
- */
-- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308
-+ public static final double MAX_VALUE = 1.7976931348623157e+308;
-
- /**
- * A constant holding the smallest positive normal value of type
-@@ -86,7 +86,7 @@
- *
- * @since 1.6
- */
-- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308
-+ public static final double MIN_NORMAL = 2.2250738585072014E-308;
-
- /**
- * A constant holding the smallest positive nonzero value of type
-@@ -95,7 +95,7 @@
- * {@code 0x0.0000000000001P-1022} and also equal to
- * {@code Double.longBitsToDouble(0x1L)}.
- */
-- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324
-+ public static final double MIN_VALUE = 4.9e-324;
-
- /**
- * Maximum exponent a finite {@code double} variable may have.
-diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java
---- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2008-05-26 01:35:42.000000000 +0100
-@@ -76,7 +76,7 @@
- * {@code 0x1.fffffeP+127f} and also equal to
- * {@code Float.intBitsToFloat(0x7f7fffff)}.
- */
-- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f
-+ public static final float MAX_VALUE = 3.4028235e+38f;
-
- /**
- * A constant holding the smallest positive normal value of type
-@@ -86,7 +86,7 @@
- *
- * @since 1.6
- */
-- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
-+ public static final float MIN_NORMAL = 1.17549435E-38f;
-
- /**
- * A constant holding the smallest positive nonzero value of type
-@@ -94,7 +94,7 @@
- * hexadecimal floating-point literal {@code 0x0.000002P-126f}
- * and also equal to {@code Float.intBitsToFloat(0x1)}.
- */
-- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
-+ public static final float MIN_VALUE = 1.4e-45f;
-
- /**
- * Maximum exponent a finite {@code double} variable may have.
---- openjdk.old/langtools/make/Makefile 2008-01-16 10:23:52.000000000 -0500
-+++ openjdk-ecj/langtools/make/Makefile 2008-01-16 10:42:51.000000000 -0500
-@@ -113,7 +113,7 @@
-
- ifdef ALT_BOOTDIR
- ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
-- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-+ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
- endif
-
- ifdef ALT_OUTPUTDIR
-diff -Nru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
---- openjdk-ecj.orig/langtools/make/build.properties 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.properties 2008-05-26 01:35:35.000000000 +0100
-@@ -66,7 +66,7 @@
- # set the following to -version to verify the versions of javac being used
- javac.version.opt =
- # in time, there should be no exceptions to -Xlint:all
--javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror
-+javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial
-
- # options for the <javadoc> task for javac
- javadoc.jls3.url=http://java.sun.com/docs/books/jls/
-diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
---- openjdk-ecj.orig/langtools/make/build.xml 2008-05-26 01:29:37.000000000 +0100
-+++ openjdk-ecj/langtools/make/build.xml 2008-05-26 01:35:42.000000000 +0100
-@@ -497,7 +497,10 @@
- includes="@{includes}"
- sourcepath=""
- includeAntRuntime="no"
-- target="@{javac.target}">
-+ target="@{javac.target}"
-+ executable="${javac.executable}"
-+ source="1.5">
-+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
- <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
- <compilerarg line="${javac.version.opt}"/>
- <compilerarg line="-Xlint"/>
-@@ -511,7 +514,10 @@
- includeAntRuntime="no"
- target="@{javac.target}"
- debug="${javac.debug}"
-- debuglevel="${javac.debuglevel}">
-+ executable="${javac.executable}"
-+ debuglevel="${javac.debuglevel}"
-+ source="1.5">
-+ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
- <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
- <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
- <compilerarg line="${javac.no.jdk.warnings}"/>
-@@ -562,8 +568,11 @@
- <target name="-def-pcompile">
- <mkdir dir="${build.toolclasses.dir}"/>
- <javac srcdir="${make.tools.dir}/CompileProperties"
-+ fork="true"
- destdir="${build.toolclasses.dir}/"
-- classpath="${ant.home}/lib/ant.jar"/>
-+ classpath="${ant.home}/lib/ant.jar"
-+ executable="${javac.executable}"
-+ source="1.5"/>
- <taskdef name="pcompile"
- classname="CompilePropertiesTask"
- classpath="${build.toolclasses.dir}/"/>
-diff -Nru openjdk-ecj.orig/make/jdk-rules.gmk openjdk-ecj/make/jdk-rules.gmk
---- openjdk-ecj.orig/make/jdk-rules.gmk 2008-05-26 01:43:34.000000000 +0100
-+++ openjdk-ecj/make/jdk-rules.gmk 2008-05-26 01:35:42.000000000 +0100
-@@ -63,7 +63,7 @@
- endif
-
- ifndef DEV_ONLY
-- JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) images
-+ JDK_BUILD_TARGETS = sanity all images
- else
- JDK_BUILD_TARGETS = sanity all $(IMAGES_TARGET)
- endif
-
- ifdef ALT_OUTPUTDIR
---- openjdk6/hotspot/build/linux/makefiles/sa.make 2008-02-12 04:14:13.000000000 -0500
-+++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make 2008-02-15 09:23:58.000000000 -0500
-@@ -72,7 +72,7 @@
- $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
- mkdir -p $(SA_CLASSDIR); \
- fi
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
- $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
- $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
---- openoldjdk/jdk/make/sun/xawt/Makefile 2008-02-12 04:04:04.000000000 -0500
-+++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2008-02-15 09:48:16.000000000 -0500
-@@ -278,11 +278,7 @@
-
- TEMPDIR_CLASSES = $(TEMPDIR)/classes
-
--$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java
-- @$(prep-target)
-- $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
--
--$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS)
-+$(TEMPDIR)/.gen_icons: $(ICONS)
- $(prep-target)
- for i in $(ICONS); do \
- filename=`basename $$i`; \
-@@ -292,22 +288,14 @@
- $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \
- $(ECHO) "public static int[] $$name = { " >> $$classname; \
-- $(CAT) $$i | \
-- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \
-- -Dawt.toolkit=sun.awt.motif.MToolkit \
-- -Djava.awt.headless=true \
-- sun.awt.X11.ToBin >> $$classname; \
-+ $(ECHO) "0,0" >> $$classname ; \
- $(ECHO) "}; }" >> $$classname; \
-- classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
-+ classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
- $(RM) $$classname; \
- $(ECHO) "package sun.awt.X11;" >> $$classname ; \
- $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \
- $(ECHO) "public static long[] $$name = { " >> $$classname; \
-- $(CAT) $$i | \
-- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \
-- -Dawt.toolkit=sun.awt.motif.MToolkit \
-- -Djava.awt.headless=true \
-- sun.awt.X11.ToBin >> $$classname; \
-+ $(ECHO) "0,0" >> $$classname ; \
- $(ECHO) "}; }" >> $$classname; \
- done
- $(TOUCH) $@
---- oldopenjdk/corba/make/common/shared/Defs-java.gmk 2008-02-12 04:15:10.000000000 -0500
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-02-15 11:01:50.000000000 -0500
-@@ -117,31 +117,13 @@
- JAVACFLAGS += $(OTHER_JAVACFLAGS)
-
- # Needed for javah
--JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
-+JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
-
--# Langtools
--ifdef LANGTOOLS_DIST
-- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
-- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
-- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
-- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
-- JAVAC_CMD = $(BOOT_JAVA_CMD) \
-- "-Xbootclasspath/p:$(JAVAC_JAR)" \
-- -jar $(JAVAC_JAR) $(JAVACFLAGS)
-- JAVAH_CMD = $(BOOT_JAVA_CMD) \
-- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
-- -jar $(JAVAH_JAR) $(JAVAHFLAGS)
-- JAVADOC_CMD = $(BOOT_JAVA_CMD) \
-- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
-- -jar $(JAVADOC_JAR)
--else
-- # If no explicit tools, use boot tools (add VM flags in this case)
-- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
-+# If no explicit tools, use boot tools (add VM flags in this case)
-+JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
- $(JAVACFLAGS)
-- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
-+JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
- $(JAVAHFLAGS)
-- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
--endif
-
- # Override of what javac to use (see deploy workspace)
- ifdef JAVAC
---- oldopenjdk/corba/make/common/Defs-linux.gmk 2008-02-15 11:02:45.000000000 -0500
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2008-02-15 11:05:09.000000000 -0500
-@@ -261,7 +261,7 @@
- fi; \
- done)
- JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
--JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
-+JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB)
-
- #
- # We want to privatize JVM symbols on Solaris. This is so the user can
---- openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile 2008-06-09 03:12:48.000000000 +0100
-+++ /dev/null 2008-05-17 00:35:13.224001676 +0100
+diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile
+--- openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,222 +0,0 @@
-#
-# Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
@@ -1800,3 +278,774 @@ diff -Nru openjdk-ecj.orig/make/jdk-rule
-# Include
-#
-include $(BUILDDIR)/common/Rules.gmk
+diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk
+--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs.gmk 2008-06-22 19:05:57.000000000 +0100
+@@ -53,6 +53,13 @@
+
+ _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
+
++
++ifdef ALT_LANGTOOLS_DIST
++ LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST))
++else
++ LANGTOOLS_DIST =
++endif
++
+ #
+ # Get platform definitions
+ #
+@@ -129,8 +136,6 @@
+ # for build tool jar files
+ BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars
+ ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
+-# for generated java source files
+-GENSRCDIR = $(OUTPUTDIR)/gensrc
+ # for generated C source files (not javah)
+ GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc
+ # for imported source files
+@@ -231,7 +236,7 @@
+ # We define an intermediate variable for Java files because
+ # we use its value later to help define $SOURCEPATH
+
+-VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
++VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
+ VPATH.java = $(VPATH0.java)
+ vpath %.java $(VPATH.java)
+ vpath %.class $(CLASSBINDIR)
+diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2008-06-22 19:05:57.000000000 +0100
+@@ -262,7 +262,7 @@
+ fi; \
+ done)
+ JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
+-JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
++JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB)
+
+ #
+ # We want to privatize JVM symbols on Solaris. This is so the user can
+diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk
+--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/make/common/Rules.gmk 2008-06-22 19:05:57.000000000 +0100
+@@ -197,8 +197,10 @@
+ $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
+ $(CAT) $(JAVA_SOURCE_LIST); \
+ $(ECHO) "# Running javac:"; \
+- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
++ $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
++ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
++ $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
++ -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+ fi
+ @$(java-vm-cleanup)
+
+diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2008-06-22 19:05:57.000000000 +0100
+@@ -117,31 +117,13 @@
+ JAVACFLAGS += $(OTHER_JAVACFLAGS)
+
+ # Needed for javah
+-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
+
+-# Langtools
+-ifdef LANGTOOLS_DIST
+- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
+- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
+- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
+- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
+- JAVAC_CMD = $(BOOT_JAVA_CMD) \
+- "-Xbootclasspath/p:$(JAVAC_JAR)" \
+- -jar $(JAVAC_JAR) $(JAVACFLAGS)
+- JAVAH_CMD = $(BOOT_JAVA_CMD) \
+- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
+- -jar $(JAVAH_JAR) $(JAVAHFLAGS)
+- JAVADOC_CMD = $(BOOT_JAVA_CMD) \
+- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
+- -jar $(JAVADOC_JAR)
+-else
+- # If no explicit tools, use boot tools (add VM flags in this case)
+- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
++# If no explicit tools, use boot tools (add VM flags in this case)
++JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
+ $(JAVACFLAGS)
+- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
++JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
+ $(JAVAHFLAGS)
+- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
+-endif
+
+ # Override of what javac to use (see deploy workspace)
+ ifdef JAVAC
+diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
+--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -93,8 +93,6 @@
+ POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
+
+ $(POAGENERATEDFILES):: $(POA.IDL)
+- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL)
+- $(RM) -r $(POAHELHOLFILES)
+
+ poa.compile: $(POAGENERATEDFILES)
+
+@@ -110,10 +108,6 @@
+
+ # Generating and deleting unused files to reduce images size
+ $(DYNANYFILES): $(DYNAMIC_ANY.IDL)
+- $(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL)
+- $(RM) $(DYNANY_DIR)/*POA*
+- $(RM) $(DYNANY_DIR)/*Holder*
+- $(RM) $(DYNANYDELETEFILES)
+
+ dynany.compile: $(DYNANYFILES)
+
+@@ -125,12 +119,6 @@
+ TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions"
+
+ $(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL)
+- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL)
+- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL)
+-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
+-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
+-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
+-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL)
+
+ tr.compile: $(TRGENERATEDFILES)
+
+@@ -144,7 +132,6 @@
+ # _NamingContextImplBase.java and _BindingIteratorImplBase.java files
+ # to GENSRC directory. Note that these two classes are deprecated.
+ $(NSGENERATEDFILES): $(NAMESERVICE.IDL)
+- $(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL)
+
+ ns.compile: $(NSGENERATEDFILES)
+
+@@ -156,8 +143,6 @@
+ IOPDELETEFILES = $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%)
+
+ $(IOPGENERATEDFILES):: $(IOP.IDL)
+- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL)
+- $(RM) -r $(IOPDELETEFILES)
+
+ iop.compile: $(IOPGENERATEDFILES)
+
+@@ -169,8 +154,6 @@
+ CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%)
+
+ $(CORBAXGENERATEDFILES):: $(CORBAX.IDL)
+- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL)
+- $(RM) $(CORBAXDUPLICATEFILES)
+
+ corbax.compile: $(CORBAXGENERATEDFILES)
+
+@@ -181,7 +164,6 @@
+ MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%)
+
+ $(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL)
+- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL)
+
+ messaging.compile: $(MESSAGINGGENERATEDFILES)
+
+@@ -195,8 +177,6 @@
+ PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
+
+ $(PIGENERATEDFILES):: $(INTERCEPTORS.IDL)
+- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -pkgPrefix PortableInterceptor org.omg -pkgPrefix Dynamic org.omg -pkgPrefix IOP org.omg -corba 3.0 -D CORBA3 $(INTERCEPTORS.IDL)
+- $(RM) $(PIHELHOLFILES)
+
+ pi.compile: $(PIGENERATEDFILES)
+
+diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile
+--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -172,7 +172,6 @@
+ ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
+
+ $(ACTIVATIONFILES): $(ACTIVATION.IDL)
+- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
+
+ activation.idl.compile: $(ACTIVATIONFILES)
+
+@@ -195,7 +194,6 @@
+
+ # REVISIT: remove -oldImplBase
+ $(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
+- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
+
+ portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
+
+diff -Nru openjdk-ecj.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm
+--- openjdk-ecj.orig/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm 2008-05-27 22:28:05.000000000 +0100
++++ openjdk-ecj/corba/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm 2008-06-22 19:05:57.000000000 +0100
+@@ -332,7 +332,6 @@
+ (.printMsg pw "// Log wrapper class for Sun private system exceptions in group @" (list group)))
+ (.println pw "//")
+ (.printMsg pw "// Generated by mc.scm version @, DO NOT EDIT BY HAND!" (list version-string))
+- (.printMsg pw "// Generated from input file @ on @" (list infile (java.util.Date.)))
+ (.println pw)))
+
+ (define (write-factory-method class-name exception-group-name pw)
+diff -Nru openjdk-ecj.orig/hotspot/build/linux/Makefile openjdk-ecj/hotspot/build/linux/Makefile
+--- openjdk-ecj.orig/hotspot/build/linux/Makefile 2008-05-27 22:28:29.000000000 +0100
++++ openjdk-ecj/hotspot/build/linux/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -249,28 +249,24 @@
+
+ $(TARGETS_C2): $(SUBDIRS_C2)
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_TIERED): $(SUBDIRS_TIERED)
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_C1): $(SUBDIRS_C1)
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_CORE): $(SUBDIRS_CORE)
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+diff -Nru openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make openjdk-ecj/hotspot/build/linux/makefiles/sa.make
+--- openjdk-ecj.orig/hotspot/build/linux/makefiles/sa.make 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/hotspot/build/linux/makefiles/sa.make 2008-06-22 19:05:57.000000000 +0100
+@@ -72,7 +72,7 @@
+ $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
+ mkdir -p $(SA_CLASSDIR); \
+ fi
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -g -d $(SA_CLASSDIR) $(AGENT_ALLFILES)
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+ $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
+diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
+--- openjdk-ecj.orig/jaxp/make/build.xml 2008-05-27 22:28:40.000000000 +0100
++++ openjdk-ecj/jaxp/make/build.xml 2008-06-22 19:05:57.000000000 +0100
+@@ -71,7 +71,10 @@
+ <mkdir dir="${build.toolclasses.dir}"/>
+ <javac srcdir="${make.tools.dir}/StripProperties"
+ destdir="${build.toolclasses.dir}/"
+- classpath="${ant.home}/lib/ant.jar"/>
++ classpath="${ant.home}/lib/ant.jar"
++ fork="true"
++ executable="${javac.executable}"
++ source="1.5"/>
+ <taskdef name="pstrip"
+ classname="StripPropertiesTask"
+ classpath="${build.toolclasses.dir}/"/>
+@@ -85,7 +88,9 @@
+ destdir="${build.classes.dir}"
+ memoryInitialSize="${javac.memoryInitialSize}"
+ memoryMaximumSize="${javac.memoryMaximumSize}"
+- target="${javac.target}">
++ target="${javac.target}"
++ executable="${javac.executable}"
++ source="1.5">
+ <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
+ <compilerarg line="${javac.version.opt}"/>
+ </javac>
+diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile
+--- openjdk-ecj.orig/jaxp/make/Makefile 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jaxp/make/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -80,7 +80,7 @@
+ endif
+
+ ifdef ALT_BOOTDIR
+- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
++ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
+ endif
+
+ ifdef ALT_OUTPUTDIR
+diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties
+--- openjdk-ecj.orig/jaxws/make/build.properties 2008-05-27 22:28:50.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.properties 2008-06-22 19:05:57.000000000 +0100
+@@ -37,7 +37,7 @@
+ # set the following to -version to verify the versions of javac being used
+ javac.version.opt =
+ # in time, there should be no exceptions to -Xlint:all
+-javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror
++javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial
+
+ # JVM memory size
+ javac.memoryInitialSize = 128m
+diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml
+--- openjdk-ecj.orig/jaxws/make/build.xml 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.xml 2008-06-22 19:05:57.000000000 +0100
+@@ -84,7 +84,10 @@
+ <mkdir dir="${build.toolclasses.dir}"/>
+ <javac srcdir="${make.tools.dir}/StripProperties"
+ destdir="${build.toolclasses.dir}/"
+- classpath="${ant.home}/lib/ant.jar"/>
++ fork="true"
++ executable="${javac.executable}"
++ classpath="${ant.home}/lib/ant.jar"
++ source="1.5"/>
+ <taskdef name="pstrip"
+ classname="StripPropertiesTask"
+ classpath="${build.toolclasses.dir}/"/>
+@@ -96,12 +99,14 @@
+ <javac fork="true"
+ srcdir="${src.classes.dir}"
+ destdir="${build.classes.dir}"
++ executable="${javac.executable}"
+ memoryInitialSize="${javac.memoryInitialSize}"
+ memoryMaximumSize="${javac.memoryMaximumSize}"
+ target="${javac.target}"
+- excludes="com/sun/tools/internal/txw2/**">
+- <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${plugs}/jre/lib/tools.jar:${plugs}/jre/lib/rt-closed.jar"/>
+- <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
++ excludes="com/sun/tools/internal/txw2/**"
++ source="1.5">
++ <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
++ <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
+ <compilerarg line="${javac.version.opt}"/>
+ <compilerarg line="${javac.no.jdk.warnings}"/>
+ </javac>
+diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile
+--- openjdk-ecj.orig/jaxws/make/Makefile 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jaxws/make/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -80,8 +80,8 @@
+ endif
+
+ ifdef ALT_BOOTDIR
+- ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
+- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
++ ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
++ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
+ endif
+
+ ifdef ALT_OUTPUTDIR
+diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk
+--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2008-05-27 22:30:13.000000000 +0100
++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2008-06-22 19:05:57.000000000 +0100
+@@ -43,7 +43,8 @@
+ @$(prep-target)
+ @$(MKDIR) -p $(BUILDTOOLCLASSDIR)
+ $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
+- -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
++ -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \
++ $(BUILDTOOL_MAIN_SOURCE_FILE)
+ $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
+ -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
+ $(JAR_JFLAGS) || $(RM) $@
+diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk
+--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Release.gmk 2008-06-22 19:05:57.000000000 +0100
+@@ -649,10 +649,11 @@
+ $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
+ $(prep-target)
+ $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
+-$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
++$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
+ $(prep-target)
++ (cd $(CLASSBINDIR) && \
+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+- @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
++ $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
+ @$(java-vm-cleanup)
+
+ # Create jsse.jar containing SunJSSE implementation classes
+@@ -708,10 +709,11 @@
+ $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
+ $(prep-target)
+ $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
+-$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
++$(RT_JAR): $(RT_JAR_FILELIST) $(JAR_MANIFEST_FILE)
+ $(prep-target)
++ (cd $(CLASSBINDIR) && \
+ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+- @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
++ $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
+ @$(java-vm-cleanup)
+
+ # Meta-index construction to make core class loaders lazier
+@@ -949,19 +951,6 @@
+ @$(java-vm-cleanup)
+ $(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar
+ @#
+- @# lib/ct.sym
+- @#
+- $(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym
+- $(JAVAC_CMD) -XDprocess.packages -proc:only \
+- -processor com.sun.tools.javac.sym.CreateSymbols \
+- -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \
+- -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
+- $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS)
+- $(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \
+- -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS)
+- @$(java-vm-cleanup)
+- $(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym
+- @#
+ @# CORBA supported orb.idl and ir.idl should be copied to lib
+ @#
+ $(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl
+@@ -1038,16 +1027,6 @@
+ $(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher
+ $(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
+ $(RM) -r $(JDK_IMAGE_DIR)/src
+- @#
+- @# demo, include
+- @#
+- $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
+- $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
+- $(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR)
+- @#
+- @# Swing BeanInfo generation
+- @#
+- $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
+ ifneq ($(PLATFORM), windows)
+ $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
+ endif # !windows
+diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk
+--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/common/Rules.gmk 2008-06-22 19:07:43.000000000 +0100
+@@ -237,8 +237,9 @@
+ $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
+ $(CAT) $<.filtered; \
+ $(ECHO) "# Running javac:"; \
+- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
+- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
++ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \
++ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
++ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
+ fi
+ @$(java-vm-cleanup)
+
+@@ -304,6 +305,8 @@
+ $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \
+ $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner))
+ @$(java-vm-cleanup)
++ -mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \
++ $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h
+ @$(TOUCH) $@
+
+ classheaders.clean:
+diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2008-06-22 19:05:57.000000000 +0100
+@@ -118,30 +118,19 @@
+ JAVACFLAGS += $(OTHER_JAVACFLAGS)
+
+ # Needed for javah
+-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR)
++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)
+
+ # Langtools
+ ifdef LANGTOOLS_DIST
+- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
+- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar
+ JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
+ DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
+- JAVAC_CMD = $(BOOT_JAVA_CMD) \
+- "-Xbootclasspath/p:$(JAVAC_JAR)" \
+- -jar $(JAVAC_JAR) $(JAVACFLAGS)
+- JAVAH_CMD = $(BOOT_JAVA_CMD) \
+- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \
+- -jar $(JAVAH_JAR) $(JAVAHFLAGS)
+ JAVADOC_CMD = $(BOOT_JAVA_CMD) \
+ "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
+ -jar $(JAVADOC_JAR)
+-else
+- # If no explicit tools, use boot tools (add VM flags in this case)
+ JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
+ $(JAVACFLAGS)
+ JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \
+ $(JAVAHFLAGS)
+- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
+ endif
+
+ # Override of what javac to use (see deploy workspace)
+diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile
+--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/jdk/make/java/nio/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -31,7 +31,7 @@
+ PACKAGE = java.nio
+ LIBRARY = nio
+ PRODUCT = java
+-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror
++OTHER_JAVACFLAGS += -Xlint:serial -Werror
+ include $(BUILDDIR)/common/Defs.gmk
+
+ NIO_SRC = $(SHARE_SRC)/classes/java/nio
+diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile
+--- openjdk-ecj.orig/jdk/make/java/text/Makefile 2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/java/text/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -80,8 +80,8 @@
+ -sourcepath $(TEXT_SRCDIR) \
+ $(TEXT_SOURCES)
+ $(MKDIR) -p $(TEXT_CLASSDIR)
+- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
+- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
++ $(BOOT_JAVA_CMD) -cp $(TEXT_CLASSES):$(GENERATEBREAKITERATORDATA_JARFILE):$(ICEDTEA_CLS_DIR) \
++ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
+ -o $(TEXT_CLASSDIR) \
+ -spec $(UNICODEDATA)/UnicodeData.txt
+ @$(java-vm-cleanup)
+diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile
+--- openjdk-ecj.orig/jdk/make/Makefile 2008-05-27 22:30:13.000000000 +0100
++++ openjdk-ecj/jdk/make/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -239,7 +239,7 @@
+
+ all build:: sanity-all post-sanity-all
+
+-SUBDIRS = tools java javax org sun sunw com jpda mkdemo mksample launchers
++SUBDIRS = tools java javax org sun sunw com jpda mksample launchers
+ all build::
+ $(SUBDIRS-loop)
+
+diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile
+--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -400,10 +400,9 @@
+ COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
+
+ $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \
+- $(COMPILEFONTCONFIG_JARFILE)
+- $(prep-target)
+- $(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@
+- $(CHMOD) 444 $(@)
++ $(COMPILEFONTCONFIG_JARFILE)
++ $(CP) -f $(GENSRCDIR)/fontconfig/* $(LIBDIR)
++ $(CHMOD) 444 $(LIBDIR)/*.bfc
+ @$(java-vm-cleanup)
+
+ fontconfigs.clean :
+diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile
+--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -62,7 +62,8 @@
+ $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
+ $(RM) -r $(@D)
+ $(prep-target)
+- $(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
++ $(BOOT_JAVA_CMD) -cp $(ICEDTEA_CLS_DIR):$(BUILDTOOLJARDIR)/javazic.jar \
++ build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES)
+ @$(java-vm-cleanup)
+
+ $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
+diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile
+--- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/text/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -85,8 +85,9 @@
+ $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
+ -sourcepath $(TEXT_SRCDIR) \
+ $(BIRULES) $(BIINFO)
+- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
+- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
++ $(BOOT_JAVA_CMD) \
++ -cp $(TEXT_CLASSES):$(ICEDTEA_CLS_DIR):$(GENERATEBREAKITERATORDATA_JARFILE) \
++ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \
+ -o $(CLASSDESTDIR)/sun/text/resources \
+ -spec $(UNICODEDATA)/UnicodeData.txt \
+ -language th
+diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile
+--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -276,11 +276,7 @@
+
+ TEMPDIR_CLASSES = $(TEMPDIR)/classes
+
+-$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java
+- @$(prep-target)
+- $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
+-
+-$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS)
++$(TEMPDIR)/.gen_icons: $(ICONS)
+ $(prep-target)
+ for i in $(ICONS); do \
+ filename=`basename $$i`; \
+@@ -290,20 +286,14 @@
+ $(ECHO) "package sun.awt.X11;" >> $$classname ; \
+ $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \
+ $(ECHO) "public static int[] $$name = { " >> $$classname; \
+- $(CAT) $$i | \
+- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \
+- -Djava.awt.headless=true \
+- sun.awt.X11.ToBin >> $$classname; \
++ $(ECHO) "0,0" >> $$classname ; \
+ $(ECHO) "}; }" >> $$classname; \
+ classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
+ $(RM) $$classname; \
+ $(ECHO) "package sun.awt.X11;" >> $$classname ; \
+ $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \
+ $(ECHO) "public static long[] $$name = { " >> $$classname; \
+- $(CAT) $$i | \
+- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \
+- -Djava.awt.headless=true \
+- sun.awt.X11.ToBin >> $$classname; \
++ $(ECHO) "0,0" >> $$classname ; \
+ $(ECHO) "}; }" >> $$classname; \
+ done
+ $(TOUCH) $@
+diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-05-27 22:30:14.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2008-06-22 19:05:57.000000000 +0100
+@@ -647,9 +647,6 @@
+ throws FileNotFoundException, IOException {
+ BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
+ PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName)));
+- out.println(commentStart +
+- " This file was generated AUTOMATICALLY from a template file " +
+- new java.util.Date() + commentEnd);
+ int marklen = commandMarker.length();
+ LOOP: while(true) {
+ try {
+@@ -876,7 +873,6 @@
+ // liu : Add a comment showing the source of this table
+ result.append(commentStart + " The following tables and code generated using:" +
+ commentEnd + "\n ");
+- result.append(commentStart + ' ' + commandLineDescription + commentEnd + "\n ");
+
+ if (plane == 0 && bLatin1 == false) {
+ genCaseMapTableDeclaration(result);
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2008-05-27 22:30:18.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2008-06-22 19:05:57.000000000 +0100
+@@ -76,7 +76,7 @@
+ * {@code 0x1.fffffffffffffP+1023} and also equal to
+ * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
+ */
+- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308
++ public static final double MAX_VALUE = 1.7976931348623157e+308;
+
+ /**
+ * A constant holding the smallest positive normal value of type
+@@ -86,7 +86,7 @@
+ *
+ * @since 1.6
+ */
+- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308
++ public static final double MIN_NORMAL = 2.2250738585072014E-308;
+
+ /**
+ * A constant holding the smallest positive nonzero value of type
+@@ -95,7 +95,7 @@
+ * {@code 0x0.0000000000001P-1022} and also equal to
+ * {@code Double.longBitsToDouble(0x1L)}.
+ */
+- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324
++ public static final double MIN_VALUE = 4.9e-324;
+
+ /**
+ * Maximum exponent a finite {@code double} variable may have.
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java
+--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2008-05-27 22:30:18.000000000 +0100
++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2008-06-22 19:05:57.000000000 +0100
+@@ -76,7 +76,7 @@
+ * {@code 0x1.fffffeP+127f} and also equal to
+ * {@code Float.intBitsToFloat(0x7f7fffff)}.
+ */
+- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f
++ public static final float MAX_VALUE = 3.4028235e+38f;
+
+ /**
+ * A constant holding the smallest positive normal value of type
+@@ -86,7 +86,7 @@
+ *
+ * @since 1.6
+ */
+- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f
++ public static final float MIN_NORMAL = 1.17549435E-38f;
+
+ /**
+ * A constant holding the smallest positive nonzero value of type
+@@ -94,7 +94,7 @@
+ * hexadecimal floating-point literal {@code 0x0.000002P-126f}
+ * and also equal to {@code Float.intBitsToFloat(0x1)}.
+ */
+- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f
++ public static final float MIN_VALUE = 1.4e-45f;
+
+ /**
+ * Maximum exponent a finite {@code float} variable may have. It
+diff -Nru openjdk-ecj.orig/langtools/make/build.properties openjdk-ecj/langtools/make/build.properties
+--- openjdk-ecj.orig/langtools/make/build.properties 2008-05-27 22:30:39.000000000 +0100
++++ openjdk-ecj/langtools/make/build.properties 2008-06-22 19:05:57.000000000 +0100
+@@ -66,7 +66,7 @@
+ # set the following to -version to verify the versions of javac being used
+ javac.version.opt =
+ # in time, there should be no exceptions to -Xlint:all
+-javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror
++javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial
+
+ # options for the <javadoc> task for javac
+ javadoc.jls3.url=http://java.sun.com/docs/books/jls/
+diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml
+--- openjdk-ecj.orig/langtools/make/build.xml 2008-05-27 22:30:39.000000000 +0100
++++ openjdk-ecj/langtools/make/build.xml 2008-06-22 19:05:57.000000000 +0100
+@@ -497,7 +497,10 @@
+ includes="@{includes}"
+ sourcepath=""
+ includeAntRuntime="no"
+- target="@{javac.target}">
++ target="@{javac.target}"
++ executable="${javac.executable}"
++ source="1.5">
++ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
+ <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
+ <compilerarg line="${javac.version.opt}"/>
+ <compilerarg line="-Xlint"/>
+@@ -511,7 +514,10 @@
+ includeAntRuntime="no"
+ target="@{javac.target}"
+ debug="${javac.debug}"
+- debuglevel="${javac.debuglevel}">
++ executable="${javac.executable}"
++ debuglevel="${javac.debuglevel}"
++ source="1.5">
++ <compilerarg line="-bootclasspath @{classes.dir}:../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar"/>
+ <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
+ <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
+ <compilerarg line="${javac.no.jdk.warnings}"/>
+@@ -562,8 +568,11 @@
+ <target name="-def-pcompile">
+ <mkdir dir="${build.toolclasses.dir}"/>
+ <javac srcdir="${make.tools.dir}/CompileProperties"
++ fork="true"
+ destdir="${build.toolclasses.dir}/"
+- classpath="${ant.home}/lib/ant.jar"/>
++ classpath="${ant.home}/lib/ant.jar"
++ executable="${javac.executable}"
++ source="1.5"/>
+ <taskdef name="pcompile"
+ classname="CompilePropertiesTask"
+ classpath="${build.toolclasses.dir}/"/>
+diff -Nru openjdk-ecj.orig/langtools/make/Makefile openjdk-ecj/langtools/make/Makefile
+--- openjdk-ecj.orig/langtools/make/Makefile 2008-06-22 18:36:24.000000000 +0100
++++ openjdk-ecj/langtools/make/Makefile 2008-06-22 19:05:57.000000000 +0100
+@@ -113,7 +113,7 @@
+
+ ifdef ALT_BOOTDIR
+ ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
+- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
++ ANT_OPTIONS += -Djavac.executable=$(ALT_BOOTDIR)/bin/javac
+ endif
+
+ ifdef ALT_OUTPUTDIR
+diff -Nru openjdk-ecj.orig/make/jdk-rules.gmk openjdk-ecj/make/jdk-rules.gmk
+--- openjdk-ecj.orig/make/jdk-rules.gmk 2008-05-27 22:27:57.000000000 +0100
++++ openjdk-ecj/make/jdk-rules.gmk 2008-06-22 19:05:57.000000000 +0100
+@@ -63,7 +63,7 @@
+ endif
+
+ ifndef DEV_ONLY
+- JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) images
++ JDK_BUILD_TARGETS = sanity all images
+ else
+ JDK_BUILD_TARGETS = sanity all $(IMAGES_TARGET)
+ endif
diff -r 6a9207d80a39 patches/icedtea-sparc64-linux.patch
--- a/patches/icedtea-sparc64-linux.patch Sun Jun 22 01:28:42 2008 +0100
+++ b/patches/icedtea-sparc64-linux.patch Sun Jun 22 20:27:09 2008 +0100
@@ -1,6 +1,35 @@ diff -up openjdk/hotspot/build/linux/mak
-diff -up openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD openjdk/hotspot/build/linux/makefiles/sparcv9.make
---- openjdk/hotspot/build/linux/makefiles/sparcv9.make.BAD 2008-05-29 15:48:44.000000000 -0400
-+++ openjdk/hotspot/build/linux/makefiles/sparcv9.make 2008-05-29 15:48:39.000000000 -0400
+diff -Nru openjdk.orig/hotspot/build/linux/makefiles/defs.make openjdk/hotspot/build/linux/makefiles/defs.make
+--- openjdk.orig/hotspot/build/linux/makefiles/defs.make 2008-06-22 03:12:48.000000000 +0100
++++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-06-22 03:27:20.000000000 +0100
+@@ -58,8 +58,8 @@
+ HS_ARCH = ia64
+ endif
+
+-# sparc
+-ifneq (,$(filter $(ARCH), sparc sparc64))
++# sparc64
++ifeq ($(ARCH), sparc64)
+ ifeq ($(ARCH_DATA_MODEL), 64)
+ ARCH_DATA_MODEL = 64
+ MAKE_ARGS += LP64=1
+@@ -73,6 +73,14 @@
+ HS_ARCH = sparc
+ endif
+
++# sparc
++ifeq ($(ARCH), sparc)
++ ARCH_DATA_MODEL = 32
++ PLATFORM = linux-sparc
++ VM_PLATFORM = linux_sparc
++ HS_ARCH = sparc
++endif
++
+ # x86_64
+ ifeq ($(ARCH), x86_64)
+ ifeq ($(ARCH_DATA_MODEL), 64)
+diff -Nru openjdk.orig/hotspot/build/linux/makefiles/sparcv9.make openjdk/hotspot/build/linux/makefiles/sparcv9.make
+--- openjdk.orig/hotspot/build/linux/makefiles/sparcv9.make 1970-01-01 01:00:00.000000000 +0100
++++ openjdk/hotspot/build/linux/makefiles/sparcv9.make 2008-06-22 03:27:20.000000000 +0100
@@ -0,0 +1,27 @@
+#
+# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -29,24 +58,15 @@ diff -up openjdk/hotspot/build/linux/mak
+# TLS helper, assembled from .s file
+# Not included in includeDB because it has no dependencies
+Obj_Files += linux_sparc.o
-diff -up openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
---- openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.BAD 2008-05-29 16:25:10.000000000 -0400
-+++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp 2008-05-29 16:32:11.000000000 -0400
-@@ -225,7 +225,7 @@ LIR_Address* LIRGenerator::emit_array_ad
-
- void LIRGenerator::increment_counter(address counter, int step) {
- LIR_Opr pointer = new_register(T_INT);
-- __ move(LIR_OprFact::intConst((int)counter), pointer);
-+ __ move(LIR_OprFact::intConst((int)*counter), pointer);
- LIR_Address* addr = new LIR_Address(pointer, 0, T_INT);
- increment_counter(addr, step);
- }
-@@ -1106,20 +1106,12 @@ void LIRGenerator::trace_block_entry(Blo
+diff -Nru openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
+--- openjdk.orig/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp 2008-05-27 22:28:29.000000000 +0100
++++ openjdk/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp 2008-06-22 03:31:17.000000000 +0100
+@@ -1112,20 +1112,12 @@
void LIRGenerator::volatile_field_store(LIR_Opr value, LIR_Address* address,
CodeEmitInfo* info) {
-#ifdef _LP64
-- __ store_mem_reg(value, address, info);
+- __ store(value, address, info);
-#else
__ volatile_store_mem_reg(value, address, info);
-#endif
@@ -55,39 +75,10 @@ diff -up openjdk/hotspot/src/cpu/sparc/v
void LIRGenerator::volatile_field_load(LIR_Address* address, LIR_Opr result,
CodeEmitInfo* info) {
-#ifdef _LP64
-- __ load_mem_reg(address, result, info);
+- __ load(address, result, info);
-#else
__ volatile_load_mem_reg(address, result, info);
-#endif
}
-diff -up openjdk/hotspot/build/linux/makefiles/defs.make.BAD openjdk/hotspot/build/linux/makefiles/defs.make
---- openjdk/hotspot/build/linux/makefiles/defs.make.BAD 2008-05-30 07:03:37.000000000 -0400
-+++ openjdk/hotspot/build/linux/makefiles/defs.make 2008-05-30 07:03:45.000000000 -0400
-@@ -58,8 +58,8 @@ ifeq ($(ARCH), ia64)
- HS_ARCH = ia64
- endif
-
--# sparc
--ifneq (,$(filter $(ARCH), sparc sparc64))
-+# sparc64
-+ifeq ($(ARCH), sparc64)
- ifeq ($(ARCH_DATA_MODEL), 64)
- ARCH_DATA_MODEL = 64
- MAKE_ARGS += LP64=1
-@@ -73,6 +73,14 @@ ifneq (,$(filter $(ARCH), sparc sparc64)
- HS_ARCH = sparc
- endif
-
-+# sparc
-+ifeq ($(ARCH), sparc)
-+ ARCH_DATA_MODEL = 32
-+ PLATFORM = linux-sparc
-+ VM_PLATFORM = linux_sparc
-+ HS_ARCH = sparc
-+endif
-+
- # x86_64
- ifeq ($(ARCH), x86_64)
- ifeq ($(ARCH_DATA_MODEL), 64)
More information about the distro-pkg-dev
mailing list