diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2007-05-25 18:44:27 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2007-05-25 18:44:27 +0000 |
| commit | 7446ea7a70abb17206c2d63b7369fe2dbe4683c1 (patch) | |
| tree | 2a7658d09bba2cebe4097c381677b942c1fa639c /java/jdk15/files/patch-hotspot::i486::vm::i486.ad | |
| parent | - update to 1.2.1 (diff) | |
Various fixes for -CURRENT.
- Build fixes after GCC 4.2 import.
- Remove SIGRTMIN and SIGRTMAX redefinitions.
- Use posix_memalign(3) instead of valloc(3).
Approved by: glewis (maintainer)
Notes
Notes:
svn path=/head/; revision=191828
Diffstat (limited to 'java/jdk15/files/patch-hotspot::i486::vm::i486.ad')
| -rw-r--r-- | java/jdk15/files/patch-hotspot::i486::vm::i486.ad | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/java/jdk15/files/patch-hotspot::i486::vm::i486.ad b/java/jdk15/files/patch-hotspot::i486::vm::i486.ad new file mode 100644 index 000000000000..e0d91e628a78 --- /dev/null +++ b/java/jdk15/files/patch-hotspot::i486::vm::i486.ad @@ -0,0 +1,14 @@ +--- ../../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); |