28bb810af5
Merge patches for 1.9.2 mozilla branch from firefox 3.6.x port. While here, build lightning as a subpackage using --enable-calendar. Add @pkgpath/@conflict markers for seamless upgrades.
16 lines
545 B
Plaintext
16 lines
545 B
Plaintext
$OpenBSD: patch-mozilla_js_src_jslock_cpp,v 1.1 2010/07/27 17:01:16 landry Exp $
|
|
--- mozilla/js/src/jslock.cpp.orig Wed Jul 7 09:06:43 2010
|
|
+++ mozilla/js/src/jslock.cpp Wed Jul 7 09:07:22 2010
|
|
@@ -161,7 +161,11 @@ NativeCompareAndSwap(jsword *w, jsword ov, jsword nv)
|
|
|
|
__asm__ __volatile__ (
|
|
"stbar\n"
|
|
+#if defined (__sparc64__)
|
|
+ "casx [%1],%2,%3\n"
|
|
+#else
|
|
"cas [%1],%2,%3\n"
|
|
+#endif
|
|
"cmp %2,%3\n"
|
|
"be,a 1f\n"
|
|
"mov 1,%0\n"
|