From: Julian Seward <jseward@acm.org>
Date: Wed, 21 Jul 2010 16:34:47 +0000 (+0000)
Subject: Use the wrapper for sys___semwait_signal for 10.5 also on 10.6,
X-Git-Tag: svn/VALGRIND_3_6_0~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3270201d651c9f5c1a7a86f5f6b65d232b5b5c27;p=thirdparty%2Fvalgrind.git

Use the wrapper for sys___semwait_signal for 10.5 also on 10.6,
rather than have a different one for 10.6.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11221
---

diff --git a/coregrind/m_syswrap/syswrap-darwin.c b/coregrind/m_syswrap/syswrap-darwin.c
index 2652fbbbe2..7a61a82c95 100644
--- a/coregrind/m_syswrap/syswrap-darwin.c
+++ b/coregrind/m_syswrap/syswrap-darwin.c
@@ -7114,7 +7114,6 @@ PRE(semaphore_timedwait_signal)
 }
 
 
-#if DARWIN_VERS <= DARWIN_10_5
 PRE(__semwait_signal)
 {
    /* 10.5 args: int cond_sem, int mutex_sem,
@@ -7129,25 +7128,26 @@ PRE(__semwait_signal)
 
    *flags |= SfMayBlock;
 }
-#else
-PRE(__semwait_signal)
-{
-   /* 10.5 args: int cond_sem, int mutex_sem,
-                 int timeout, int relative,
-                 const timespec *ts */
-   PRINT("__semwait_signal(wait %s, signal %s, %ld, %ld, %#lx)", 
-         name_for_port(ARG1), name_for_port(ARG2), ARG3, ARG4, ARG5);
-   PRE_REG_READ5(int, "__semwait_signal", 
-                 int,cond_sem, int,mutex_sem,
-                 int,timeout, int,relative, 
-                 const struct vki_timespec *,ts);
-   
-   if (ARG5) PRE_MEM_READ ("__semwait_signal(ts)", 
-                           ARG5, sizeof(struct vki_timespec));
-   
-   *flags |= SfMayBlock;
-}
-#endif
+// GrP provided this alternative version for 10.6, but NjN
+// reckons the 10.5 is is still correct for 10.6.  So, retaining
+// Greg's version as a comment just in case we need it later.
+//PRE(__semwait_signal)
+//{
+//   /* 10.5 args: int cond_sem, int mutex_sem,
+//                 int timeout, int relative,
+//                 const timespec *ts */
+//   PRINT("__semwait_signal(wait %s, signal %s, %ld, %ld, %#lx)", 
+//         name_for_port(ARG1), name_for_port(ARG2), ARG3, ARG4, ARG5);
+//   PRE_REG_READ5(int, "__semwait_signal", 
+//                 int,cond_sem, int,mutex_sem,
+//                 int,timeout, int,relative, 
+//                 const struct vki_timespec *,ts);
+//   
+//   if (ARG5) PRE_MEM_READ ("__semwait_signal(ts)", 
+//                           ARG5, sizeof(struct vki_timespec));
+//   
+//   *flags |= SfMayBlock;
+//}
 
 
 PRE(__thread_selfid)