|
From: <sv...@va...> - 2014-06-20 13:29:39
|
Author: sewardj
Date: Fri Jun 20 13:29:31 2014
New Revision: 14061
Log:
Mac OS X 10.9 improvements. Bug 326724 comment 27 patch name
"0004-wqthread_hijack-fix-magic_delta-on-darwin-10.9.patch"
(Frederic Germain, fre...@gm...)
Modified:
trunk/coregrind/m_syswrap/syswrap-amd64-darwin.c
Modified: trunk/coregrind/m_syswrap/syswrap-amd64-darwin.c
==============================================================================
--- trunk/coregrind/m_syswrap/syswrap-amd64-darwin.c (original)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-darwin.c Fri Jun 20 13:29:31 2014
@@ -476,8 +476,13 @@
idea why. */
# if DARWIN_VERS <= DARWIN_10_6
UWord magic_delta = 0;
-# elif DARWIN_VERS >= DARWIN_10_7
+# elif DARWIN_VERS == DARWIN_10_7 || DARWIN_VERS == DARWIN_10_8
UWord magic_delta = 0x60;
+# elif DARWIN_VERS == DARWIN_10_9
+ UWord magic_delta = 0xE0;
+# else
+# error "magic_delta: to be computed on new OS version"
+ // magic_delta = tst->os_state.pthread - self
# endif
// This thread already exists; we're merely re-entering
|