Mercurial > hg > icedtea9
changeset 2347:24c32ab62605
Get 6977640 changeset from upstream forest instead.
2010-09-07 Andrew John Hughes <ahughes@redhat.com>
* patches/icedtea-6977640.patch: Dropped.
* Makefile.am: Drop above patch and bump
HotSpot changeset/hash to incorporate change
instead.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Tue, 07 Sep 2010 23:34:25 +0100 |
parents | 8197d06d05e5 |
children | 48e9cd4206ad |
files | ChangeLog Makefile.am patches/icedtea-6977640.patch |
diffstat | 3 files changed, 10 insertions(+), 112 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Sep 07 13:23:01 2010 +0200 +++ b/ChangeLog Tue Sep 07 23:34:25 2010 +0100 @@ -1,3 +1,10 @@ +2010-09-07 Andrew John Hughes <ahughes@redhat.com> + + * patches/icedtea-6977640.patch: Dropped. + * Makefile.am: Drop above patch and bump + HotSpot changeset/hash to incorporate change + instead. + 2010-09-07 Matthias Klose <doko@ubuntu.com> PR icedtea/543
--- a/Makefile.am Tue Sep 07 13:23:01 2010 +0200 +++ b/Makefile.am Tue Sep 07 23:34:25 2010 +0100 @@ -3,7 +3,7 @@ OPENJDK_VERSION = b106 CORBA_CHANGESET = 00a2834117ff -HOTSPOT_CHANGESET = a30c85eed5d5 +HOTSPOT_CHANGESET = 7f4113719dc5 JAXP_CHANGESET = 679653c22ae1 JAXWS_CHANGESET = 191a3ec51d79 JDK_CHANGESET = a094068f4c7b @@ -11,7 +11,7 @@ OPENJDK_CHANGESET = b79fce47b7c6 CORBA_SHA256SUM = 5648b189c94df46bbec9bc7c8640957befffbde68ff7ef9f8f8de9bd7fbe8e7d -HOTSPOT_SHA256SUM = 93f71928d061f86f6a18f224f92ac217ea4dcc324183b029ece9a862c445714d +HOTSPOT_SHA256SUM = 8ff4445304680ca7b09edd2b5713e5c04b0f68308c593d84429691ff4f7e8cfb JAXP_SHA256SUM = c7d58a5dd2859ccb8b2d0897a26ce9b37895f530a94a5912179afc25cc1d14ea JAXWS_SHA256SUM = 6fd65fd23c085c9c89f904da1b6448460af32d97d76bb0ba49630ee61d70a4d6 JDK_SHA256SUM = 8b20e0686667a03cf028d57695b4bc2196c51db2d9c0873db7694624c384c446 @@ -339,8 +339,7 @@ patches/extensions/netx.patch \ patches/extensions/netx-dist.patch \ patches/extensions/netx-umask.patch \ - patches/jtreg-httpTest.patch \ - patches/icedtea-6977640.patch + patches/jtreg-httpTest.patch # Conditional patches
--- a/patches/icedtea-6977640.patch Tue Sep 07 13:23:01 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,108 +0,0 @@ - -# 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@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; -