|
From: <sv...@va...> - 2011-04-11 22:08:15
|
Author: sewardj
Date: 2011-04-11 23:08:06 +0100 (Mon, 11 Apr 2011)
New Revision: 11690
Log:
Make MacOS builds work again following fixes for #259977
(revs 11687,8,9)
Modified:
trunk/coregrind/m_coredump/coredump-macho.c
trunk/coregrind/m_initimg/initimg-darwin.c
trunk/coregrind/m_sigframe/sigframe-amd64-darwin.c
trunk/coregrind/m_sigframe/sigframe-x86-darwin.c
trunk/coregrind/m_syswrap/syswrap-amd64-darwin.c
trunk/coregrind/m_syswrap/syswrap-darwin.c
trunk/coregrind/m_syswrap/syswrap-main.c
trunk/coregrind/m_syswrap/syswrap-x86-darwin.c
Modified: trunk/coregrind/m_coredump/coredump-macho.c
===================================================================
--- trunk/coregrind/m_coredump/coredump-macho.c 2011-04-11 21:26:27 UTC (rev 11689)
+++ trunk/coregrind/m_coredump/coredump-macho.c 2011-04-11 22:08:06 UTC (rev 11690)
@@ -33,6 +33,7 @@
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_coredump.h"
+#include "pub_core_libcsetjmp.h" // to keep _threadstate.h happy
#include "pub_core_threadstate.h"
void VG_(make_coredump)(ThreadId tid, const vki_siginfo_t *si, UInt max_size)
Modified: trunk/coregrind/m_initimg/initimg-darwin.c
===================================================================
--- trunk/coregrind/m_initimg/initimg-darwin.c 2011-04-11 21:26:27 UTC (rev 11689)
+++ trunk/coregrind/m_initimg/initimg-darwin.c 2011-04-11 22:08:06 UTC (rev 11690)
@@ -47,6 +47,7 @@
#include "pub_core_ume.h"
#include "pub_core_options.h"
#include "pub_core_tooliface.h" /* VG_TRACK */
+#include "pub_core_libcsetjmp.h" // to keep _threadstate.h happy
#include "pub_core_threadstate.h" /* ThreadArchState */
#include "priv_initimg_pathscan.h"
#include "pub_core_initimg.h" /* self */
Modified: trunk/coregrind/m_sigframe/sigframe-amd64-darwin.c
===================================================================
--- trunk/coregrind/m_sigframe/sigframe-amd64-darwin.c 2011-04-11 21:26:27 UTC (rev 11689)
+++ trunk/coregrind/m_sigframe/sigframe-amd64-darwin.c 2011-04-11 22:08:06 UTC (rev 11690)
@@ -34,6 +34,7 @@
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
+#include "pub_core_libcsetjmp.h" // to keep _threadstate.h happy
#include "pub_core_threadstate.h"
#include "pub_core_aspacemgr.h"
#include "pub_core_libcbase.h"
Modified: trunk/coregrind/m_sigframe/sigframe-x86-darwin.c
===================================================================
--- trunk/coregrind/m_sigframe/sigframe-x86-darwin.c 2011-04-11 21:26:27 UTC (rev 11689)
+++ trunk/coregrind/m_sigframe/sigframe-x86-darwin.c 2011-04-11 22:08:06 UTC (rev 11690)
@@ -34,6 +34,7 @@
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
+#include "pub_core_libcsetjmp.h" // to keep _threadstate.h happy
#include "pub_core_threadstate.h"
#include "pub_core_aspacemgr.h"
#include "pub_core_libcbase.h"
Modified: trunk/coregrind/m_syswrap/syswrap-amd64-darwin.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-amd64-darwin.c 2011-04-11 21:26:27 UTC (rev 11689)
+++ trunk/coregrind/m_syswrap/syswrap-amd64-darwin.c 2011-04-11 22:08:06 UTC (rev 11690)
@@ -32,6 +32,7 @@
#include "pub_core_basics.h"
#include "pub_core_vki.h"
+#include "pub_core_libcsetjmp.h" // to keep _threadstate.h happy
#include "pub_core_threadstate.h"
#include "pub_core_aspacemgr.h"
#include "pub_core_xarray.h"
Modified: trunk/coregrind/m_syswrap/syswrap-darwin.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-darwin.c 2011-04-11 21:26:27 UTC (rev 11689)
+++ trunk/coregrind/m_syswrap/syswrap-darwin.c 2011-04-11 22:08:06 UTC (rev 11690)
@@ -33,6 +33,7 @@
#include "pub_core_basics.h"
#include "pub_core_vki.h"
#include "pub_core_vkiscnums.h"
+#include "pub_core_libcsetjmp.h" // to keep _threadstate.h happy
#include "pub_core_threadstate.h"
#include "pub_core_aspacemgr.h"
#include "pub_core_xarray.h"
Modified: trunk/coregrind/m_syswrap/syswrap-main.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-main.c 2011-04-11 21:26:27 UTC (rev 11689)
+++ trunk/coregrind/m_syswrap/syswrap-main.c 2011-04-11 22:08:06 UTC (rev 11690)
@@ -2267,7 +2267,7 @@
sci->status.what = SsIdle;
vg_assert(tst->sched_jmpbuf_valid);
- VG_MINIMAL_LONGJMP(tst->sched_jmpbuf, True);
+ VG_MINIMAL_LONGJMP(tst->sched_jmpbuf);
/* NOTREACHED */
vg_assert(0);
Modified: trunk/coregrind/m_syswrap/syswrap-x86-darwin.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-x86-darwin.c 2011-04-11 21:26:27 UTC (rev 11689)
+++ trunk/coregrind/m_syswrap/syswrap-x86-darwin.c 2011-04-11 22:08:06 UTC (rev 11690)
@@ -32,6 +32,7 @@
#include "pub_core_basics.h"
#include "pub_core_vki.h"
+#include "pub_core_libcsetjmp.h" // to keep _threadstate.h happy
#include "pub_core_threadstate.h"
#include "pub_core_aspacemgr.h"
#include "pub_core_xarray.h"
|