From: Julian Seward Date: Fri, 20 Jun 2014 13:29:31 +0000 (+0000) Subject: Mac OS X 10.9 improvements. Bug 326724 comment 27 patch name X-Git-Tag: svn/VALGRIND_3_10_0~376 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbcf9671743c647df816a2e1d8416a7270e4816c;p=thirdparty%2Fvalgrind.git 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, frederic.germain@gmail.com) git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14061 --- diff --git a/coregrind/m_syswrap/syswrap-amd64-darwin.c b/coregrind/m_syswrap/syswrap-amd64-darwin.c index 90cb4fe292..77a583edf3 100644 --- a/coregrind/m_syswrap/syswrap-amd64-darwin.c +++ b/coregrind/m_syswrap/syswrap-amd64-darwin.c @@ -476,8 +476,13 @@ void wqthread_hijack(Addr self, Addr kport, Addr stackaddr, Addr workitem, 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