/hg/icedtea: Bump to b75 with upstream Zero and make Shark build.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Sun Nov 1 11:09:54 PST 2009
changeset d3256a5c9afe in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d3256a5c9afe
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Nov 01 19:13:55 2009 +0000
Bump to b75 with upstream Zero and make Shark build.
2009-11-01 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-float-double-trailing-zeros.patch:
Dropped, in b75.
* Makefile.am: Bump to b75.
* patches/boot/icedtea-hotspot-default.patch,
* patches/boot/icedtea.patch: Regenerated.
* patches/hotspot/default/icedtea-shark-build.patch: Use
VARIANTARCH not BUILDARCH. Use platform_zero directly and
pass VARIANTARCH through to subbuild. Add rule for
SHARK_DIR.
* patches/icedtea-shark-build.patch: Put ICEDTEA_SHARK_BUILD
prior to ZERO_BUILD test.
* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp: Rename
encoding to constant_encoding inline with upstream.
* ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Use
should_be_constant instead of has_encoding inline with upstream.
diffstat:
9 files changed, 239 insertions(+), 227 deletions(-)
ChangeLog | 19 +
Makefile.am | 35 +--
patches/boot/icedtea-hotspot-default.patch | 20 -
patches/boot/icedtea.patch | 188 +++++++++---------
patches/hotspot/default/icedtea-shark-build.patch | 152 ++++++++------
patches/icedtea-float-double-trailing-zeros.patch | 29 --
patches/icedtea-shark-build.patch | 19 +
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 2
ports/hotspot/src/share/vm/shark/sharkConstant.cpp | 2
diffs (truncated from 888 to 500 lines):
diff -r 7100c9f14ffa -r d3256a5c9afe ChangeLog
--- a/ChangeLog Thu Oct 29 15:00:12 2009 +0000
+++ b/ChangeLog Sun Nov 01 19:13:55 2009 +0000
@@ -1,3 +1,22 @@ 2009-10-28 Andrew John Hughes <ahughes
+2009-11-01 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-float-double-trailing-zeros.patch:
+ Dropped, in b75.
+ * Makefile.am: Bump to b75.
+ * patches/boot/icedtea-hotspot-default.patch,
+ * patches/boot/icedtea.patch:
+ Regenerated.
+ * patches/hotspot/default/icedtea-shark-build.patch:
+ Use VARIANTARCH not BUILDARCH. Use platform_zero
+ directly and pass VARIANTARCH through to subbuild.
+ Add rule for SHARK_DIR.
+ * patches/icedtea-shark-build.patch:
+ Put ICEDTEA_SHARK_BUILD prior to ZERO_BUILD test.
+ * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp:
+ Rename encoding to constant_encoding inline with upstream.
+ * ports/hotspot/src/share/vm/shark/sharkConstant.cpp:
+ Use should_be_constant instead of has_encoding inline with upstream.
+
2009-10-28 Andrew John Hughes <ahughes at redhat.com>
Fix build failures with Shark.
diff -r 7100c9f14ffa -r d3256a5c9afe Makefile.am
--- a/Makefile.am Thu Oct 29 15:00:12 2009 +0000
+++ b/Makefile.am Sun Nov 01 19:13:55 2009 +0000
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b74
-
-CORBA_CHANGESET = ddc6504bb4f3
-HOTSPOT_CHANGESET = 4aad6284518e
-JAXP_CHANGESET = 1da2b57e4825
-JAXWS_CHANGESET = b176d7a1d9e9
-JDK_CHANGESET = 6d6f38ba8a03
-LANGTOOLS_CHANGESET = 27f109855e7f
-OPENJDK_CHANGESET = f8e6c40ffac8
-
-CORBA_MD5SUM = 1e931327890c8951d98e27bdfb54021b
-HOTSPOT_MD5SUM = 99e631c28819d643cbf1dcca0d3f4a99
-JAXP_MD5SUM = f1bef1d655513d450e0a57db6bf2e87c
-JAXWS_MD5SUM = 4524646c2cb4e21f80bd17408485588e
-JDK_MD5SUM = 62599b14fbf2352c5cc1cb23ccbef683
-LANGTOOLS_MD5SUM = c04a42138a860df67a396de51fcf11b6
-OPENJDK_MD5SUM = bad6c4ca26dfc18aa719dc9636a5c353
+OPENJDK_VERSION = b75
+
+CORBA_CHANGESET = d4f1f79e9231
+HOTSPOT_CHANGESET = 0c593310a62c
+JAXP_CHANGESET = 1ff97e23727b
+JAXWS_CHANGESET = 7a525c434bc9
+JDK_CHANGESET = 70b5a4c7b35d
+LANGTOOLS_CHANGESET = 4b3ebc896806
+OPENJDK_CHANGESET = aeb73b347f3a
+
+CORBA_MD5SUM = cbdf4c993b0617ccddcb01a649e2eb05
+HOTSPOT_MD5SUM = 4508ff8d599b5ae3b094eaa3f8dfd494
+JAXP_MD5SUM = 2055c0ab13fea8c2597d7f3367905faa
+JAXWS_MD5SUM = 50ba89fa406b179e2ac20dd11cf37c5d
+JDK_MD5SUM = e98d4f2f0a74cc96ff7fa7838166d2dd
+LANGTOOLS_MD5SUM = 672ed2024d4d8787eefbbdebd1266c07
+OPENJDK_MD5SUM = fd027dba070b73a164a32a30f8807470
CACAO_VERSION = 0.99.4
CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -268,7 +268,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-gcc-suffix.patch \
patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \
patches/icedtea-bytebuffer-compact.patch \
- patches/icedtea-float-double-trailing-zeros.patch \
patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
diff -r 7100c9f14ffa -r d3256a5c9afe patches/boot/icedtea-hotspot-default.patch
--- a/patches/boot/icedtea-hotspot-default.patch Thu Oct 29 15:00:12 2009 +0000
+++ b/patches/boot/icedtea-hotspot-default.patch Sun Nov 01 19:13:55 2009 +0000
@@ -1,7 +1,7 @@ diff -Nru openjdk-boot.orig/hotspot/make
-diff -Nru openjdk-boot.orig/hotspot/make/linux/Makefile openjdk-boot/hotspot/make/linux/Makefile
---- openjdk-boot.orig/hotspot/make/linux/Makefile 2009-09-28 13:20:29.000000000 +0100
-+++ openjdk-boot/hotspot/make/linux/Makefile 2009-09-28 16:06:27.000000000 +0100
-@@ -280,35 +280,30 @@
+diff -Nru ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile openjdk-boot/hotspot/make/linux/Makefile
+--- ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile 2009-10-30 17:37:07.000000000 +0000
++++ openjdk-boot/hotspot/make/linux/Makefile 2009-10-30 17:45:40.000000000 +0000
+@@ -287,35 +287,30 @@
$(TARGETS_C2): $(SUBDIRS_C2)
cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
@@ -32,14 +32,14 @@ diff -Nru openjdk-boot.orig/hotspot/make
endif
$(TARGETS_ZERO): $(SUBDIRS_ZERO)
- cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
endif
-diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
---- openjdk-boot.orig/hotspot/make/linux/makefiles/sa.make 2009-09-22 20:05:24.000000000 +0100
-+++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2009-09-28 16:06:18.000000000 +0100
+diff -Nru ../openjdk.orig/openjdk-boot/hotspot/make/linux/makefiles/sa.make openjdk-boot/hotspot/make/linux/makefiles/sa.make
+--- ../openjdk.orig/openjdk-boot/hotspot/make/linux/makefiles/sa.make 2009-10-30 15:58:31.000000000 +0000
++++ openjdk-boot/hotspot/make/linux/makefiles/sa.make 2009-10-30 17:44:58.000000000 +0000
@@ -38,7 +38,9 @@
GENERATED = $(TOPDIR)/../generated
diff -r 7100c9f14ffa -r d3256a5c9afe patches/boot/icedtea.patch
--- a/patches/boot/icedtea.patch Thu Oct 29 15:00:12 2009 +0000
+++ b/patches/boot/icedtea.patch Sun Nov 01 19:13:55 2009 +0000
@@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/make/c
-diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile openjdk-boot/corba/make/com/sun/corba/se/Makefile
---- openjdk-boot.orig/corba/make/com/sun/corba/se/Makefile 2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-boot/corba/make/com/sun/corba/se/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/Makefile openjdk-boot/corba/make/com/sun/corba/se/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/Makefile 2009-03-30 17:13:01.000000000 +0100
++++ openjdk-boot/corba/make/com/sun/corba/se/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -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
@@ -10,9 +10,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
all build clean clobber::
$(SUBDIRS-loop)
-diff -Nru openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-boot/corba/make/com/sun/corba/se/org/Makefile
---- openjdk-boot.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/org/Makefile openjdk-boot/corba/make/com/sun/corba/se/org/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ openjdk-boot/corba/make/com/sun/corba/se/org/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -52,9 +52,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
+# Include
+#
+include $(BUILDDIR)/common/Classes.gmk
-diff -Nru openjdk-boot.orig/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
---- openjdk-boot.orig/corba/make/common/Defs.gmk 2009-10-03 00:02:43.000000000 +0100
-+++ openjdk-boot/corba/make/common/Defs.gmk 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/Defs.gmk openjdk-boot/corba/make/common/Defs.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/Defs.gmk 2009-10-03 00:02:43.000000000 +0100
++++ openjdk-boot/corba/make/common/Defs.gmk 2009-10-30 16:59:16.000000000 +0000
@@ -53,6 +53,13 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -87,9 +87,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
VPATH.java = $(VPATH0.java)
vpath %.java $(VPATH.java)
vpath %.class $(CLASSBINDIR)
-diff -Nru openjdk-boot.orig/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk
---- openjdk-boot.orig/corba/make/common/Defs-linux.gmk 2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/corba/make/common/Defs-linux.gmk 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/Defs-linux.gmk openjdk-boot/corba/make/common/Defs-linux.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/Defs-linux.gmk 2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/corba/make/common/Defs-linux.gmk 2009-10-30 16:59:16.000000000 +0000
@@ -276,7 +276,7 @@
fi; \
done)
@@ -99,9 +99,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
#
# We want to privatize JVM symbols on Solaris. This is so the user can
-diff -Nru openjdk-boot.orig/corba/make/common/Rules.gmk openjdk-boot/corba/make/common/Rules.gmk
---- openjdk-boot.orig/corba/make/common/Rules.gmk 2009-10-03 00:02:43.000000000 +0100
-+++ openjdk-boot/corba/make/common/Rules.gmk 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/Rules.gmk openjdk-boot/corba/make/common/Rules.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/Rules.gmk 2009-10-03 00:02:43.000000000 +0100
++++ openjdk-boot/corba/make/common/Rules.gmk 2009-10-30 16:59:16.000000000 +0000
@@ -187,7 +187,10 @@
@$(MKDIR) -p $(CLASSDESTDIR)
if [ -s $(JAVA_SOURCE_LIST) ] ; then \
@@ -114,9 +114,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
fi
@$(java-vm-cleanup)
-diff -Nru openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/corba/make/common/shared/Defs-java.gmk 2009-09-04 02:41:12.000000000 +0100
-+++ openjdk-boot/corba/make/common/shared/Defs-java.gmk 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/common/shared/Defs-java.gmk openjdk-boot/corba/make/common/shared/Defs-java.gmk
+--- ../openjdk.orig/openjdk-boot/corba/make/common/shared/Defs-java.gmk 2009-09-04 02:41:12.000000000 +0100
++++ openjdk-boot/corba/make/common/shared/Defs-java.gmk 2009-10-30 16:59:16.000000000 +0000
@@ -135,31 +135,14 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -155,9 +155,9 @@ diff -Nru openjdk-boot.orig/corba/make/c
# Override of what javac to use (see deploy workspace)
ifdef JAVAC
-diff -Nru openjdk-boot.orig/corba/make/org/omg/sources/Makefile openjdk-boot/corba/make/org/omg/sources/Makefile
---- openjdk-boot.orig/corba/make/org/omg/sources/Makefile 2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-boot/corba/make/org/omg/sources/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/org/omg/sources/Makefile openjdk-boot/corba/make/org/omg/sources/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/org/omg/sources/Makefile 2009-03-30 17:13:01.000000000 +0100
++++ openjdk-boot/corba/make/org/omg/sources/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -93,8 +93,6 @@
POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
@@ -234,9 +234,9 @@ diff -Nru openjdk-boot.orig/corba/make/o
pi.compile: $(PIGENERATEDFILES)
-diff -Nru openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile
---- openjdk-boot.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile
+--- ../openjdk.orig/openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile 2009-03-30 23:07:09.000000000 +0100
++++ openjdk-boot/corba/make/sun/rmi/corbalogsources/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -172,7 +172,6 @@
ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
@@ -253,9 +253,9 @@ diff -Nru openjdk-boot.orig/corba/make/s
portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
-diff -Nru openjdk-boot.orig/jaxp/build.xml openjdk-boot/jaxp/build.xml
---- openjdk-boot.orig/jaxp/build.xml 2009-10-03 00:22:23.000000000 +0100
-+++ openjdk-boot/jaxp/build.xml 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxp/build.xml openjdk-boot/jaxp/build.xml
+--- ../openjdk.orig/openjdk-boot/jaxp/build.xml 2009-10-03 00:22:23.000000000 +0100
++++ openjdk-boot/jaxp/build.xml 2009-10-30 16:59:16.000000000 +0000
@@ -112,7 +112,8 @@
memoryMaximumSize="${javac.memoryMaximumSize}"
source="${javac.source}"
@@ -266,9 +266,9 @@ diff -Nru openjdk-boot.orig/jaxp/build.x
<compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
<compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
<src refid="src.dir.id"/>
-diff -Nru openjdk-boot.orig/jaxp/make/Makefile openjdk-boot/jaxp/make/Makefile
---- openjdk-boot.orig/jaxp/make/Makefile 2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/jaxp/make/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxp/make/Makefile openjdk-boot/jaxp/make/Makefile
+--- ../openjdk.orig/openjdk-boot/jaxp/make/Makefile 2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/jaxp/make/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -110,6 +110,7 @@
ifdef ALT_LANGTOOLS_DIST
ifdef ALT_BOOTDIR
@@ -277,9 +277,9 @@ diff -Nru openjdk-boot.orig/jaxp/make/Ma
endif
ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
else
-diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml
---- openjdk-boot.orig/jaxws/build.xml 2009-10-03 00:57:53.000000000 +0100
-+++ openjdk-boot/jaxws/build.xml 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxws/build.xml openjdk-boot/jaxws/build.xml
+--- ../openjdk.orig/openjdk-boot/jaxws/build.xml 2009-10-03 00:57:53.000000000 +0100
++++ openjdk-boot/jaxws/build.xml 2009-10-30 16:59:16.000000000 +0000
@@ -112,7 +112,8 @@
memoryMaximumSize="${javac.memoryMaximumSize}"
source="${javac.source}"
@@ -290,9 +290,9 @@ diff -Nru openjdk-boot.orig/jaxws/build.
<compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
<compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
<src refid="src.dir.id"/>
-diff -Nru openjdk-boot.orig/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
---- openjdk-boot.orig/jaxws/make/Makefile 2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/jaxws/make/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile
+--- ../openjdk.orig/openjdk-boot/jaxws/make/Makefile 2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/jaxws/make/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -111,6 +111,7 @@
ifdef ALT_BOOTDIR
ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
@@ -301,9 +301,9 @@ diff -Nru openjdk-boot.orig/jaxws/make/M
endif
ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
else
-diff -Nru openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk openjdk-boot/jdk/make/common/BuildToolJar.gmk
---- openjdk-boot.orig/jdk/make/common/BuildToolJar.gmk 2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/common/BuildToolJar.gmk 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/BuildToolJar.gmk openjdk-boot/jdk/make/common/BuildToolJar.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/BuildToolJar.gmk 2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/common/BuildToolJar.gmk 2009-10-30 16:59:16.000000000 +0000
@@ -43,7 +43,8 @@
@$(prep-target)
@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
@@ -314,9 +314,9 @@ diff -Nru openjdk-boot.orig/jdk/make/com
$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
-C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
$(BOOT_JAR_JFLAGS) || $(RM) $@
-diff -Nru openjdk-boot.orig/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
---- openjdk-boot.orig/jdk/make/common/Release.gmk 2009-10-23 15:59:17.000000000 +0100
-+++ openjdk-boot/jdk/make/common/Release.gmk 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/Release.gmk openjdk-boot/jdk/make/common/Release.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/Release.gmk 2009-10-30 16:49:37.000000000 +0000
++++ openjdk-boot/jdk/make/common/Release.gmk 2009-10-30 16:59:16.000000000 +0000
@@ -650,10 +650,21 @@
RESOURCES_JAR=$(ABS_TEMPDIR)/resources-orig.jar
$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
@@ -377,9 +377,9 @@ diff -Nru openjdk-boot.orig/jdk/make/com
ifneq ($(PLATFORM), windows)
$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
endif # !windows
-diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
---- openjdk-boot.orig/jdk/make/common/Rules.gmk 2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/common/Rules.gmk 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/Rules.gmk 2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/common/Rules.gmk 2009-10-30 16:59:16.000000000 +0000
@@ -237,8 +237,9 @@
$(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
$(CAT) $<.filtered; \
@@ -405,9 +405,9 @@ diff -Nru openjdk-boot.orig/jdk/make/com
@$(java-vm-cleanup)
@$(TOUCH) $@
-diff -Nru openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk
---- openjdk-boot.orig/jdk/make/common/shared/Defs-java.gmk 2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/common/shared/Defs-java.gmk openjdk-boot/jdk/make/common/shared/Defs-java.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2009-10-30 16:49:36.000000000 +0000
++++ openjdk-boot/jdk/make/common/shared/Defs-java.gmk 2009-10-30 16:59:16.000000000 +0000
@@ -136,33 +136,22 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -442,10 +442,10 @@ diff -Nru openjdk-boot.orig/jdk/make/com
- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
endif
- #always use the bootstrap javah until bug-ID 6889255 is fixed. These
-diff -Nru openjdk-boot.orig/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/java/nio/Makefile
---- openjdk-boot.orig/jdk/make/java/nio/Makefile 2009-10-23 15:59:17.000000000 +0100
-+++ openjdk-boot/jdk/make/java/nio/Makefile 2009-10-26 13:38:03.000000000 +0000
+ # Override of what javac to use (see deploy workspace)
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/java/nio/Makefile openjdk-boot/jdk/make/java/nio/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/java/nio/Makefile 2009-10-30 16:49:37.000000000 +0000
++++ openjdk-boot/jdk/make/java/nio/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -31,7 +31,7 @@
PACKAGE = java.nio
LIBRARY = nio
@@ -455,9 +455,9 @@ diff -Nru openjdk-boot.orig/jdk/make/jav
include $(BUILDDIR)/common/Defs.gmk
NIO_SRC = $(SHARE_SRC)/classes/java/nio
-diff -Nru openjdk-boot.orig/jdk/make/java/text/Makefile openjdk-boot/jdk/make/java/text/Makefile
---- openjdk-boot.orig/jdk/make/java/text/Makefile 2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-boot/jdk/make/java/text/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/java/text/Makefile openjdk-boot/jdk/make/java/text/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/java/text/Makefile 2009-05-08 16:10:43.000000000 +0100
++++ openjdk-boot/jdk/make/java/text/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -81,8 +81,8 @@
-sourcepath $(TEXT_SRCDIR) \
$(TEXT_SOURCES)
@@ -469,9 +469,9 @@ diff -Nru openjdk-boot.orig/jdk/make/jav
-o $(TEXT_CLASSDIR) \
-spec $(UNICODEDATA)/UnicodeData.txt
@$(java-vm-cleanup)
-diff -Nru openjdk-boot.orig/jdk/make/Makefile openjdk-boot/jdk/make/Makefile
---- openjdk-boot.orig/jdk/make/Makefile 2009-05-08 16:10:43.000000000 +0100
-+++ openjdk-boot/jdk/make/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/Makefile openjdk-boot/jdk/make/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/Makefile 2009-05-08 16:10:43.000000000 +0100
++++ openjdk-boot/jdk/make/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -239,7 +239,7 @@
all build:: sanity-all post-sanity-all
@@ -481,18 +481,18 @@ diff -Nru openjdk-boot.orig/jdk/make/Mak
all build::
$(SUBDIRS-loop)
-diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk
---- openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk 2009-05-08 16:10:44.000000000 +0100
++++ openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk 2009-10-30 16:59:16.000000000 +0000
@@ -189,3 +189,5 @@
java/awt/dnd/DnDConstants.java \
sun/awt/CausedFocusEvent.java
+EXPORTED_inner = \
+ sun.java2d.opengl.OGLContext$$OGLContextCaps
-diff -Nru openjdk-boot.orig/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile
---- openjdk-boot.orig/jdk/make/sun/awt/Makefile 2009-05-08 16:10:44.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/awt/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/Makefile openjdk-boot/jdk/make/sun/awt/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/awt/Makefile 2009-05-08 16:10:44.000000000 +0100
++++ openjdk-boot/jdk/make/sun/awt/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -401,10 +401,9 @@
COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar
@@ -507,9 +507,9 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
@$(java-vm-cleanup)
fontconfigs.clean :
-diff -Nru openjdk-boot.orig/jdk/make/sun/javazic/Makefile openjdk-boot/jdk/make/sun/javazic/Makefile
---- openjdk-boot.orig/jdk/make/sun/javazic/Makefile 2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/javazic/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/javazic/Makefile openjdk-boot/jdk/make/sun/javazic/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/javazic/Makefile 2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/sun/javazic/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -62,7 +62,8 @@
$(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES)
$(RM) -r $(@D)
@@ -520,9 +520,9 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
@$(java-vm-cleanup)
$(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE)
-diff -Nru openjdk-boot.orig/jdk/make/sun/text/Makefile openjdk-boot/jdk/make/sun/text/Makefile
---- openjdk-boot.orig/jdk/make/sun/text/Makefile 2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/text/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/text/Makefile openjdk-boot/jdk/make/sun/text/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/text/Makefile 2009-03-30 17:23:03.000000000 +0100
++++ openjdk-boot/jdk/make/sun/text/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -85,8 +85,9 @@
$(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
-sourcepath $(TEXT_SRCDIR) \
@@ -535,9 +535,9 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
-o $(CLASSDESTDIR)/sun/text/resources \
-spec $(UNICODEDATA)/UnicodeData.txt \
-language th
-diff -Nru openjdk-boot.orig/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile
---- openjdk-boot.orig/jdk/make/sun/xawt/Makefile 2009-10-23 15:59:17.000000000 +0100
-+++ openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile openjdk-boot/jdk/make/sun/xawt/Makefile
+--- ../openjdk.orig/openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-30 16:49:39.000000000 +0000
++++ openjdk-boot/jdk/make/sun/xawt/Makefile 2009-10-30 16:59:16.000000000 +0000
@@ -294,11 +294,7 @@
TEMPDIR_CLASSES = $(TEMPDIR)/classes
@@ -574,9 +574,9 @@ diff -Nru openjdk-boot.orig/jdk/make/sun
$(ECHO) "}; }" >> $$classname; \
done
$(TOUCH) $@
-diff -Nru openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
---- openjdk-boot.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-10-23 15:58:41.000000000 +0100
-+++ openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java
+--- ../openjdk.orig/openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-10-30 16:49:08.000000000 +0000
++++ openjdk-boot/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2009-10-30 16:59:16.000000000 +0000
@@ -647,9 +647,6 @@
throws FileNotFoundException, IOException {
BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName));
@@ -595,9 +595,9 @@ diff -Nru openjdk-boot.orig/jdk/make/too
if (plane == 0 && bLatin1 == false) {
genCaseMapTableDeclaration(result);
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java openjdk-boot/jdk/src/share/classes/java/lang/Double.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Double.java 2009-10-23 15:58:32.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Double.java openjdk-boot/jdk/src/share/classes/java/lang/Double.java
+--- ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Double.java 2009-10-30 16:49:00.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Double.java 2009-10-30 16:59:16.000000000 +0000
@@ -76,7 +76,7 @@
* {@code 0x1.fffffffffffffP+1023} and also equal to
* {@code Double.longBitsToDouble(0x7fefffffffffffffL)}.
@@ -625,9 +625,9 @@ diff -Nru openjdk-boot.orig/jdk/src/shar
/**
* Maximum exponent a finite {@code double} variable may have.
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java openjdk-boot/jdk/src/share/classes/java/lang/Float.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Float.java 2009-10-23 15:58:32.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Float.java openjdk-boot/jdk/src/share/classes/java/lang/Float.java
+--- ../openjdk.orig/openjdk-boot/jdk/src/share/classes/java/lang/Float.java 2009-10-30 16:49:00.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Float.java 2009-10-30 16:59:16.000000000 +0000
@@ -76,7 +76,7 @@
* {@code 0x1.fffffeP+127f} and also equal to
* {@code Float.intBitsToFloat(0x7f7fffff)}.
@@ -655,9 +655,9 @@ diff -Nru openjdk-boot.orig/jdk/src/shar
/**
* Maximum exponent a finite {@code float} variable may have. It
-diff -Nru openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
---- openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-03-30 17:23:07.000000000 +0100
-+++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h
+--- ../openjdk.orig/openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-03-30 17:23:07.000000000 +0100
++++ openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-10-30 16:59:16.000000000 +0000
@@ -27,6 +27,7 @@
#define OGLContext_h_Included
@@ -722,9 +722,9 @@ diff -Nru openjdk-boot.orig/jdk/src/shar
/**
* Evaluates to true if the given capability bitmask is present for the
-diff -Nru openjdk-boot.orig/langtools/make/build.xml openjdk-boot/langtools/make/build.xml
---- openjdk-boot.orig/langtools/make/build.xml 2009-10-21 16:40:37.000000000 +0100
-+++ openjdk-boot/langtools/make/build.xml 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/langtools/make/build.xml openjdk-boot/langtools/make/build.xml
+--- ../openjdk.orig/openjdk-boot/langtools/make/build.xml 2009-10-21 16:40:37.000000000 +0100
++++ openjdk-boot/langtools/make/build.xml 2009-10-30 16:59:16.000000000 +0000
@@ -524,6 +524,7 @@
includeAntRuntime="no"
source="@{javac.source}"
@@ -741,9 +741,9 @@ diff -Nru openjdk-boot.orig/langtools/ma
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
<compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
-diff -Nru openjdk-boot.orig/langtools/make/Makefile openjdk-boot/langtools/make/Makefile
---- openjdk-boot.orig/langtools/make/Makefile 2009-10-23 15:59:16.000000000 +0100
-+++ openjdk-boot/langtools/make/Makefile 2009-10-26 13:38:03.000000000 +0000
+diff -Nru ../openjdk.orig/openjdk-boot/langtools/make/Makefile openjdk-boot/langtools/make/Makefile
+--- ../openjdk.orig/openjdk-boot/langtools/make/Makefile 2009-10-30 16:49:36.000000000 +0000
More information about the distro-pkg-dev
mailing list