changeset in /hg/icedtea: Bump to b65 and upstream Zero.
Andrew John Hughes
ahughes at redhat.com
Sat Jul 25 22:45:50 PDT 2009
changeset 7a7a1f3bff6c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7a7a1f3bff6c
description:
Bump to b65 and upstream Zero.
2009-07-26 Andrew John Hughes <ahughes at redhat.com>
* patches/hotspot/default/icedtea-core-build.patch,
* patches/hotspot/default/icedtea-static-libstdc++.patch,
* patches/hotspot/default/icedtea-zero-build.patch,
* patches/icedtea-arch.patch,
* patches/icedtea-linker-options.patch,
* patches/icedtea-signature-iterator.patch,
* patches/icedtea-zero.patch,
* platform_zero.in,
* ports/hotspot/make/linux/makefiles/zero.make,
* ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp,
* ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/copy_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/debug_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/dump_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/entry_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp,
* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/icache_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/icache_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/jni_zero.h,
* ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/register_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/register_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/stack_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp,
* ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp,
* ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp,
* ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp,
* ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp,
* ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp,
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp,
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp,
* ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp,
* ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp,
* ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp,
* ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp,
* ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp:
Removed. Zero now upstream.
* Makefile.am:
Bump to b65. Switch ICEDTEA_{CORE,ZERO}_BUILD to use true
not 'yes', and pass to build as CORE_BUILD and ZERO_BUILD.
Link files in cpu/zero/vm rather than zero directory (now
only used for Shark). Remove unneeded patches and duplicate
ports-ecj target.
* acinclude.m4: Don't generate platform_zero.
* patches/cacao/arch.patch: Moved from patches/icedtea-arch.patch
and recreated.
* patches/hotspot/default/icedtea-core-zero-build.patch:
Use CORE_BUILD not ICEDTEA_CORE_BUILD.
* patches/hotspot/default/icedtea-shark-build.patch:
Recreated. Depend on $(PLATFORM_FILE) to create platform_zero.
* patches/icedtea-core-build.patch,
* patches/icedtea-gcc-suffix.patch,
* patches/icedtea-libraries.patch,
* patches/icedtea-shark-build.patch,
* patches/icedtea-zero-build.patch:
Recreated.
* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp:
Drop InlineSmallCode as in globals_zero.hpp upstream.
diffstat:
88 files changed, 410 insertions(+), 8404 deletions(-)
ChangeLog | 101 +
Makefile.am | 85
acinclude.m4 | 1
patches/cacao/arch.patch | 191 +
patches/hotspot/default/icedtea-core-build.patch | 108 -
patches/hotspot/default/icedtea-core-zero-build.patch | 6
patches/hotspot/default/icedtea-shark-build.patch | 69
patches/hotspot/default/icedtea-static-libstdc++.patch | 16
patches/hotspot/default/icedtea-zero-build.patch | 129 -
patches/icedtea-arch.patch | 191 -
patches/icedtea-core-build.patch | 59
patches/icedtea-gcc-suffix.patch | 12
patches/icedtea-libraries.patch | 60
patches/icedtea-linker-options.patch | 48
patches/icedtea-shark-build.patch | 22
patches/icedtea-signature-iterator.patch | 44
patches/icedtea-zero-build.patch | 184 -
patches/icedtea-zero.patch | 212 --
platform_zero.in | 17
ports/hotspot/make/linux/makefiles/zero.make | 41
ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp | 98 -
ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 70
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp | 55
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp | 159 -
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp | 280 --
ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp | 32
ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp | 307 ---
ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp | 27
ports/hotspot/src/cpu/zero/vm/copy_zero.hpp | 166 -
ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp | 39
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 956 ----------
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp | 44
ports/hotspot/src/cpu/zero/vm/debug_zero.cpp | 32
ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp | 49
ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp | 35
ports/hotspot/src/cpu/zero/vm/dump_zero.cpp | 37
ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp | 62
ports/hotspot/src/cpu/zero/vm/entry_zero.hpp | 60
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 199 --
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 74
ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 175 -
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp | 54
ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp | 52
ports/hotspot/src/cpu/zero/vm/icache_zero.cpp | 36
ports/hotspot/src/cpu/zero/vm/icache_zero.hpp | 33
ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp | 34
ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp | 71
ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp | 38
ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp | 170 -
ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp | 144 -
ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 76
ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp | 62
ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp | 78
ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp | 67
ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp | 108 -
ports/hotspot/src/cpu/zero/vm/jni_zero.h | 37
ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp | 27
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp | 50
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp | 220 --
ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp | 39
ports/hotspot/src/cpu/zero/vm/register_zero.cpp | 39
ports/hotspot/src/cpu/zero/vm/register_zero.hpp | 116 -
ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp | 77
ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp | 33
ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp | 116 -
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp | 3
ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 293 ---
ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 219 --
ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp | 260 --
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp | 31
ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp | 55
ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp | 52
ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp | 32
ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp | 67
ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp | 29
ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp | 32
ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp | 47
ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp | 319 ---
ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp | 43
ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp | 45
ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp | 176 -
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 467 ----
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp | 46
ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp | 32
ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp | 42
ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp | 32
ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp | 118 -
ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp | 45
diffs (truncated from 9613 to 500 lines):
diff -r c43b0d22e99b -r 7a7a1f3bff6c ChangeLog
--- a/ChangeLog Tue Jul 21 23:06:12 2009 +0100
+++ b/ChangeLog Sun Jul 26 05:45:29 2009 +0100
@@ -1,3 +1,104 @@ 2009-07-21 Andrew John Hughes <ahughes
+2009-07-26 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/default/icedtea-core-build.patch,
+ * patches/hotspot/default/icedtea-static-libstdc++.patch,
+ * patches/hotspot/default/icedtea-zero-build.patch,
+ * patches/icedtea-arch.patch,
+ * patches/icedtea-linker-options.patch,
+ * patches/icedtea-signature-iterator.patch,
+ * patches/icedtea-zero.patch,
+ * platform_zero.in,
+ * ports/hotspot/make/linux/makefiles/zero.make,
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp,
+ * ports/hotspot/src/cpu/zero/vm/bytecodes_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/bytes_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/codeBuffer_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/copy_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/debug_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/dump_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/entryFrame_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/entry_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp,
+ * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/icBuffer_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/icache_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/icache_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/interp_masm_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/interpreterGenerator_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/interpreterRT_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/interpreter_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/jniFastGetField_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/jniTypes_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/jni_zero.h,
+ * ports/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/registerMap_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/register_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/register_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/stubRoutines_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/vmStructs_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/vm_version_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/vmreg_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/vmreg_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/vmreg_zero.inline.hpp,
+ * ports/hotspot/src/cpu/zero/vm/vtableStubs_zero.cpp,
+ * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp,
+ * ports/hotspot/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp,
+ * ports/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp,
+ * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp,
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp,
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp,
+ * ports/hotspot/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp,
+ * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp,
+ * ports/hotspot/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp,
+ * ports/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp,
+ * ports/hotspot/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp:
+ Removed. Zero now upstream.
+ * Makefile.am:
+ Bump to b65. Switch ICEDTEA_{CORE,ZERO}_BUILD to use true
+ not 'yes', and pass to build as CORE_BUILD and ZERO_BUILD.
+ Link files in cpu/zero/vm rather than zero directory (now
+ only used for Shark). Remove unneeded patches and duplicate
+ ports-ecj target.
+ * acinclude.m4: Don't generate platform_zero.
+ * patches/cacao/arch.patch: Moved from patches/icedtea-arch.patch
+ and recreated.
+ * patches/hotspot/default/icedtea-core-zero-build.patch:
+ Use CORE_BUILD not ICEDTEA_CORE_BUILD.
+ * patches/hotspot/default/icedtea-shark-build.patch:
+ Recreated. Depend on $(PLATFORM_FILE) to create platform_zero.
+ * patches/icedtea-core-build.patch,
+ * patches/icedtea-gcc-suffix.patch,
+ * patches/icedtea-libraries.patch,
+ * patches/icedtea-shark-build.patch,
+ * patches/icedtea-zero-build.patch:
+ Recreated.
+ * ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp:
+ Drop InlineSmallCode as in globals_zero.hpp upstream.
+
2009-07-21 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
diff -r c43b0d22e99b -r 7a7a1f3bff6c Makefile.am
--- a/Makefile.am Tue Jul 21 23:06:12 2009 +0100
+++ b/Makefile.am Sun Jul 26 05:45:29 2009 +0100
@@ -1,20 +1,20 @@ OPENJDK_VERSION = b64
-OPENJDK_VERSION = b64
-
-OPENJDK_CHANGESET = 269c1ec4435d
-CORBA_CHANGESET = 047dd27fddb6
-JAXP_CHANGESET = a10eec7a1edf
-JAXWS_CHANGESET = d1788e8fd315
-JDK_CHANGESET = d799a225c668
-LANGTOOLS_CHANGESET = d8f23a81d46f
-HOTSPOT_CHANGESET = ba36394eb84b
-
-OPENJDK_MD5SUM = 377e7f1139d876175dd85629220213c9
-CORBA_MD5SUM = 203e6eb0231ae7848a501ee40fcc256d
-JAXP_MD5SUM = b57ed800ab149e44d4d53525cf58e9a7
-JAXWS_MD5SUM = 768509b4a24dc8e3b060e68e71081f48
-JDK_MD5SUM = dab8727958b03ff1b7992a50545479c3
-LANGTOOLS_MD5SUM = bf1a06f7d30febfb332658b6d7ef5fa5
-HOTSPOT_MD5SUM = 1ffa3dd169e18e9679c56b13c04a0de9
+OPENJDK_VERSION = b65
+
+OPENJDK_CHANGESET = 3f9b913a63a5
+CORBA_CHANGESET = 5bd83d1b2476
+JAXP_CHANGESET = 008c662e0ee9
+JAXWS_CHANGESET = 706c94322f68
+JDK_CHANGESET = 76242e1e7faf
+LANGTOOLS_CHANGESET = 7e0056ded28c
+HOTSPOT_CHANGESET = fa683fcb2628
+
+OPENJDK_MD5SUM = 1b83ab007193ac11ace81777a9cf8b34
+CORBA_MD5SUM = c751d1140d3a5f777655b9b7cde41c9f
+JAXP_MD5SUM = 5832f64d5469985060f0c16fbcbce574
+JAXWS_MD5SUM = c23b0c5e2140feb224cc04d0f8bc2768
+JDK_MD5SUM = 013f095e5d95f8fe9afb07353670fbc7
+LANGTOOLS_MD5SUM = eca84cbe43c9f0314baa46917463b2cf
+HOTSPOT_MD5SUM = db12c9a6a0a61a1d783cd132aef59ba6
CACAO_VERSION = 0.99.4
CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -1517,12 +1517,12 @@ JDK_UPDATE_VERSION = 0
JDK_UPDATE_VERSION = 0
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
if CORE_BUILD
- ICEDTEA_CORE_BUILD = yes
+ ICEDTEA_CORE_BUILD = true
else
ICEDTEA_CORE_BUILD =
endif
if ZERO_BUILD
- ICEDTEA_ZERO_BUILD = yes
+ ICEDTEA_ZERO_BUILD = true
else
ICEDTEA_ZERO_BUILD =
endif
@@ -1549,8 +1549,8 @@ ICEDTEA_ENV = \
"ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
"CLASSPATH=" \
"LD_LIBRARY_PATH=" \
- "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
- "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+ "ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
"ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
@@ -1634,8 +1634,8 @@ ICEDTEA_ENV_ECJ = \
"CLASSPATH=" \
"LD_LIBRARY_PATH=" \
"GENSRCDIR=$(abs_top_builddir)/generated" \
- "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
- "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
+ "CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+ "ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
"ICEDTEA_SHARK_BUILD=$(ICEDTEA_SHARK_BUILD)" \
"ZERO_LIBARCH=$(ZERO_LIBARCH)" \
"ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
@@ -1973,12 +1973,11 @@ endif
# Link ports sources into tree
stamps/ports.stamp: stamps/extract.stamp
for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
+ $(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/'|sed "s#hotspot/build#hotspot/make#"); \
ln -sfv $$target $$link; \
done
- ln -sf $(abs_top_builddir)/platform_zero openjdk/hotspot/make/linux
if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
= "xno" ; then \
mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR) ; \
@@ -2021,11 +2020,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-sunsrc.patch \
patches/icedtea-libraries.patch \
patches/icedtea-core-build.patch \
- patches/hotspot/$(HSBUILD)/icedtea-core-build.patch \
- patches/icedtea-linker-options.patch \
- patches/hotspot/$(HSBUILD)/icedtea-static-libstdc++.patch \
patches/icedtea-zero-build.patch \
- patches/hotspot/$(HSBUILD)/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
patches/icedtea-jpegclasses.patch \
patches/icedtea-uname.patch \
@@ -2049,7 +2044,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-clean-crypto.patch \
patches/hotspot/$(HSBUILD)/icedtea-shark.patch \
$(GCC_PATCH) \
- patches/icedtea-arch.patch \
+ patches/cacao/arch.patch \
patches/icedtea-signed-types.patch \
patches/icedtea-lc_ctype.patch \
patches/icedtea-xjc.patch \
@@ -2063,9 +2058,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-pr261.patch \
patches/icedtea-doc-headers.patch \
patches/hotspot/$(HSBUILD)/icedtea-bytecodeInterpreter.patch \
- patches/icedtea-signature-iterator.patch \
patches/icedtea-test-atomic-operations.patch \
- patches/icedtea-zero.patch \
patches/icedtea-ia64-bugfix.patch \
patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \
patches/security/icedtea-6592792.patch \
@@ -2453,28 +2446,6 @@ clean-clone-ecj:
rm -f stamps/clone-ecj.stamp
rm -rf openjdk-ecj
-# Link ports sources into tree
-stamps/ports-ecj.stamp: stamps/clone-ecj.stamp
- for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \
- $(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
- $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
- link=$$(dirname $$target | sed 's/^.*ports/openjdk-ecj/'|sed "s#hotspot/build#hotspot/make#"); \
- ln -sfv $$target $$link; \
- done
- ln -sf $(abs_top_builddir)/platform_zero openjdk-ecj/hotspot/make/linux
- if ! test "x$(ICEDTEA_CORE_BUILD)$(ICEDTEA_SHARK_BUILD)$(WITH_CACAO)" \
- = "xno"; then \
- mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \
- ln -sf $(abs_top_builddir)/jvm.cfg \
- openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \
- fi
- if ! test "x$(ICEDTEA_ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \
- ln -sf $(abs_top_builddir)/ergo.c \
- openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \
- fi
- mkdir -p stamps
- touch stamps/ports-ecj.stamp
-
# Patch OpenJDK for ecj/gcj builds.
ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \
patches/ecj/icedtea-hotspot-$(HSBUILD).patch \
@@ -2897,7 +2868,7 @@ endif
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp stamps/netx-dist.stamp \
- stamps/liveconnect.stamp stamps/ports-ecj.stamp stamps/patch-ecj.stamp \
+ stamps/liveconnect.stamp stamps/ports.stamp stamps/patch-ecj.stamp \
stamps/cacao.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
@@ -2922,7 +2893,7 @@ hotspot:
hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
stamps/hotspot-tools.stamp stamps/plugs.stamp \
- stamps/ports-ecj.stamp stamps/patch-ecj.stamp
+ stamps/ports.stamp stamps/patch-ecj.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj hotspot
@@ -3737,8 +3708,6 @@ hotspot-ports: stamps/ports.stamp
tools-class-files: stamps/tools-class-files.stamp
-hotspot-ports-ecj: stamps/ports-ecj.stamp
-
clean: distclean-local
jtreg: stamps/jtreg.stamp
diff -r c43b0d22e99b -r 7a7a1f3bff6c acinclude.m4
--- a/acinclude.m4 Tue Jul 21 23:06:12 2009 +0100
+++ b/acinclude.m4 Sun Jul 26 05:45:29 2009 +0100
@@ -791,7 +791,6 @@ AC_DEFUN([ENABLE_ZERO_BUILD],
AC_SUBST(ZERO_ENDIANNESS)
AC_SUBST(ZERO_ARCHDEF)
AC_SUBST(ZERO_ARCHFLAG)
- AC_CONFIG_FILES([platform_zero])
AC_CONFIG_FILES([jvm.cfg])
AC_CONFIG_FILES([ergo.c])
])
diff -r c43b0d22e99b -r 7a7a1f3bff6c patches/cacao/arch.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/arch.patch Sun Jul 26 05:45:29 2009 +0100
@@ -0,0 +1,191 @@
+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 2009-07-24 00:15:26.000000000 +0100
++++ openjdk/corba/make/common/Defs-linux.gmk 2009-07-24 00:19:32.000000000 +0100
+@@ -92,9 +92,19 @@
+ # We need this frame pointer to make it easy to walk the stacks.
+ # This should be the default on X86, but ia64 and amd64 may not have this
+ # as the default.
++CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_hppa +=
+ CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_m68k +=
++CFLAGS_REQUIRED_mips +=
++CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_ppc += -m32
++CFLAGS_REQUIRED_ppc64 += -m64
++CFLAGS_REQUIRED_s390 +=
++CFLAGS_REQUIRED_s390x += -m64
+ CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
+ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
+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 2009-07-24 00:15:28.000000000 +0100
++++ openjdk/jdk/make/common/Defs-linux.gmk 2009-07-24 00:19:32.000000000 +0100
+@@ -109,9 +109,19 @@
+ # We need this frame pointer to make it easy to walk the stacks.
+ # This should be the default on X86, but ia64 and amd64 may not have this
+ # as the default.
++CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_hppa +=
+ CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+ CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_m68k +=
++CFLAGS_REQUIRED_mips +=
++CFLAGS_REQUIRED_mipsel += -D_LITTLE_ENDIAN
++CFLAGS_REQUIRED_ppc += -m32
++CFLAGS_REQUIRED_ppc64 += -m64
++CFLAGS_REQUIRED_s390 +=
++CFLAGS_REQUIRED_s390x += -m64
+ CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
+ LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
+ CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
+diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
+--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2009-07-24 00:15:26.000000000 +0100
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2009-07-24 00:19:32.000000000 +0100
+@@ -71,6 +71,52 @@
+ REQUIRED_CC_VER = 3.2
+ REQUIRED_GCC_VER = 3.2.*
+ endif
++ ifeq ($(ARCH), alpha)
++ # alpha
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifeq ($(ARCH), amd64)
++ # amd64
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifeq ($(ARCH), arm)
++ # arm
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifeq ($(ARCH), i586)
++ # i586
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.1*
++ REQUIRED_GCC_VER_INT = 3.2.1-7a
++ endif
++ ifeq ($(ARCH), ia64)
++ # ia64
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 2.9[56789].*
++ endif
++ ifneq ("$(findstring m68k,$(ARCH))", "")
++ # m68k
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifneq ("$(findstring mips,$(ARCH))", "")
++ # mips
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifneq ("$(findstring ppc,$(ARCH))", "")
++ # ppc or ppc64
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
++ ifneq ("$(findstring s390,$(ARCH))", "")
++ # s390 or s390x
++ REQUIRED_CC_VER = 3.2
++ REQUIRED_GCC_VER = 3.2.*
++ endif
+ # Option used to create a shared library
+ SHARED_LIBRARY_FLAG = -shared -mimpure-text
+ SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
+diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
+--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2009-07-15 17:35:01.000000000 +0100
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2009-07-24 00:19:32.000000000 +0100
+@@ -58,10 +58,54 @@
+ ifeq ($(ZERO_BUILD), true)
+ CPPFLAGS += -DX_ARCH=X_ZERO
+ else
++ ifeq ($(ARCH), alpha)
++ CPPFLAGS += -DX_ARCH=X_ALPHA
++ endif # ARCH alpha
++
++ ifeq ($(ARCH), amd64)
++ CPPFLAGS += -DX_ARCH=X_AMD64
++ endif # ARCH amd64
++
++ ifeq ($(ARCH), arm)
++ CPPFLAGS += -DX_ARCH=X_ARM
++ endif # ARCH arm
++
+ ifeq ($(ARCH), i586)
+ CPPFLAGS += -DX_ARCH=X_I586
+ endif # ARCH i586
+
++ ifeq ($(ARCH), ia64)
++ CPPFLAGS += -DX_ARCH=X_IA64
++ endif # ARCH ia64
++
++ ifeq ($(ARCH), m68k)
++ CPPFLAGS += -DX_ARCH=X_M68K
++ endif # ARCH m68k
++
++ ifeq ($(ARCH), mips)
++ CPPFLAGS += -DX_ARCH=X_MIPS
++ endif # ARCH mips
++
++ ifeq ($(ARCH), mipsel)
++ CPPFLAGS += -DX_ARCH=X_MIPSEL
++ endif # ARCH mipsel
++
++ ifeq ($(ARCH), ppc)
++ CPPFLAGS += -DX_ARCH=X_PPC
++ endif # ARCH ppc
++
++ ifeq ($(ARCH), ppc64)
++ CPPFLAGS += -DX_ARCH=X_PPC64
++ endif # ARCH ppc64
++
++ ifeq ($(ARCH), s390)
++ CPPFLAGS += -DX_ARCH=X_S390
++ endif # ARCH s390
++
++ ifeq ($(ARCH), s390x)
++ CPPFLAGS += -DX_ARCH=X_S390X
++ endif # ARCH s390x
++
+ ifeq ($(ARCH), sparc)
+ CPPFLAGS += -DX_ARCH=X_SPARC
+ endif # ARCH sparc
+diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-07-15 17:35:01.000000000 +0100
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2009-07-24 00:19:32.000000000 +0100
+@@ -33,12 +33,21 @@
+ #define X_LINUX 3
+
+ // types for X_ARCH
+-#define X_I586 1
+-#define X_SPARC 2
+-#define X_SPARCV9 3
+-#define X_IA64 4
+-#define X_AMD64 5
+-#define X_ZERO 6
++#define X_ALPHA 1
++#define X_AMD64 2
++#define X_ARM 3
++#define X_I586 4
++#define X_IA64 5
++#define X_M68K 6
++#define X_MIPS 7
++#define X_MIPSEL 8
++#define X_PPC 9
++#define X_PPC64 10
++#define X_S390 11
++#define X_S390X 12
++#define X_SPARC 13
++#define X_SPARCV9 14
++#define X_ZERO 15
+
+ // **********************************
+ // Make sure you set X_PLATFORM and X_ARCH defines correctly.
diff -r c43b0d22e99b -r 7a7a1f3bff6c patches/hotspot/default/icedtea-core-build.patch
--- a/patches/hotspot/default/icedtea-core-build.patch Tue Jul 21 23:06:12 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make
---- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/defs.make 2008-06-22 03:10:05.000000000 +0100
More information about the distro-pkg-dev
mailing list