diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2007-06-09 05:14:56 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2007-06-09 05:14:56 +0000 |
| commit | 01790521d1f58b3814db40f9bcc340faf54e9c9f (patch) | |
| tree | b9d63b3a22d203c194324a9704a910badab47a40 /java/jdk15/files/patch-hotspot::amd64::vm::amd64.ad | |
| parent | - Fix dependencies (diff) | |
. Update to patchset 5, based on the 1.5.0_11 JRL source code.
Notes
Notes:
svn path=/head/; revision=193076
Diffstat (limited to 'java/jdk15/files/patch-hotspot::amd64::vm::amd64.ad')
| -rw-r--r-- | java/jdk15/files/patch-hotspot::amd64::vm::amd64.ad | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/java/jdk15/files/patch-hotspot::amd64::vm::amd64.ad b/java/jdk15/files/patch-hotspot::amd64::vm::amd64.ad deleted file mode 100644 index dbf43fe16d5e..000000000000 --- a/java/jdk15/files/patch-hotspot::amd64::vm::amd64.ad +++ /dev/null @@ -1,13 +0,0 @@ ---- ../../hotspot/src/cpu/amd64/vm/amd64.ad.orig Thu May 24 15:27:42 2007 -+++ ../../hotspot/src/cpu/amd64/vm/amd64.ad Thu May 24 17:15:10 2007 -@@ -662,8 +662,8 @@ - { - #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"); -+ 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); |