changeset in /hg/icedtea6: Rename 14.0b08 to 'default' for futur...
Andrew John Hughes
ahughes at redhat.com
Fri Feb 13 16:44:55 PST 2009
changeset 2f6c82818e1d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2f6c82818e1d
description:
Rename 14.0b08 to 'default' for future upgrades.
2009-02-12 Andrew John Hughes <ahughes at redhat.com>
* patches/ecj/icedtea-hotspot-14.0b08.patch,
* patches/hotspot/14.0b08/icedtea-6791168.patch,
* patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch,
* patches/hotspot/14.0b08/icedtea-core-build.patch,
* patches/hotspot/14.0b08/icedtea-debuginfo.patch,
* patches/hotspot/14.0b08/icedtea-format.patch,
* patches/hotspot/14.0b08/icedtea-gcc-4.3.patch,
* patches/hotspot/14.0b08/icedtea-gcc-suffix.patch,
* patches/hotspot/14.0b08/icedtea-headers.patch,
* patches/hotspot/14.0b08/icedtea-includedb.patch,
* patches/hotspot/14.0b08/icedtea-memory-limits.patch,
* patches/hotspot/14.0b08/icedtea-no-precompiled.patch,
* patches/hotspot/14.0b08/icedtea-params-cast-size_t.patch,
* patches/hotspot/14.0b08/icedtea-parisc-opt.patch,
* patches/hotspot/14.0b08/icedtea-shark-build.patch,
* patches/hotspot/14.0b08/icedtea-shark.patch,
* patches/hotspot/14.0b08/icedtea-sparc-buildfixes.patch,
* patches/hotspot/14.0b08/icedtea-sparc-ptracefix.patch,
* patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch,
* patches/hotspot/14.0b08/icedtea-sparc64-linux.patch,
* patches/hotspot/14.0b08/icedtea-static-libstdc++.patch,
* patches/hotspot/14.0b08/icedtea-text-relocations.patch,
* patches/hotspot/14.0b08/icedtea-use-idx_t.patch,
* patches/hotspot/14.0b08/icedtea-version.patch,
* patches/hotspot/14.0b08/icedtea-zero-build.patch: Moved...
* acinclude.m4: Make 'default' the default.
* hotspot.map: Change 14.0b08 to default.
* patches/ecj/icedtea-hotspot-default.patch,
* patches/hotspot/default/icedtea-6791168.patch,
* patches/hotspot/default/icedtea-bytecodeInterpreter.patch,
* patches/hotspot/default/icedtea-core-build.patch,
* patches/hotspot/default/icedtea-debuginfo.patch,
* patches/hotspot/default/icedtea-format.patch,
* patches/hotspot/default/icedtea-gcc-4.3.patch,
* patches/hotspot/default/icedtea-gcc-suffix.patch,
* patches/hotspot/default/icedtea-headers.patch,
* patches/hotspot/default/icedtea-includedb.patch,
* patches/hotspot/default/icedtea-memory-limits.patch,
* patches/hotspot/default/icedtea-no-precompiled.patch,
* patches/hotspot/default/icedtea-params-cast-size_t.patch,
* patches/hotspot/default/icedtea-parisc-opt.patch,
* patches/hotspot/default/icedtea-shark-build.patch,
* patches/hotspot/default/icedtea-shark.patch,
* patches/hotspot/default/icedtea-sparc-buildfixes.patch,
* patches/hotspot/default/icedtea-sparc-ptracefix.patch,
* patches/hotspot/default/icedtea-sparc-trapsfix.patch,
* patches/hotspot/default/icedtea-sparc64-linux.patch,
* patches/hotspot/default/icedtea-static-libstdc++.patch,
* patches/hotspot/default/icedtea-text-relocations.patch,
* patches/hotspot/default/icedtea-use-idx_t.patch,
* patches/hotspot/default/icedtea-version.patch,
* patches/hotspot/default/icedtea-zero-build.patch: to here.
diffstat:
53 files changed, 1938 insertions(+), 1885 deletions(-)
ChangeLog | 53 +
acinclude.m4 | 2
hotspot.map | 2
patches/ecj/icedtea-hotspot-14.0b08.patch | 48 -
patches/ecj/icedtea-hotspot-default.patch | 48 +
patches/hotspot/14.0b08/icedtea-6791168.patch | 230 ------
patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch | 11
patches/hotspot/14.0b08/icedtea-core-build.patch | 108 --
patches/hotspot/14.0b08/icedtea-debuginfo.patch | 15
patches/hotspot/14.0b08/icedtea-format.patch | 48 -
patches/hotspot/14.0b08/icedtea-gcc-4.3.patch | 54 -
patches/hotspot/14.0b08/icedtea-gcc-suffix.patch | 25
patches/hotspot/14.0b08/icedtea-headers.patch | 13
patches/hotspot/14.0b08/icedtea-includedb.patch | 97 --
patches/hotspot/14.0b08/icedtea-memory-limits.patch | 23
patches/hotspot/14.0b08/icedtea-no-precompiled.patch | 32
patches/hotspot/14.0b08/icedtea-params-cast-size_t.patch | 121 ---
patches/hotspot/14.0b08/icedtea-parisc-opt.patch | 28
patches/hotspot/14.0b08/icedtea-shark-build.patch | 233 ------
patches/hotspot/14.0b08/icedtea-shark.patch | 366 ----------
patches/hotspot/14.0b08/icedtea-sparc-buildfixes.patch | 35
patches/hotspot/14.0b08/icedtea-sparc-ptracefix.patch | 34
patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch | 21
patches/hotspot/14.0b08/icedtea-sparc64-linux.patch | 42 -
patches/hotspot/14.0b08/icedtea-static-libstdc++.patch | 16
patches/hotspot/14.0b08/icedtea-text-relocations.patch | 61 -
patches/hotspot/14.0b08/icedtea-use-idx_t.patch | 45 -
patches/hotspot/14.0b08/icedtea-version.patch | 48 -
patches/hotspot/14.0b08/icedtea-zero-build.patch | 129 ---
patches/hotspot/default/14.0b08/icedtea-6791168.patch | 230 ++++++
patches/hotspot/default/14.0b08/icedtea-bytecodeInterpreter.patch | 11
patches/hotspot/default/14.0b08/icedtea-core-build.patch | 108 ++
patches/hotspot/default/14.0b08/icedtea-debuginfo.patch | 15
patches/hotspot/default/14.0b08/icedtea-format.patch | 48 +
patches/hotspot/default/14.0b08/icedtea-gcc-4.3.patch | 54 +
patches/hotspot/default/14.0b08/icedtea-gcc-suffix.patch | 25
patches/hotspot/default/14.0b08/icedtea-headers.patch | 13
patches/hotspot/default/14.0b08/icedtea-includedb.patch | 97 ++
patches/hotspot/default/14.0b08/icedtea-memory-limits.patch | 23
patches/hotspot/default/14.0b08/icedtea-no-precompiled.patch | 32
patches/hotspot/default/14.0b08/icedtea-params-cast-size_t.patch | 121 +++
patches/hotspot/default/14.0b08/icedtea-parisc-opt.patch | 28
patches/hotspot/default/14.0b08/icedtea-shark-build.patch | 233 ++++++
patches/hotspot/default/14.0b08/icedtea-shark.patch | 366 ++++++++++
patches/hotspot/default/14.0b08/icedtea-sparc-buildfixes.patch | 35
patches/hotspot/default/14.0b08/icedtea-sparc-ptracefix.patch | 34
patches/hotspot/default/14.0b08/icedtea-sparc-trapsfix.patch | 21
patches/hotspot/default/14.0b08/icedtea-sparc64-linux.patch | 42 +
patches/hotspot/default/14.0b08/icedtea-static-libstdc++.patch | 16
patches/hotspot/default/14.0b08/icedtea-text-relocations.patch | 61 +
patches/hotspot/default/14.0b08/icedtea-use-idx_t.patch | 45 +
patches/hotspot/default/14.0b08/icedtea-version.patch | 48 +
patches/hotspot/default/14.0b08/icedtea-zero-build.patch | 129 +++
diffs (truncated from 4045 to 500 lines):
diff -r 30659285afdb -r 2f6c82818e1d ChangeLog
--- a/ChangeLog Fri Feb 13 15:27:01 2009 -0500
+++ b/ChangeLog Sat Feb 14 00:44:26 2009 +0000
@@ -1,3 +1,56 @@ 2009-02-13 Lillian Angel <langel at redha
+2009-02-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/hotspot/14.0b08/icedtea-6791168.patch,
+ * patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch,
+ * patches/hotspot/14.0b08/icedtea-core-build.patch,
+ * patches/hotspot/14.0b08/icedtea-debuginfo.patch,
+ * patches/hotspot/14.0b08/icedtea-format.patch,
+ * patches/hotspot/14.0b08/icedtea-gcc-4.3.patch,
+ * patches/hotspot/14.0b08/icedtea-gcc-suffix.patch,
+ * patches/hotspot/14.0b08/icedtea-headers.patch,
+ * patches/hotspot/14.0b08/icedtea-includedb.patch,
+ * patches/hotspot/14.0b08/icedtea-memory-limits.patch,
+ * patches/hotspot/14.0b08/icedtea-no-precompiled.patch,
+ * patches/hotspot/14.0b08/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/14.0b08/icedtea-parisc-opt.patch,
+ * patches/hotspot/14.0b08/icedtea-shark-build.patch,
+ * patches/hotspot/14.0b08/icedtea-shark.patch,
+ * patches/hotspot/14.0b08/icedtea-sparc-buildfixes.patch,
+ * patches/hotspot/14.0b08/icedtea-sparc-ptracefix.patch,
+ * patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch,
+ * patches/hotspot/14.0b08/icedtea-sparc64-linux.patch,
+ * patches/hotspot/14.0b08/icedtea-static-libstdc++.patch,
+ * patches/hotspot/14.0b08/icedtea-text-relocations.patch,
+ * patches/hotspot/14.0b08/icedtea-use-idx_t.patch,
+ * patches/hotspot/14.0b08/icedtea-version.patch,
+ * patches/hotspot/14.0b08/icedtea-zero-build.patch: Moved...
+ * acinclude.m4: Make 'default' the default.
+ * hotspot.map: Change 14.0b08 to default.
+ * patches/hotspot/default/icedtea-6791168.patch,
+ * patches/hotspot/default/icedtea-bytecodeInterpreter.patch,
+ * patches/hotspot/default/icedtea-core-build.patch,
+ * patches/hotspot/default/icedtea-debuginfo.patch,
+ * patches/hotspot/default/icedtea-format.patch,
+ * patches/hotspot/default/icedtea-gcc-4.3.patch,
+ * patches/hotspot/default/icedtea-gcc-suffix.patch,
+ * patches/hotspot/default/icedtea-headers.patch,
+ * patches/hotspot/default/icedtea-includedb.patch,
+ * patches/hotspot/default/icedtea-memory-limits.patch,
+ * patches/hotspot/default/icedtea-no-precompiled.patch,
+ * patches/hotspot/default/icedtea-params-cast-size_t.patch,
+ * patches/hotspot/default/icedtea-parisc-opt.patch,
+ * patches/hotspot/default/icedtea-shark-build.patch,
+ * patches/hotspot/default/icedtea-shark.patch,
+ * patches/hotspot/default/icedtea-sparc-buildfixes.patch,
+ * patches/hotspot/default/icedtea-sparc-ptracefix.patch,
+ * patches/hotspot/default/icedtea-sparc-trapsfix.patch,
+ * patches/hotspot/default/icedtea-sparc64-linux.patch,
+ * patches/hotspot/default/icedtea-static-libstdc++.patch,
+ * patches/hotspot/default/icedtea-text-relocations.patch,
+ * patches/hotspot/default/icedtea-use-idx_t.patch,
+ * patches/hotspot/default/icedtea-version.patch,
+ * patches/hotspot/default/icedtea-zero-build.patch: to here.
+
2009-02-13 Lillian Angel <langel at redhat.com>
* acinclude.m4: Upgraded rhino to 1.7 from 1.6.
diff -r 30659285afdb -r 2f6c82818e1d acinclude.m4
--- a/acinclude.m4 Fri Feb 13 15:27:01 2009 -0500
+++ b/acinclude.m4 Sat Feb 14 00:44:26 2009 +0000
@@ -845,7 +845,7 @@ AC_DEFUN([AC_CHECK_WITH_GCJ],
AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
[
- DEFAULT_BUILD="14.0b08"
+ DEFAULT_BUILD="default"
AC_MSG_CHECKING([which HotSpot build to use])
AC_ARG_WITH([hotspot-build],
[AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use)],
diff -r 30659285afdb -r 2f6c82818e1d hotspot.map
--- a/hotspot.map Fri Feb 13 15:27:01 2009 -0500
+++ b/hotspot.map Sat Feb 14 00:44:26 2009 +0000
@@ -1,2 +1,2 @@
# version changeset md5sum
-14.0b08 f9d938ede196 c8f78d48ac83987bc2adebeebcd354e9
+default f9d938ede196 c8f78d48ac83987bc2adebeebcd354e9
diff -r 30659285afdb -r 2f6c82818e1d patches/ecj/icedtea-hotspot-14.0b08.patch
--- a/patches/ecj/icedtea-hotspot-14.0b08.patch Fri Feb 13 15:27:01 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
---- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-24 13:32:48.000000000 +0100
-@@ -263,28 +263,24 @@
-
- $(TARGETS_C2): $(SUBDIRS_C2)
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_TIERED): $(SUBDIRS_TIERED)
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_C1): $(SUBDIRS_C1)
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-
- $(TARGETS_CORE): $(SUBDIRS_CORE)
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
-- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
- ifdef INSTALL
- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
- endif
-diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
---- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-10-24 10:16:06.000000000 +0100
-+++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-24 13:32:48.000000000 +0100
-@@ -74,8 +74,8 @@
- mkdir -p $(SA_CLASSDIR); \
- fi
-
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
-+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
-
- $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
- $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
-
-
diff -r 30659285afdb -r 2f6c82818e1d patches/ecj/icedtea-hotspot-default.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-hotspot-default.patch Sat Feb 14 00:44:26 2009 +0000
@@ -0,0 +1,48 @@
+diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile
+--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-10-24 10:16:06.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-24 13:32:48.000000000 +0100
+@@ -263,28 +263,24 @@
+
+ $(TARGETS_C2): $(SUBDIRS_C2)
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_TIERED): $(SUBDIRS_TIERED)
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_C1): $(SUBDIRS_C1)
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+
+ $(TARGETS_CORE): $(SUBDIRS_CORE)
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
+- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
+ ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make
+--- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-10-24 10:16:06.000000000 +0100
++++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-24 13:32:48.000000000 +0100
+@@ -74,8 +74,8 @@
+ mkdir -p $(SA_CLASSDIR); \
+ fi
+
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
+- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
+
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+
+
diff -r 30659285afdb -r 2f6c82818e1d patches/hotspot/14.0b08/icedtea-6791168.patch
--- a/patches/hotspot/14.0b08/icedtea-6791168.patch Fri Feb 13 15:27:01 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
---- openjdk/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp 2009-01-13 10:17:05.000000000 +0000
-@@ -594,7 +594,7 @@
- __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), rax);
-
- // for c++ interpreter can rsi really be munged?
-- __ lea(state, Address(rbp, -sizeof(BytecodeInterpreter))); // restore state
-+ __ lea(state, Address(rbp, -(int)sizeof(BytecodeInterpreter))); // restore state
- __ movptr(rbx, Address(state, byte_offset_of(BytecodeInterpreter, _method))); // restore method
- __ movptr(rdi, Address(state, byte_offset_of(BytecodeInterpreter, _locals))); // get locals pointer
-
-@@ -658,7 +658,7 @@
- const Address size_of_stack (rbx, methodOopDesc::max_stack_offset());
- // Always give one monitor to allow us to start interp if sync method.
- // Any additional monitors need a check when moving the expression stack
-- const one_monitor = frame::interpreter_frame_monitor_size() * wordSize;
-+ const int one_monitor = frame::interpreter_frame_monitor_size() * wordSize;
- __ load_unsigned_word(rax, size_of_stack); // get size of expression stack in words
- __ lea(rax, Address(noreg, rax, Interpreter::stackElementScale(), one_monitor));
- __ lea(rax, Address(rax, rdx, Interpreter::stackElementScale(), overhead_size));
-@@ -1829,7 +1829,7 @@
- Label unwind_and_forward;
-
- // restore state pointer.
-- __ lea(state, Address(rbp, -sizeof(BytecodeInterpreter)));
-+ __ lea(state, Address(rbp, -(int)sizeof(BytecodeInterpreter)));
-
- __ movptr(rbx, STATE(_method)); // get method
- #ifdef _LP64
-@@ -1877,14 +1877,14 @@
-
- // The FPU stack is clean if UseSSE >= 2 but must be cleaned in other cases
- if (UseSSE < 2) {
-- __ lea(state, Address(rbp, -sizeof(BytecodeInterpreter)));
-+ __ lea(state, Address(rbp, -(int)sizeof(BytecodeInterpreter)));
- __ movptr(rbx, STATE(_result._to_call._callee)); // get method just executed
- __ movl(rcx, Address(rbx, methodOopDesc::result_index_offset()));
- __ cmpl(rcx, AbstractInterpreter::BasicType_as_index(T_FLOAT)); // Result stub address array index
- __ jcc(Assembler::equal, do_float);
- __ cmpl(rcx, AbstractInterpreter::BasicType_as_index(T_DOUBLE)); // Result stub address array index
- __ jcc(Assembler::equal, do_double);
--#ifdef COMPILER2
-+#if !defined(_LP64) || defined(COMPILER1) || !defined(COMPILER2)
- __ empty_FPU_stack();
- #endif // COMPILER2
- __ jmp(done_conv);
-@@ -1928,7 +1928,7 @@
-
- // Restore rsi/r13 as compiled code may not preserve it
-
-- __ lea(state, Address(rbp, -sizeof(BytecodeInterpreter)));
-+ __ lea(state, Address(rbp, -(int)sizeof(BytecodeInterpreter)));
-
- // restore stack to what we had when we left (in case i2c extended it)
-
-@@ -1942,7 +1942,7 @@
- #else
- __ movptr(rcx, STATE(_thread)); // get thread
- __ cmpptr(Address(rcx, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
--#endif / __LP64
-+#endif // _LP64
- __ jcc(Assembler::notZero, return_with_exception);
-
- // get method just executed
---- openjdk/hotspot/src/cpu/x86/vm/frame_x86.inline.hpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/frame_x86.inline.hpp 2009-01-13 10:17:05.000000000 +0000
-@@ -139,7 +139,7 @@
- #ifdef CC_INTERP
-
- inline interpreterState frame::get_interpreterState() const {
-- return ((interpreterState)addr_at( -sizeof(BytecodeInterpreter)/wordSize ));
-+ return ((interpreterState)addr_at( -((int)sizeof(BytecodeInterpreter))/wordSize ));
- }
-
- inline intptr_t* frame::sender_sp() const {
---- openjdk/hotspot/src/cpu/x86/vm/assembler_x86.cpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/assembler_x86.cpp 2009-01-13 10:17:05.000000000 +0000
-@@ -6943,29 +6943,32 @@
-
- Label slow_case, done;
-
-- // x ?<= pi/4
-- fld_d(ExternalAddress((address)&pi_4));
-- fld_s(1); // Stack: X PI/4 X
-- fabs(); // Stack: |X| PI/4 X
-- fcmp(tmp);
-- jcc(Assembler::above, slow_case);
--
-- // fastest case: -pi/4 <= x <= pi/4
-- switch(trig) {
-- case 's':
-- fsin();
-- break;
-- case 'c':
-- fcos();
-- break;
-- case 't':
-- ftan();
-- break;
-- default:
-- assert(false, "bad intrinsic");
-- break;
-+ ExternalAddress pi4_adr = (address)&pi_4;
-+ if (reachable(pi4_adr)) {
-+ // x ?<= pi/4
-+ fld_d(pi4_adr); // ExternalAddress((address)&pi_4));
-+ fld_s(1); // Stack: X PI/4 X
-+ fabs(); // Stack: |X| PI/4 X
-+ fcmp(tmp);
-+ jcc(Assembler::above, slow_case);
-+
-+ // fastest case: -pi/4 <= x <= pi/4
-+ switch(trig) {
-+ case 's':
-+ fsin();
-+ break;
-+ case 'c':
-+ fcos();
-+ break;
-+ case 't':
-+ ftan();
-+ break;
-+ default:
-+ assert(false, "bad intrinsic");
-+ break;
-+ }
-+ jmp(done);
- }
-- jmp(done);
-
- // slow case: runtime call
- bind(slow_case);
---- openjdk/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp 2009-01-13 10:17:05.000000000 +0000
-@@ -2954,10 +2954,16 @@
- __ pushptr(Address(rcx, 0)); // Save return address
- __ enter(); // Save old & set new rbp
- __ subptr(rsp, rbx); // Prolog
-+#ifdef CC_INTERP
-+ __ movptr(Address(rbp,
-+ -(sizeof(BytecodeInterpreter)) + in_bytes(byte_offset_of(BytecodeInterpreter, _sender_sp))),
-+ sender_sp); // Make it walkable
-+#else // CC_INTERP
- __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize),
- sender_sp); // Make it walkable
- // This value is corrected by layout_activation_impl
- __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD );
-+#endif // CC_INTERP
- __ mov(sender_sp, rsp); // Pass sender_sp to next frame
- __ addptr(rsi, wordSize); // Bump array pointer (sizes)
- __ addptr(rcx, wordSize); // Bump array pointer (pcs)
---- openjdk/hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp 2009-01-13 10:17:05.000000000 +0000
-@@ -213,7 +213,7 @@
-
- inline jint BytecodeInterpreter::VMintDiv(jint op1, jint op2) {
- /* it's possible we could catch this special case implicitly */
-- if (op1 == 0x80000000 && op2 == -1) return op1;
-+ if ((juint)op1 == 0x80000000 && op2 == -1) return op1;
- else return op1 / op2;
- }
-
-@@ -231,7 +231,7 @@
-
- inline jint BytecodeInterpreter::VMintRem(jint op1, jint op2) {
- /* it's possible we could catch this special case implicitly */
-- if (op1 == 0x80000000 && op2 == -1) return 0;
-+ if ((juint)op1 == 0x80000000 && op2 == -1) return 0;
- else return op1 % op2;
- }
-
---- openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2009-01-13 10:17:05.000000000 +0000
-@@ -30,7 +30,7 @@
-
- #ifdef CC_INTERP
- void InterpreterMacroAssembler::get_method(Register reg) {
-- movptr(reg, Address(rbp, -(sizeof(BytecodeInterpreter) + 2 * wordSize)));
-+ movptr(reg, Address(rbp, -((int)sizeof(BytecodeInterpreter) + 2 * wordSize)));
- movptr(reg, Address(reg, byte_offset_of(BytecodeInterpreter, _method)));
- }
- #endif // CC_INTERP
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp.orig 2009-01-13 10:16:45.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2009-01-13 10:17:05.000000000 +0000
-@@ -163,7 +163,7 @@
- #ifdef USELABELS
- // Have to do this dispatch this way in C++ because otherwise gcc complains about crossing an
- // initialization (which is is the initialization of the table pointer...)
--#define DISPATCH(opcode) goto *dispatch_table[opcode]
-+#define DISPATCH(opcode) goto *(void*)dispatch_table[opcode]
- #define CONTINUE { \
- opcode = *pc; \
- DO_UPDATE_INSTRUCTION_COUNT(opcode); \
-@@ -341,7 +341,7 @@
- */
- #undef CHECK_NULL
- #define CHECK_NULL(obj_) \
-- if ((obj_) == 0) { \
-+ if ((obj_) == NULL) { \
- VM_JAVA_ERROR(vmSymbols::java_lang_NullPointerException(), ""); \
- }
-
-@@ -1362,7 +1362,7 @@
-
- #define NULL_COMPARISON_NOT_OP(name) \
- CASE(_if##name): { \
-- int skip = (!(STACK_OBJECT(-1) == 0)) \
-+ int skip = (!(STACK_OBJECT(-1) == NULL)) \
- ? (int16_t)Bytes::get_Java_u2(pc + 1) : 3; \
- address branch_pc = pc; \
- UPDATE_PC_AND_TOS(skip, -1); \
-@@ -1372,7 +1372,7 @@
-
- #define NULL_COMPARISON_OP(name) \
- CASE(_if##name): { \
-- int skip = ((STACK_OBJECT(-1) == 0)) \
-+ int skip = ((STACK_OBJECT(-1) == NULL)) \
- ? (int16_t)Bytes::get_Java_u2(pc + 1) : 3; \
- address branch_pc = pc; \
- UPDATE_PC_AND_TOS(skip, -1); \
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp.orig 2009-01-13 10:15:42.000000000 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp 2009-01-13 10:17:05.000000000 +0000
-@@ -66,7 +66,6 @@
- friend class InterpreterGenerator;
- friend class InterpreterMacroAssembler;
- friend class frame;
--friend class SharedRuntime;
- friend class VMStructs;
-
- public:
diff -r 30659285afdb -r 2f6c82818e1d patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch
--- a/patches/hotspot/14.0b08/icedtea-bytecodeInterpreter.patch Fri Feb 13 15:27:01 2009 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
---- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp 2008-10-23 08:41:04.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp 2008-10-30 15:48:48.000000000 +0000
-@@ -60,7 +60,6 @@
- };
-
- class BytecodeInterpreter : StackObj {
--friend class SharedRuntime;
- friend class AbstractInterpreterGenerator;
- friend class CppInterpreterGenerator;
- friend class InterpreterGenerator;
diff -r 30659285afdb -r 2f6c82818e1d patches/hotspot/14.0b08/icedtea-core-build.patch
--- a/patches/hotspot/14.0b08/icedtea-core-build.patch Fri Feb 13 15:27:01 2009 -0500
+++ /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
-@@ -97,6 +97,7 @@
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-+ifndef ICEDTEA_CORE_BUILD
- ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
-@@ -111,3 +112,4 @@
- EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
- endif
- endif
-+endif
-diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile
---- openjdk.orig/hotspot/make/Makefile 2008-05-27 22:28:29.000000000 +0100
-+++ openjdk/hotspot/make/Makefile 2008-06-22 03:10:05.000000000 +0100
-@@ -91,6 +91,15 @@
- all_debug: jvmg jvmg1 jvmgkernel docs export_debug
- all_optimized: optimized optimized1 optimizedkernel docs export_optimized
-
-+# Core (non-compiler) targets made available with this Makefile
-+CORE_VM_TARGETS=productcore fastdebugcore optimizedcore jvmgcore
-+
-+allcore: all_productcore all_fastdebugcore
-+all_productcore: productcore docs export_product
-+all_fastdebugcore: fastdebugcore docs export_fastdebug
-+all_debugcore: jvmgcore docs export_debug
-+all_optimizedcore: optimizedcore docs export_optimized
-+
- # Do everything
- world: all create_jdk
-
-@@ -113,6 +122,10 @@
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT)
-
-+$(CORE_VM_TARGETS):
-+ $(CD) $(GAMMADIR)/make; \
-+ $(MAKE) VM_TARGET=$@ generic_buildcore $(ALT_OUT)
-+
- $(KERNEL_VM_TARGETS):
- $(CD) $(GAMMADIR)/make; \
- $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT)
-@@ -159,6 +172,12 @@
- $(MAKE_ARGS) $(VM_TARGET)
- endif
-
-+generic_buildcore:
-+ $(MKDIR) -p $(OUTPUTDIR)
-+ $(CD) $(OUTPUTDIR); \
-+ $(MAKE) -f $(ABS_OS_MAKEFILE) \
-+ $(MAKE_ARGS) $(VM_TARGET)
-+
- generic_buildkernel:
- $(MKDIR) -p $(OUTPUTDIR)
- ifeq ($(OSNAME),windows)
-@@ -205,13 +224,21 @@
- XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
- DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
- C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
-+ifdef ICEDTEA_CORE_BUILD
More information about the distro-pkg-dev
mailing list