Mercurial > hg > release > icedtea6-1.9
changeset 2055:79cc1edfadb1
Remove upstreamed Zero patch.
2010-04-09 Andrew John Hughes <ahughes@redhat.com>
* patches/zero/6939845.patch,
* Makefile.am:
Remove upstreamed Zero patch.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Sat, 10 Apr 2010 00:50:51 +0100 |
| parents | c4d1a639219e |
| children | 18c52f572f18 |
| files | ChangeLog Makefile.am patches/zero/6939845.patch |
| diffstat | 3 files changed, 6 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Apr 10 00:49:57 2010 +0100 +++ b/ChangeLog Sat Apr 10 00:50:51 2010 +0100 @@ -1,3 +1,9 @@ +2010-04-09 Andrew John Hughes <ahughes@redhat.com> + + * patches/zero/6939845.patch, + * Makefile.am: + Remove upstreamed Zero patch. + 2010-04-09 Xerxes Rånby <xerxes@zafena.se> * Makefile.am (ICEDTEA_PATCHES):
--- a/Makefile.am Sat Apr 10 00:49:57 2010 +0100 +++ b/Makefile.am Sat Apr 10 00:50:51 2010 +0100 @@ -224,7 +224,6 @@ ICEDTEA_FSG_PATCHES = ICEDTEA_PATCHES = \ - patches/zero/6939845.patch \ patches/icedtea-notice-safepoints.patch \ patches/icedtea-parisc-opt.patch \ patches/icedtea-lucene-crash.patch \
--- a/patches/zero/6939845.patch Sat Apr 10 00:49:57 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ ---- openjdk.old/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed Mar 31 11:55:22 2010 -+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed Mar 31 11:55:22 2010 -@@ -2328,6 +2328,17 @@ - } - - DEFAULT: -+#ifdef ZERO -+ // Some zero configurations use the C++ interpreter as a -+ // fallback interpreter and have support for platform -+ // specific fast bytecodes which aren't supported here, so -+ // redispatch to the equivalent non-fast bytecode when they -+ // are encountered. -+ if (Bytecodes::is_defined((Bytecodes::Code)opcode)) { -+ opcode = (jubyte)Bytecodes::java_code((Bytecodes::Code)opcode); -+ goto opcode_switch; -+ } -+#endif - fatal2("\t*** Unimplemented opcode: %d = %s\n", - opcode, Bytecodes::name((Bytecodes::Code)opcode)); - goto finish;