/hg/icedtea: 2 new changesets
doko at icedtea.classpath.org
doko at icedtea.classpath.org
Tue Sep 7 04:29:23 PDT 2010
changeset 90d1974ff380 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=90d1974ff380
author: doko at ubuntu.com
date: Tue Sep 07 13:22:12 2010 +0200
PR icedtea/543, fix zero build failure.
2010-09-07 Matthias Klose <doko at ubuntu.com>
PR icedtea/543
* patches/icedtea-6977640.patch: New, fix zero build failure.
* Makefile.am (ICEDTEA_PATCHES): Apply.
changeset 8197d06d05e5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8197d06d05e5
author: doko at ubuntu.com
date: Tue Sep 07 13:23:01 2010 +0200
Revert unintended change to .hgignore
diffstat:
3 files changed, 116 insertions(+), 1 deletion(-)
ChangeLog | 6 ++
Makefile.am | 3 -
patches/icedtea-6977640.patch | 108 +++++++++++++++++++++++++++++++++++++++++
diffs (138 lines):
diff -r 6ec76d7f5601 -r 8197d06d05e5 ChangeLog
--- a/ChangeLog Tue Sep 07 12:57:46 2010 +0200
+++ b/ChangeLog Tue Sep 07 13:23:01 2010 +0200
@@ -1,3 +1,9 @@ 2010-09-07 Matthias Klose <doko at ubuntu
+2010-09-07 Matthias Klose <doko at ubuntu.com>
+
+ PR icedtea/543
+ * patches/icedtea-6977640.patch: New, fix zero build failure.
+ * Makefile.am (ICEDTEA_PATCHES): Apply.
+
2010-09-07 Matthias Klose <doko at ubuntu.com>
* Makefile.am: Bump cacao version to changeset including build
diff -r 6ec76d7f5601 -r 8197d06d05e5 Makefile.am
--- a/Makefile.am Tue Sep 07 12:57:46 2010 +0200
+++ b/Makefile.am Tue Sep 07 13:23:01 2010 +0200
@@ -339,7 +339,8 @@ ICEDTEA_PATCHES = \
patches/extensions/netx.patch \
patches/extensions/netx-dist.patch \
patches/extensions/netx-umask.patch \
- patches/jtreg-httpTest.patch
+ patches/jtreg-httpTest.patch \
+ patches/icedtea-6977640.patch
# Conditional patches
diff -r 6ec76d7f5601 -r 8197d06d05e5 patches/icedtea-6977640.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-6977640.patch Tue Sep 07 13:23:01 2010 +0200
@@ -0,0 +1,108 @@
+
+# HG changeset patch
+# User twisti
+# Date 1282119736 25200
+# Node ID 13b87063b4d8dea40ba97a283ad5bd3272e876f3
+# Parent a62d332029cf3a8c710687b833d71966e078bbdc
+6977640: Zero and Shark fixes
+Summary: A number of fixes for Zero and Shark.
+Reviewed-by: twisti
+Contributed-by: Gary Benson <gbenson at redhat.com>
+
+--- openjdk/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp Fri Aug 13 15:14:00 2010 -0700
++++ openjdk/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp Wed Aug 18 01:22:16 2010 -0700
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2007 Red Hat, Inc.
++ * Copyright 2007, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -268,7 +268,7 @@ inline jint BytecodeInterpreter::VMintSu
+ return op1 - op2;
+ }
+
+-inline jint BytecodeInterpreter::VMintUshr(jint op1, jint op2) {
++inline juint BytecodeInterpreter::VMintUshr(jint op1, jint op2) {
+ return ((juint) op1) >> (op2 & 0x1F);
+ }
+
+--- openjdk/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp Fri Aug 13 15:14:00 2010 -0700
++++ openjdk/hotspot/src/cpu/zero/vm/javaFrameAnchor_zero.hpp Wed Aug 18 01:22:16 2010 -0700
+@@ -82,6 +82,10 @@
+ return _last_Java_fp;
+ }
+
++ address last_Java_pc() const {
++ return _last_Java_pc;
++ }
++
+ static ByteSize last_Java_fp_offset() {
+ return byte_offset_of(JavaFrameAnchor, _last_Java_fp);
+ }
+--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Fri Aug 13 15:14:00 2010 -0700
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Wed Aug 18 01:22:16 2010 -0700
+@@ -435,22 +435,22 @@ extern "C" {
+ void _Copy_arrayof_conjoint_bytes(HeapWord* from,
+ HeapWord* to,
+ size_t count) {
+- ShouldNotCallThis();
++ memmove(to, from, count);
+ }
+ void _Copy_arrayof_conjoint_jshorts(HeapWord* from,
+ HeapWord* to,
+ size_t count) {
+- ShouldNotCallThis();
++ memmove(to, from, count * 2);
+ }
+ void _Copy_arrayof_conjoint_jints(HeapWord* from,
+ HeapWord* to,
+ size_t count) {
+- ShouldNotCallThis();
++ memmove(to, from, count * 4);
+ }
+ void _Copy_arrayof_conjoint_jlongs(HeapWord* from,
+ HeapWord* to,
+ size_t count) {
+- ShouldNotCallThis();
++ memmove(to, from, count * 8);
+ }
+ };
+
+--- openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp Fri Aug 13 15:14:00 2010 -0700
++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp Wed Aug 18 01:22:16 2010 -0700
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2009 Red Hat, Inc.
++ * Copyright 2009, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -23,6 +23,9 @@
+ *
+ */
+
+-// This file is intentionally empty
++#include "incls/_precompiled.incl"
++#include "incls/_thread_linux_zero.cpp.incl"
+
+-void JavaThread::cache_global_variables() { }
++void JavaThread::cache_global_variables() {
++ // nothing to do
++}
+--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Fri Aug 13 15:14:00 2010 -0700
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed Aug 18 01:22:16 2010 -0700
+@@ -421,7 +421,9 @@ BytecodeInterpreter::run(interpreterStat
+ #ifdef ASSERT
+ if (istate->_msg != initialize) {
+ assert(abs(istate->_stack_base - istate->_stack_limit) == (istate->_method->max_stack() + 1), "bad stack limit");
+- IA32_ONLY(assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1, "wrong"));
++#ifndef SHARK
++ IA32_ONLY(assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1, "wrong"));
++#endif // !SHARK
+ }
+ // Verify linkages.
+ interpreterState l = istate;
+
More information about the distro-pkg-dev
mailing list