/hg/icedtea: Bump to build 106.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Sep 6 15:52:24 PDT 2010
changeset a58071a38743 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a58071a38743
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Sep 06 23:52:04 2010 +0100
Bump to build 106.
2010-09-06 Andrew John Hughes <ahughes at redhat.com>
Bump to b106.
* ergo.c.in,
* jvm.cfg.in: Removed.
* patches/boot/icedtea-hotspot-default.patch: Split into
test_gamma.patch and tools.jar.patch.
* patches/hotspot/default/icedtea-shark-build.patch,
* patches/hotspot/default/icedtea-shark.patch: Dropped, Shark
now upstream.
* patches/icedtea-doc-headers.patch: Dropped, documentation
licensing has changed completely due to Sun->Oracle changes.
* patches/icedtea-shark-build.patch: Dropped.
* patches/xrender/icedtea-001.patch,
* patches/xrender/icedtea-002.patch,
* patches/xrender/icedtea-003.patch,
* patches/xrender/icedtea-004.patch,
* patches/xrender/icedtea-005.patch,
* patches/xrender/icedtea-006.patch,
* patches/xrender/icedtea-007.patch,
* patches/xrender/icedtea-008.patch,
* patches/xrender/icedtea-009.patch: Dropped, XRender
extension now upstream.
* ports/hotspot/make/linux/makefiles/shark.make,
* ports/hotspot/make/linux/platform_zero.in,
* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
* ports/hotspot/src/share/vm/includeDB_shark,
* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
* ports/hotspot/src/share/vm/shark/llvmValue.hpp,
* ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
* ports/hotspot/src/share/vm/shark/sharkBlock.hpp,
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp,
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp,
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp,
* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp,
* ports/hotspot/src/share/vm/shark/sharkConstant.cpp,
* ports/hotspot/src/share/vm/shark/sharkConstant.hpp,
* ports/hotspot/src/share/vm/shark/sharkContext.cpp,
* ports/hotspot/src/share/vm/shark/sharkContext.hpp,
* ports/hotspot/src/share/vm/shark/sharkEntry.hpp,
* ports/hotspot/src/share/vm/shark/sharkFunction.cpp,
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp,
* ports/hotspot/src/share/vm/shark/sharkInliner.cpp,
* ports/hotspot/src/share/vm/shark/sharkInliner.hpp,
* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
* ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
* ports/hotspot/src/share/vm/shark/sharkInvariants.cpp,
* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp,
* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp,
* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp,
* ports/hotspot/src/share/vm/shark/sharkStack.cpp,
* ports/hotspot/src/share/vm/shark/sharkStack.hpp,
* ports/hotspot/src/share/vm/shark/sharkState.cpp,
* ports/hotspot/src/share/vm/shark/sharkState.hpp,
* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
* ports/hotspot/src/share/vm/shark/sharkType.hpp,
* ports/hotspot/src/share/vm/shark/sharkValue.cpp,
* ports/hotspot/src/share/vm/shark/sharkValue.hpp,
* ports/hotspot/src/share/vm/shark/shark_globals.cpp,
* ports/hotspot/src/share/vm/shark/shark_globals.hpp: Dropped,
Shark now upstream.
* Makefile.am: Bump to b106 changesets and new JAXWS and JAXP
drops. (JAF_DROP_URL): Added to make JAF independent of
JAXWS. (ICEDTEA_BOOTSTRAP_CLASSES): Add additional classes
needed to bootstrap; java.nio.file.SimpleFileVisitor and
javax.management.modelmbean.ModelMBeanInfo.
(ICEDTEA_PATCHES): Drop upstream patches. (XRENDER_PATCHES):
Removed. (ICEDTEA_BOOT_PATCHES): Add new bootstrap patches.
(ICEDTEA_SHARK_BUILD): Set to 'true' not 'yes' for upstream
Shark. (ICEDTEA_ENV): Pass SHARK_BUILD not
ICEDTEA_SHARK_BUILD for upstream Shark. (download-
jaf-drop): Use JAF_DROP_URL instead of JAXWS_DROP_URL.
(ports): Removed. (clean-ports): Likewise.
(generated): Depend on extract, not ports. (clean-extract-
openjdk): Don't call clean-ports. (bootstrap-directory-
stage1): Create lib/modules directory. (hotspot-ports):
Removed.
* acinclude.m4: Don't generate jvm.cfg and ergo.c.
* configure.ac: Drop --enable-xrender option.
* generated/java/lang/UNIXProcess.java: Updated, including
ProcessBuilder workaround.
* patches/boot/break-processbuilder-dependency.patch: Prevent
UNIXProcess having a dependency on package-private classes
in java.lang.ProcessBuilder which only exist in Oracle's
implementation.
* patches/boot/ecj-diamond.patch: Add new cases of <> usage.
* patches/boot/icedtea-jaxp-dependency.patch: Regenerated.
* patches/boot/revert-6973616.patch: Revert 1.6 requirement
introduced by 6973616.
* patches/boot/symbols.patch: Regenerated.
* patches/boot/test_gamma.patch: Split from icedtea-hotspot-
default.patch.
* patches/boot/tools.jar.patch: Likewise, and regenerated due
to addition of module directory test.
* patches/hotspot/default/icedtea-gcc-suffix.patch,
* patches/icedtea-alpha-fixes.patch,
* patches/icedtea-clean-crypto.patch,
* patches/icedtea-demos.patch,
* patches/icedtea-freetypeversion.patch,
* patches/icedtea-javafiles.patch,
* patches/icedtea-linker-libs-order.patch,
* patches/icedtea-print-lsb-release.patch,
* patches/icedtea-rhino.patch,
* patches/icedtea-sunsrc.patch,
* patches/icedtea-systemtap.patch,
* patches/icedtea-testenv.patch:
* patches/sh4-support.patch: Regenerated.
* patches/systemtap-alloc-size-workaround.patch: Patch not
added by previous commit.
diffstat:
89 files changed, 917 insertions(+), 25821 deletions(-)
ChangeLog | 126
Makefile.am | 113
acinclude.m4 | 2
configure.ac | 8
ergo.c.in | 58
generated/java/lang/UNIXProcess.java | 363 -
jvm.cfg.in | 44
patches/boot/break-processbuilder-dependency.patch | 136
patches/boot/ecj-diamond.patch | 83
patches/boot/icedtea-hotspot-default.patch | 51
patches/boot/icedtea-jaxp-dependency.patch | 12
patches/boot/revert-6973616.patch | 12
patches/boot/symbols.patch | 10
patches/boot/test_gamma.patch | 39
patches/boot/tools.jar.patch | 14
patches/hotspot/default/icedtea-gcc-suffix.patch | 24
patches/hotspot/default/icedtea-shark-build.patch | 252
patches/hotspot/default/icedtea-shark.patch | 384 -
patches/icedtea-alpha-fixes.patch | 48
patches/icedtea-clean-crypto.patch | 46
patches/icedtea-demos.patch | 6
patches/icedtea-doc-headers.patch | 192
patches/icedtea-freetypeversion.patch | 7
patches/icedtea-javafiles.patch | 32
patches/icedtea-linker-libs-order.patch | 18
patches/icedtea-print-lsb-release.patch | 19
patches/icedtea-rhino.patch | 68
patches/icedtea-shark-build.patch | 51
patches/icedtea-sunsrc.patch | 18
patches/icedtea-systemtap.patch | 37
patches/icedtea-testenv.patch | 18
patches/sh4-support.patch | 92
patches/systemtap-alloc-size-workaround.patch | 17
patches/xrender/icedtea-001.patch | 5277 ---------------
patches/xrender/icedtea-002.patch | 5159 --------------
patches/xrender/icedtea-003.patch | 70
patches/xrender/icedtea-004.patch | 79
patches/xrender/icedtea-005.patch | 11
patches/xrender/icedtea-006.patch | 295
patches/xrender/icedtea-007.patch | 1142 ---
patches/xrender/icedtea-008.patch | 131
patches/xrender/icedtea-009.patch | 170
ports/hotspot/make/linux/makefiles/shark.make | 32
ports/hotspot/make/linux/platform_zero.in | 17
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 63
ports/hotspot/src/share/vm/includeDB_shark | 369 -
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp | 82
ports/hotspot/src/share/vm/shark/llvmValue.hpp | 62
ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 1260 ---
ports/hotspot/src/share/vm/shark/sharkBlock.hpp | 281
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 591 -
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 209
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 259
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 417 -
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp | 87
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 340
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp | 119
ports/hotspot/src/share/vm/shark/sharkConstant.cpp | 128
ports/hotspot/src/share/vm/shark/sharkConstant.hpp | 64
ports/hotspot/src/share/vm/shark/sharkContext.cpp | 180
ports/hotspot/src/share/vm/shark/sharkContext.hpp | 187
ports/hotspot/src/share/vm/shark/sharkEntry.hpp | 58
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 188
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 111
ports/hotspot/src/share/vm/shark/sharkInliner.cpp | 749 --
ports/hotspot/src/share/vm/shark/sharkInliner.hpp | 32
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp | 277
ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp | 54
ports/hotspot/src/share/vm/shark/sharkInvariants.cpp | 37
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp | 167
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp | 116
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp | 88
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp | 352 -
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp | 182
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 251
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 83
ports/hotspot/src/share/vm/shark/sharkStack.cpp | 263
ports/hotspot/src/share/vm/shark/sharkStack.hpp | 290
ports/hotspot/src/share/vm/shark/sharkState.cpp | 389 -
ports/hotspot/src/share/vm/shark/sharkState.hpp | 188
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp | 99
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp | 75
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp | 1991 -----
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp | 430 -
ports/hotspot/src/share/vm/shark/sharkType.hpp | 112
ports/hotspot/src/share/vm/shark/sharkValue.cpp | 260
ports/hotspot/src/share/vm/shark/sharkValue.hpp | 332
ports/hotspot/src/share/vm/shark/shark_globals.cpp | 29
ports/hotspot/src/share/vm/shark/shark_globals.hpp | 54
diffs (truncated from 27837 to 500 lines):
diff -r 90b892525f1b -r a58071a38743 ChangeLog
--- a/ChangeLog Thu Aug 05 14:12:08 2010 +0200
+++ b/ChangeLog Mon Sep 06 23:52:04 2010 +0100
@@ -1,3 +1,127 @@ 2010-08-05 Xerxes RÃ¥nby <xerxes at zafen
+2010-09-06 Andrew John Hughes <ahughes at redhat.com>
+
+ Bump to b106.
+ * ergo.c.in,
+ * jvm.cfg.in: Removed.
+ * patches/boot/icedtea-hotspot-default.patch: Split
+ into test_gamma.patch and tools.jar.patch.
+ * patches/hotspot/default/icedtea-shark-build.patch,
+ * patches/hotspot/default/icedtea-shark.patch:
+ Dropped, Shark now upstream.
+ * patches/icedtea-doc-headers.patch: Dropped,
+ documentation licensing has changed completely due
+ to Sun->Oracle changes.
+ * patches/icedtea-shark-build.patch: Dropped.
+ * patches/xrender/icedtea-001.patch,
+ * patches/xrender/icedtea-002.patch,
+ * patches/xrender/icedtea-003.patch,
+ * patches/xrender/icedtea-004.patch,
+ * patches/xrender/icedtea-005.patch,
+ * patches/xrender/icedtea-006.patch,
+ * patches/xrender/icedtea-007.patch,
+ * patches/xrender/icedtea-008.patch,
+ * patches/xrender/icedtea-009.patch:
+ Dropped, XRender extension now upstream.
+ * ports/hotspot/make/linux/makefiles/shark.make,
+ * ports/hotspot/make/linux/platform_zero.in,
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp,
+ * ports/hotspot/src/share/vm/includeDB_shark,
+ * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp,
+ * ports/hotspot/src/share/vm/shark/llvmValue.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkBlock.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkConstant.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkConstant.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkContext.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkContext.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkEntry.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkInliner.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkInliner.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkInvariants.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkStack.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkStack.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkState.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkState.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkType.hpp,
+ * ports/hotspot/src/share/vm/shark/sharkValue.cpp,
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp,
+ * ports/hotspot/src/share/vm/shark/shark_globals.cpp,
+ * ports/hotspot/src/share/vm/shark/shark_globals.hpp:
+ Dropped, Shark now upstream.
+ * Makefile.am:
+ Bump to b106 changesets and new JAXWS and JAXP drops.
+ (JAF_DROP_URL): Added to make JAF independent of JAXWS.
+ (ICEDTEA_BOOTSTRAP_CLASSES): Add additional classes
+ needed to bootstrap; java.nio.file.SimpleFileVisitor
+ and javax.management.modelmbean.ModelMBeanInfo.
+ (ICEDTEA_PATCHES): Drop upstream patches.
+ (XRENDER_PATCHES): Removed.
+ (ICEDTEA_BOOT_PATCHES): Add new bootstrap patches.
+ (ICEDTEA_SHARK_BUILD): Set to 'true' not 'yes' for
+ upstream Shark.
+ (ICEDTEA_ENV): Pass SHARK_BUILD not ICEDTEA_SHARK_BUILD
+ for upstream Shark.
+ (download-jaf-drop): Use JAF_DROP_URL instead of JAXWS_DROP_URL.
+ (ports): Removed.
+ (clean-ports): Likewise.
+ (generated): Depend on extract, not ports.
+ (clean-extract-openjdk): Don't call clean-ports.
+ (bootstrap-directory-stage1): Create lib/modules directory.
+ (hotspot-ports): Removed.
+ * acinclude.m4: Don't generate jvm.cfg and ergo.c.
+ * configure.ac: Drop --enable-xrender option.
+ * generated/java/lang/UNIXProcess.java: Updated, including
+ ProcessBuilder workaround.
+ * patches/boot/break-processbuilder-dependency.patch:
+ Prevent UNIXProcess having a dependency on package-private
+ classes in java.lang.ProcessBuilder which only exist in
+ Oracle's implementation.
+ * patches/boot/ecj-diamond.patch: Add new cases of <> usage.
+ * patches/boot/icedtea-jaxp-dependency.patch: Regenerated.
+ * patches/boot/revert-6973616.patch: Revert 1.6 requirement
+ introduced by 6973616.
+ * patches/boot/symbols.patch: Regenerated.
+ * patches/boot/test_gamma.patch: Split from icedtea-hotspot-default.patch.
+ * patches/boot/tools.jar.patch: Likewise, and regenerated
+ due to addition of module directory test.
+ * patches/hotspot/default/icedtea-gcc-suffix.patch,
+ * patches/icedtea-alpha-fixes.patch,
+ * patches/icedtea-clean-crypto.patch,
+ * patches/icedtea-demos.patch,
+ * patches/icedtea-freetypeversion.patch,
+ * patches/icedtea-javafiles.patch,
+ * patches/icedtea-linker-libs-order.patch,
+ * patches/icedtea-print-lsb-release.patch,
+ * patches/icedtea-rhino.patch,
+ * patches/icedtea-sunsrc.patch,
+ * patches/icedtea-systemtap.patch,
+ * patches/icedtea-testenv.patch:
+ * patches/sh4-support.patch: Regenerated.
+ * patches/systemtap-alloc-size-workaround.patch:
+ Patch not added by previous commit.
+
2010-08-05 Xerxes RÃ¥nby <xerxes at zafena.se>
* NEWS: Updated with correct suffix for the
@@ -22,7 +146,7 @@ 2010-08-05 Xerxes RÃ¥nby <xerxes at zafen
2010-08-05 Xerxes RÃ¥nby <xerxes at zafena.se>
* NEWS: Updated for Shark OSR fix.
-
+
2010-08-05 Xerxes RÃ¥nby <xerxes at zafena.se>
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
diff -r 90b892525f1b -r a58071a38743 Makefile.am
--- a/Makefile.am Thu Aug 05 14:12:08 2010 +0200
+++ b/Makefile.am Mon Sep 06 23:52:04 2010 +0100
@@ -1,22 +1,22 @@
# Dependencies
-OPENJDK_VERSION = b89
+OPENJDK_VERSION = b106
-CORBA_CHANGESET = e805b4155d76
-HOTSPOT_CHANGESET = a393ff93e7e5
-JAXP_CHANGESET = 826bafcb6c4a
-JAXWS_CHANGESET = 1661166c82dc
-JDK_CHANGESET = 2017795af50a
-LANGTOOLS_CHANGESET = 681f1f51926f
-OPENJDK_CHANGESET = 195fcceefddc
+CORBA_CHANGESET = 00a2834117ff
+HOTSPOT_CHANGESET = a30c85eed5d5
+JAXP_CHANGESET = 679653c22ae1
+JAXWS_CHANGESET = 191a3ec51d79
+JDK_CHANGESET = a094068f4c7b
+LANGTOOLS_CHANGESET = 68035813467d
+OPENJDK_CHANGESET = b79fce47b7c6
-CORBA_SHA256SUM = 870e2eac993a4eef48197ed7309cab176b56a994add1de215a026599052627cb
-HOTSPOT_SHA256SUM = 995d64e272ecde0e00b69e36371bc7f8a82638c1f598c956f98e10538e41d695
-JAXP_SHA256SUM = 42d004e51a1f01d146ad230ce48996ddf8da3719fe571a41653f431d6b2e8a7b
-JAXWS_SHA256SUM = 4523909cd46fd61b5c6670bf932099d5899236a37a4058e7b2bcb855e503a0e4
-JDK_SHA256SUM = 1efc1939a8fae211752369b710d2c549cbc8ec74de4724c2898e772bdba98a3c
-LANGTOOLS_SHA256SUM = 5ff6f2a6d15403ed8d948a07204904f6ce60e363bd0516e22f1cae830aba84f8
-OPENJDK_SHA256SUM = 93c536e6bc4e962050a00321e88e694fc4e0000e2ad887b8de22830bfda2649f
+CORBA_SHA256SUM = 5648b189c94df46bbec9bc7c8640957befffbde68ff7ef9f8f8de9bd7fbe8e7d
+HOTSPOT_SHA256SUM = 93f71928d061f86f6a18f224f92ac217ea4dcc324183b029ece9a862c445714d
+JAXP_SHA256SUM = c7d58a5dd2859ccb8b2d0897a26ce9b37895f530a94a5912179afc25cc1d14ea
+JAXWS_SHA256SUM = 6fd65fd23c085c9c89f904da1b6448460af32d97d76bb0ba49630ee61d70a4d6
+JDK_SHA256SUM = 8b20e0686667a03cf028d57695b4bc2196c51db2d9c0873db7694624c384c446
+LANGTOOLS_SHA256SUM = 81b48f5f5782e62b0555735be24e294d3274c48fa1e027a63eb005465a505385
+OPENJDK_SHA256SUM = edb332586e2442bdbd4eed19c059535ade56dba5b436257031a0e5e827b89f12
CACAO_VERSION = 66e762d869dd
CACAO_SHA256SUM = 9a558ffb69479f2d31995bdeb90cd2abc616050e76a6be7263c72e2e302ca4e6
@@ -24,14 +24,15 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VE
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
-JAXWS_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
-JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip
-JAXWS_DROP_SHA256SUM = 272756b999e9ae2435da8d58e259562e61126e1c5b1f9421fe65423217cef8fd
+JAXWS_DROP_URL = https://jax-ws.dev.java.net/files/documents/4202/150896
+JAXWS_DROP_ZIP = jdk7-jaxws-b100.zip
+JAXWS_DROP_SHA256SUM = 06e5f564430954211322fca353b0b8d916ffa8ae051412b7d9b5a5398090d887
+JAF_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
JAF_DROP_ZIP = jdk7-jaf-2009_08_28.zip
JAF_DROP_SHA256SUM = 8c81940b3017c0058367d7e7453123442f2cdd77c2bfe74acd9035f97e4db8e8
-JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/147490
-JAXP_DROP_ZIP = jdk7-jaxp-m6.zip
-JAXP_DROP_SHA256SUM = 3d9eb7ae71f5365e2a786ba270413c6cb7dc8d1137f56995c087908b3df8446c
+JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/150785
+JAXP_DROP_ZIP = jdk7-jaxp-m7.zip
+JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
@@ -151,6 +152,8 @@ ICEDTEA_BOOTSTRAP_CLASSES = \
ICEDTEA_BOOTSTRAP_CLASSES = \
$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \
$(SHARE)/javax/management/StandardMBean.java \
+ $(SHARE)/java/nio/file/SimpleFileVisitor.java \
+ $(SHARE)/javax/management/modelmbean/ModelMBeanInfo.java \
$(NETX_BOOTSTRAP_CLASSES)
endif
@@ -303,8 +306,6 @@ ICEDTEA_PATCHES = \
patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
- patches/icedtea-shark-build.patch \
- patches/hotspot/$(HSBUILD)/icedtea-shark-build.patch \
patches/icedtea-security-updates.patch \
patches/icedtea-hotspot-gcc-pr36917.patch \
patches/icedtea-alpha-fixes.patch \
@@ -313,7 +314,6 @@ ICEDTEA_PATCHES = \
patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \
patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \
patches/icedtea-clean-crypto.patch \
- patches/hotspot/$(HSBUILD)/icedtea-shark.patch \
$(GCC_PATCH) \
patches/cacao/arch.patch \
patches/icedtea-signed-types.patch \
@@ -324,7 +324,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-testenv.patch \
patches/icedtea-samejvm-safe.patch \
patches/icedtea-pr261.patch \
- patches/icedtea-doc-headers.patch \
patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \
patches/security/icedtea-6592792.patch \
patches/security/icedtea-6733959.patch \
@@ -367,14 +366,6 @@ if ENABLE_PULSE_JAVA
if ENABLE_PULSE_JAVA
ICEDTEA_PATCHES += \
patches/icedtea-pulse-soundproperties.patch
-endif
-
-if ENABLE_XRENDER
-# match against $(abs_top_srcdir) and then remove it again,
-# because stamps/patch.stamp target will also add it
-XRENDER_PATCHES = patches/xrender/icedtea-???.patch
-XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES)))
-ICEDTEA_PATCHES += $(sort $(subst $(abs_top_srcdir)/,,$(XRENDER_PATCH_FILES)))
endif
if !USE_CVMI
@@ -420,12 +411,15 @@ ICEDTEA_BOOT_PATCHES = patches/boot/ant-
patches/boot/javah.patch \
patches/boot/symbols.patch \
patches/boot/tobin.patch \
- patches/boot/icedtea-hotspot-$(HSBUILD).patch \
+ patches/boot/test_gamma.patch \
+ patches/boot/tools.jar.patch \
patches/boot/icedtea-jopt.patch \
patches/boot/icedtea-dyn.patch \
patches/boot/icedtea-jaxp-dependency.patch \
patches/boot/genstubs-nofork.patch \
- patches/boot/getannotation-cast.patch
+ patches/boot/getannotation-cast.patch \
+ patches/boot/break-processbuilder-dependency.patch \
+ patches/boot/revert-6973616.patch
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch
@@ -468,13 +462,9 @@ JAXWS_PATCHES = patches/boot/jaxws-getdt
# OpenJDK build environment.
if ZERO_BUILD
ICEDTEA_ZERO_BUILD = true
-else
- ICEDTEA_ZERO_BUILD =
endif
if SHARK_BUILD
- ICEDTEA_SHARK_BUILD = yes
-else
- ICEDTEA_SHARK_BUILD =
+ ICEDTEA_SHARK_BUILD = true
endif
JDK_UPDATE_VERSION = $(shell echo $(OPENJDK_VERSION) | sed -e "s/^b//")
@@ -507,7 +497,7 @@ ICEDTEA_ENV = \
CLASSPATH="" \
LD_LIBRARY_PATH="" \
ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
- ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
+ SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
ZERO_LIBARCH="$(ZERO_LIBARCH)" \
ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
@@ -898,7 +888,7 @@ endif
then \
mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \
fi ; \
- $(WGET) $(JAXWS_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
+ $(WGET) $(JAF_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
if ! echo "$(JAF_DROP_SHA256SUM) drops/$(JAF_DROP_ZIP)" \
| $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of jaf drop zip"; false; \
@@ -1269,7 +1259,7 @@ endif
touch $@
clean-extract-openjdk: clean-overlay clean-versioning \
- clean-ports clean-patch-fsg
+ clean-patch-fsg
rm -rf openjdk
rm -f stamps/extract-openjdk.stamp
@@ -1315,39 +1305,7 @@ clean-extract-jaxws:
mkdir -p stamps
rm -f stamps/extract-jaxws.stamp
-# Link ports sources into tree
-stamps/ports.stamp: stamps/extract.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/make/*/platform_zero.in \
- $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/* \
- $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
- link=$$(dirname $$target | sed 's/^.*ports/openjdk/'); \
- ln -sfv $$target $$link; \
- done
- if ! test "x$(WITH_CACAO)" = "xno" ; then \
- mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR) ; \
- ln -sf $(abs_top_builddir)/jvm.cfg \
- openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg ; \
- fi
- if ! test "x$(WITH_CACAO)" = "xno"; then \
- ln -sf $(abs_top_builddir)/ergo.c \
- openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
- fi
- mkdir -p stamps
- touch $@
-
-clean-ports:
- for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/* \
- $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
- link=$$(echo $$target | sed 's/^.*ports/openjdk/'|sed "s#hotspot/build#hotspot/make#"); \
- rm -rf $$link; \
- done
- rm -f openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg
- rm -f openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c
- rm -f stamps/ports.stamp
-
-stamps/generated.stamp: stamps/ports.stamp
+stamps/generated.stamp: stamps/extract.stamp
set -e ; \
if [ ! -e $(abs_top_builddir)/generated.build ]; then \
cp -pPR $(abs_top_srcdir)/generated $(abs_top_builddir)/generated.build; \
@@ -1696,6 +1654,7 @@ stamps/bootstrap-directory-stage1.stamp:
ln -sf $(XALAN2_SERIALIZER_JAR) \
$(STAGE1_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \
ln -sf $(XERCES2_JAR) $(STAGE1_BOOT_DIR)/lib/endorsed/xerces-j2.jar
+ mkdir -p $(STAGE1_BOOT_DIR)/lib/modules
mkdir -p $(STAGE1_BOOT_DIR)/jre/lib && \
cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
$(STAGE1_BOOT_DIR)/jre/lib/rt.jar && \
@@ -2620,8 +2579,6 @@ extract-openjdk: stamps/extract-openjdk.
generated: stamps/generated.stamp
-hotspot-ports: stamps/ports.stamp
-
icedtea: stamps/icedtea.stamp
icedtea-boot: stamps/icedtea-boot.stamp
diff -r 90b892525f1b -r a58071a38743 acinclude.m4
--- a/acinclude.m4 Thu Aug 05 14:12:08 2010 +0200
+++ b/acinclude.m4 Mon Sep 06 23:52:04 2010 +0100
@@ -760,8 +760,6 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
AC_SUBST(ZERO_BITSPERWORD)
AC_SUBST(ZERO_ENDIANNESS)
AC_SUBST(ZERO_ARCHDEF)
- AC_CONFIG_FILES([jvm.cfg])
- AC_CONFIG_FILES([ergo.c])
])
AC_DEFUN([SET_SHARK_BUILD],
diff -r 90b892525f1b -r a58071a38743 configure.ac
--- a/configure.ac Thu Aug 05 14:12:08 2010 +0200
+++ b/configure.ac Mon Sep 06 23:52:04 2010 +0100
@@ -78,14 +78,6 @@ AC_ARG_ENABLE([docs],
[ENABLE_DOCS="${enableval}"], [ENABLE_DOCS='yes'])
AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes])
AC_MSG_RESULT(${ENABLE_DOCS})
-
-AC_MSG_CHECKING([whether to include the XRender pipeline])
-AC_ARG_ENABLE([xrender],
- [AS_HELP_STRING([--disable-xrender],
- [Disable inclusion of xrender pipeline])],
- [ENABLE_XRENDER="${enableval}"], [ENABLE_XRENDER='yes'])
-AM_CONDITIONAL([ENABLE_XRENDER], [test x$ENABLE_XRENDER = xyes])
-AC_MSG_RESULT(${ENABLE_XRENDER})
AC_MSG_CHECKING([whether to include SystemTap tracing support])
AC_ARG_ENABLE([systemtap],
diff -r 90b892525f1b -r a58071a38743 ergo.c.in
--- a/ergo.c.in Thu Aug 05 14:12:08 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * 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. 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.
- */
-#include "ergo.h"
-
-
-/* Methods for solaris-sparc and linux-sparc: these are easy. */
-
-/* Ask the OS how many processors there are. */
-static unsigned long
-physical_processors(void) {
- const unsigned long sys_processors = sysconf(_SC_NPROCESSORS_CONF);
-
- JLI_TraceLauncher("sysconf(_SC_NPROCESSORS_CONF): %lu\n", sys_processors);
- return sys_processors;
-}
-
-/* The sparc version of the "server-class" predicate. */
-jboolean
-ServerClassMachineImpl(void) {
- jboolean result = JNI_FALSE;
- /* How big is a server class machine? */
- const unsigned long server_processors = 2UL;
- const uint64_t server_memory = 2UL * GB;
- const uint64_t actual_memory = physical_memory();
-
- /* Is this a server class machine? */
- if (actual_memory >= server_memory) {
- const unsigned long actual_processors = physical_processors();
- if (actual_processors >= server_processors) {
- result = JNI_TRUE;
- }
- }
- JLI_TraceLauncher("unix_" LIBARCHNAME "_ServerClassMachine: %s\n",
- (result == JNI_TRUE ? "JNI_TRUE" : "JNI_FALSE"));
- return result;
-}
diff -r 90b892525f1b -r a58071a38743 generated/java/lang/UNIXProcess.java
--- a/generated/java/lang/UNIXProcess.java Thu Aug 05 14:12:08 2010 +0200
+++ b/generated/java/lang/UNIXProcess.java Mon Sep 06 23:52:04 2010 +0100
@@ -1,12 +1,12 @@
/*
- * Copyright 1995-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
+ * published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,32 +18,75 @@
* 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.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
*/
package java.lang;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.FileDescriptor;
More information about the distro-pkg-dev
mailing list