# HG changeset patch
# User twisti
# Date 1262604880 28800
# Node ID 896da934748c59a71375383a7658e91a48e90f28
# Parent  40e7c1d24e4aa2bb4fcb78e0ef19668f7af3324a
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 40e7c1d24e4a -r 896da934748c src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp	Mon Jan 04 00:22:57 2010 -0800
+++ b/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