# HG changeset patch
# User twisti
# Date 1262604880 28800
# Node ID 4dfa5956fbb99411b1dab6fea423400a328059d8
# Parent  b6f7db60cb24612ddfd9dec9ba8155a2c0dde421
6913869: Zero assert fix
Summary: Zero currently won't build on zSeries or PowerPC machines with assertions turned on.
Reviewed-by: twisti
Contributed-by: Gary Benson <gbenson@redhat.com>

diff -r b6f7db60cb24 -r 4dfa5956fbb9 hotspot/src/share/vm/prims/jni.cpp
--- a/hotspot/src/share/vm/prims/jni.cpp	Mon Jan 04 00:22:57 2010 -0800
+++ b/hotspot/src/share/vm/prims/jni.cpp	Mon Jan 04 03:34:40 2010 -0800
@@ -3241,7 +3241,7 @@
     jint b = Atomic::xchg(0xdeadbeef, &a);
     void *c = &a;
     void *d = Atomic::xchg_ptr(&b, &c);
-    assert(a == 0xdeadbeef && b == (jint) 0xcafebabe, "Atomic::xchg() works");
+    assert(a == (jint) 0xdeadbeef && b == (jint) 0xcafebabe, "Atomic::xchg() works");
     assert(c == &b && d == &a, "Atomic::xchg_ptr() works");
   }
 #endif // ZERO && ASSERT