From a4adb6665f97a793de92e224ee62532f20685a8e Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Fri, 27 Jul 2007 03:48:46 +0000 Subject: . Update to patchset 6, based on 1.5.0 Update 12. . Use the -bc (backwards compatible) flag when doing time zone updates. --- java/jdk15/files/patch-hotspot::i486::vm::i486.ad | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 java/jdk15/files/patch-hotspot::i486::vm::i486.ad (limited to 'java/jdk15/files/patch-hotspot::i486::vm::i486.ad') diff --git a/java/jdk15/files/patch-hotspot::i486::vm::i486.ad b/java/jdk15/files/patch-hotspot::i486::vm::i486.ad deleted file mode 100644 index e0d91e628a78..000000000000 --- a/java/jdk15/files/patch-hotspot::i486::vm::i486.ad +++ /dev/null @@ -1,14 +0,0 @@ ---- ../../hotspot/src/cpu/i486/vm/i486.ad.orig Thu May 24 15:27:42 2007 -+++ ../../hotspot/src/cpu/i486/vm/i486.ad Thu May 24 19:47:30 2007 -@@ -383,8 +383,9 @@ - void emit_d32_reloc(CodeBuffer &cbuf, int d32, RelocationHolder const& rspec, - int format) { - #ifdef ASSERT -- if (rspec.reloc()->type() == relocInfo::oop_type && d32 != 0 && d32 != (int)Universe::non_oop_word()) { -- assert(oop(d32)->is_oop() && oop(d32)->is_perm(), "cannot embed non-perm oops in code"); -+ if (rspec.reloc()->type() == relocInfo::oop_type && -+ d32 != 0 && d32 != (intptr_t)Universe::non_oop_word()) { -+ assert(oop((intptr_t)d32)->is_oop() && oop((intptr_t)d32)->is_perm(), "cannot embed non-perm oops in code"); - } - #endif - cbuf.relocate(cbuf.mark(), rspec, format); -- cgit v1.2.3