| Index: gcc/libgcov.c |
| =================================================================== |
| --- gcc/libgcov.c (revision 186999) |
| +++ gcc/libgcov.c (working copy) |
| @@ -46,6 +46,7 @@ |
| #include "tsystem.h" |
| #include "coretypes.h" |
| #include "tm.h" |
| +#include "gthr.h" |
| #endif /* __KERNEL__ */ |
| #if 1 |
| @@ -667,6 +668,26 @@ |
| info->version = 0; |
| } |
| +#ifdef __GTHREAD_MUTEX_INIT |
| +ATTRIBUTE_HIDDEN __gthread_mutex_t __gcov_flush_mx = __GTHREAD_MUTEX_INIT; |
| +#define init_mx_once() |
| +#else |
| +__gthread_mutex_t __gcov_flush_mx ATTRIBUTE_HIDDEN; |
| + |
| +static void |
| +init_mx (void) |
| +{ |
| + __GTHREAD_MUTEX_INIT_FUNCTION (&__gcov_flush_mx); |
| +} |
| +static void |
| +init_mx_once (void) |
| +{ |
| + static __gthread_once_t once = __GTHREAD_ONCE_INIT; |
| + __gthread_once (&once, init_mx); |
| +} |
| +#endif |
| + |
| + |
| /* Called before fork or exec - write out profile information gathered so |
| far and reset it to zero. This avoids duplication or loss of the |
| profile information gathered so far. */ |
| @@ -676,6 +697,9 @@ |
| { |
| const struct gcov_info *gi_ptr; |
| + init_mx_once (); |
| + __gthread_mutex_lock (&__gcov_flush_mx); |
| + |
| __gcov_stop_pmu_profiler (); |
| gcov_exit (); |
| for (gi_ptr = __gcov_list; gi_ptr; gi_ptr = gi_ptr->next) |
| @@ -691,6 +715,7 @@ |
| } |
| } |
| __gcov_start_pmu_profiler (); |
| + __gthread_mutex_unlock (&__gcov_flush_mx); |
| } |
| #else /* __GCOV_KERNEL__ */ |
| @@ -1756,8 +1781,13 @@ |
| pid_t |
| __gcov_fork (void) |
| { |
| + pid_t pid; |
| + extern __gthread_mutex_t __gcov_flush_mx; |
| __gcov_flush (); |
| - return fork (); |
| + pid = fork (); |
| + if (pid == 0) |
| + __GTHREAD_MUTEX_INIT_FUNCTION (&__gcov_flush_mx); |
| + return pid; |
| } |
| #endif |
