changeset in /hg/icedtea: Make Zero build on IcedTea7 again.
Andrew John Hughes
gnu_andrew at member.fsf.org
Fri Nov 7 07:39:01 PST 2008
changeset abc8a694096f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=abc8a694096f
description:
Make Zero build on IcedTea7 again.
2008-11-07 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Remove unneeded citypeflow fix,
move zero patching to the end.
* patches/icedtea-bytecodeInterpreter.patch,
* patches/icedtea-hotspot7-build-fixes.patch:
Regenerated.
* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp,
* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp,
* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp:
Updated for HotSpot 14 b05.
2008-10-30 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add bootstrap-directory-symlink
target to icedtea-ecj so it works as the user-specified
make target.
diffstat:
9 files changed, 50 insertions(+), 52 deletions(-)
ChangeLog | 20 ++++++++++++
Makefile.am | 17 ++++------
patches/icedtea-bytecodeInterpreter.patch | 31 +------------------
patches/icedtea-hotspot7-build-fixes.patch | 4 +-
ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp | 2 -
ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp | 1
ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp | 17 ++++------
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 2 -
ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp | 8 ++++
diffs (221 lines):
diff -r c3e121763e20 -r abc8a694096f ChangeLog
--- a/ChangeLog Wed Oct 29 18:29:19 2008 +0000
+++ b/ChangeLog Fri Nov 07 15:38:49 2008 +0000
@@ -1,3 +1,23 @@ 2008-10-29 Andrew John Hughes <ahughes
+2008-11-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Remove unneeded citypeflow fix,
+ move zero patching to the end.
+ * patches/icedtea-bytecodeInterpreter.patch,
+ * patches/icedtea-hotspot7-build-fixes.patch:
+ Regenerated.
+ * ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp,
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp,
+ * ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp:
+ Updated for HotSpot 14 b05.
+
+2008-10-30 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add bootstrap-directory-symlink
+ target to icedtea-ecj so it works as the user-specified
+ make target.
+
2008-10-29 Andrew John Hughes <ahughes at redhat.com>
Merge from IcedTea6 1.3.1.
diff -r c3e121763e20 -r abc8a694096f Makefile.am
--- a/Makefile.am Wed Oct 29 18:29:19 2008 +0000
+++ b/Makefile.am Fri Nov 07 15:38:49 2008 +0000
@@ -499,8 +499,7 @@ ZERO_PATCHES = \
patches/icedtea-signature-iterator.patch \
patches/icedtea-test-atomic-operations.patch \
patches/icedtea-zero.patch \
- patches/icedtea-ia64-bugfix.patch \
- patches/icedtea-hotspot-citypeflow.patch
+ patches/icedtea-ia64-bugfix.patch
# Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
NON_ZERO_PATCHES =
@@ -523,7 +522,6 @@ ICEDTEA_FSG_PATCHES = \
patches/icedtea-jscheme.patch
ICEDTEA_PATCHES = \
- $(ZERO_PATCHES_COND) \
patches/icedtea-copy-plugs.patch \
patches/icedtea-version.patch \
patches/icedtea-text-relocations.patch \
@@ -561,7 +559,6 @@ ICEDTEA_PATCHES = \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
- $(ZERO_PATCHES_COND) \
patches/icedtea-no-bcopy.patch \
patches/icedtea-shark-build.patch \
patches/icedtea-toolkit.patch \
@@ -586,7 +583,8 @@ ICEDTEA_PATCHES = \
$(VISUALVM_PATCH) \
patches/icedtea-javac-debuginfo.patch \
patches/icedtea-xjc.patch \
- patches/icedtea-renderer-crossing.patch
+ patches/icedtea-renderer-crossing.patch \
+ $(ZERO_PATCHES_COND)
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -827,7 +825,7 @@ stamps/native-ecj.stamp: stamps/patch.st
fi ; \
touch stamps/native-ecj.stamp
-stamps/overlay.stamp: stamps/native-ecj.stamp
+stamps/overlay.stamp:
if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
fi ; \
@@ -1239,7 +1237,8 @@ stamps/native-ecj.stamp:
fi ; \
touch stamps/native-ecj.stamp
-stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
+stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
+ stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
$(MAKE) \
$(ICEDTEA_ENV_ECJ) \
@@ -1273,9 +1272,7 @@ clean-icedtea-ecj: stamps/clone-ecj.stam
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj clobber
-stamps/icedtea-against-ecj.stamp: \
- stamps/bootstrap-directory-symlink-ecj.stamp \
- stamps/icedtea-ecj.stamp
+stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp
mkdir -p stamps
touch stamps/icedtea-against-ecj.stamp
diff -r c3e121763e20 -r abc8a694096f patches/icedtea-bytecodeInterpreter.patch
--- a/patches/icedtea-bytecodeInterpreter.patch Wed Oct 29 18:29:19 2008 +0000
+++ b/patches/icedtea-bytecodeInterpreter.patch Fri Nov 07 15:38:49 2008 +0000
@@ -1,6 +1,6 @@ diff -r b3238230c1ef openjdk/hotspot/src
-diff -r b3238230c1ef openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp Fri Nov 02 10:14:32 2007 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp Fri Nov 02 10:15:45 2007 +0000
+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 @@
};
@@ -9,28 +9,3 @@ diff -r b3238230c1ef openjdk/hotspot/src
friend class AbstractInterpreterGenerator;
friend class CppInterpreterGenerator;
friend class InterpreterGenerator;
-diff -r bae119bcbcd0 openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Nov 02 15:08:47 2007 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Nov 02 15:21:08 2007 +0000
-@@ -518,16 +518,16 @@
-
- /* 0xC0 */ &&opc_checkcast, &&opc_instanceof, &&opc_monitorenter, &&opc_monitorexit,
- /* 0xC4 */ &&opc_wide, &&opc_multianewarray, &&opc_ifnull, &&opc_ifnonnull,
--/* 0xC8 */ &&opc_goto_w, &&opc_jsr_w, &&opc_breakpoint, &&opc_fast_igetfield,
--/* 0xCC */ &&opc_fastagetfield,&&opc_fast_aload_0, &&opc_fast_iaccess_0, &&opc__fast_aaccess_0,
--
--/* 0xD0 */ &&opc_fast_linearswitch, &&opc_fast_binaryswitch, &&opc_return_register_finalizer, &&opc_default,
-+/* 0xC8 */ &&opc_goto_w, &&opc_jsr_w, &&opc_breakpoint, &&opc_default,
-+/* 0xCC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
-+
-+/* 0xD0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
- /* 0xD4 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
- /* 0xD8 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
- /* 0xDC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
-
- /* 0xE0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
--/* 0xE4 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
-+/* 0xE4 */ &&opc_default, &&opc_return_register_finalizer, &&opc_default, &&opc_default,
- /* 0xE8 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
- /* 0xEC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
-
diff -r c3e121763e20 -r abc8a694096f patches/icedtea-hotspot7-build-fixes.patch
--- a/patches/icedtea-hotspot7-build-fixes.patch Wed Oct 29 18:29:19 2008 +0000
+++ b/patches/icedtea-hotspot7-build-fixes.patch Fri Nov 07 15:38:49 2008 +0000
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/hotspot/src/share
diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-27 22:41:12.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-05-28 11:58:57.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp 2008-10-30 17:10:16.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp 2008-10-30 17:11:34.000000000 +0000
@@ -88,9 +88,6 @@
#define VMLP ""
#endif
diff -r c3e121763e20 -r abc8a694096f ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Wed Oct 29 18:29:19 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp Fri Nov 07 15:38:49 2008 +0000
@@ -44,7 +44,7 @@ class MacroAssembler : public Assembler
void align(int modulus);
void bang_stack_with_offset(int offset);
-
+ bool needs_explicit_null_check(intptr_t offset);
public:
void advance(int bytes);
};
diff -r c3e121763e20 -r abc8a694096f ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp Wed Oct 29 18:29:19 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp Fri Nov 07 15:38:49 2008 +0000
@@ -47,3 +47,4 @@ void Disassembler::decode(u_char *begin,
Unimplemented();
}
#endif // PRODUCT
+
diff -r c3e121763e20 -r abc8a694096f ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp Wed Oct 29 18:29:19 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp Fri Nov 07 15:38:49 2008 +0000
@@ -26,13 +26,10 @@
// The disassembler prints out zero code annotated
// with Java specific information.
-class Disassembler
-{
- public:
- static void decode(CodeBlob *cb, outputStream *st = NULL)
- PRODUCT_RETURN;
- static void decode(nmethod *nm, outputStream *st = NULL)
- PRODUCT_RETURN;
- static void decode(u_char *begin, u_char *end, outputStream *st = NULL)
- PRODUCT_RETURN;
-};
+ static int pd_instruction_alignment() {
+ Unimplemented();
+ }
+
+ static const char* pd_cpu_opts() {
+ Unimplemented();
+ }
diff -r c3e121763e20 -r abc8a694096f ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Wed Oct 29 18:29:19 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp Fri Nov 07 15:38:49 2008 +0000
@@ -125,7 +125,7 @@ void frame::pd_gc_epilog()
{
}
-bool frame::is_interpreted_frame_valid() const
+bool frame::is_interpreted_frame_valid(JavaThread *thread) const
{
Unimplemented();
}
diff -r c3e121763e20 -r abc8a694096f ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp Wed Oct 29 18:29:19 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp Fri Nov 07 15:38:49 2008 +0000
@@ -66,3 +66,11 @@ void Relocation::pd_swap_out_breakpoint(
{
Unimplemented();
}
+
+void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer *dest) {
+ Unimplemented();
+}
+
+void poll_return_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) {
+ Unimplemented();
+}
More information about the distro-pkg-dev
mailing list