Unbreak Helgrind on Linux following recent Darwin hackery.

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

diff --git a/helgrind/hg_intercepts.c b/helgrind/hg_intercepts.c
index 38b00de22f39c92e824efee7375e61bd72c2b1c6..8cb9452cacee29f5ee9a0f7d7af3ddc97a2ed088 100644 (file)
--- a/helgrind/hg_intercepts.c
+++ b/helgrind/hg_intercepts.c
@@ -208,6 +208,9 @@ static void* mythread_wrapper ( void* xargsV )
 // darwin: pthread_create
 // darwin: pthread_create_suspended_np (trapped)
 //
+/* ensure this has its own frame, so as to make it more distinguishable
+   in suppressions */
+__attribute__((noinline))
 static int pthread_create_WRK(pthread_t *thread, const pthread_attr_t *attr,
                               void *(*start) (void *), void *arg)
 {
@@ -1400,6 +1403,7 @@ static int pthread_rwlock_unlock_WRK(pthread_rwlock_t* rwlock)
 /*----------------------------------------------------------------*/
 
 #include <semaphore.h>
+#include <fcntl.h>       /* O_CREAT */
 
 #define TRACE_SEM_FNS 0