Partial revert for r49172: get TSan rev2200 back. This won't affect Valgrind ...

scripts/fork.patch

 Index: coregrind/m_syswrap/syswrap-generic.c
 ===================================================================
 --- coregrind/m_syswrap/syswrap-generic.c       (revision 10880)
 +++ coregrind/m_syswrap/syswrap-generic.c       (working copy)
 @@ -2563,6 +2563,11 @@
  
     } else {
        path = (Char*)ARG1;
 +      if (VG_(clo_xml)) {
 +        VG_(printf_xml)("\n<execv/>\n\n</valgrindoutput>\n\n");
 +      } else {
 +        VG_(umsg)("execv called - the tool will now quit\n");
 +      }
     }
  
     // Set up the child's environment.
-@@ -4103,4 +4108,3 @@
- /*--------------------------------------------------------------------*/
- /*--- end                                                          ---*/
- /*--------------------------------------------------------------------*/
--
 Index: coregrind/pub_core_libcfile.h
 ===================================================================
 --- coregrind/pub_core_libcfile.h       (revision 10880)
 +++ coregrind/pub_core_libcfile.h       (working copy)
 @@ -41,6 +41,7 @@
  
  /* Move an fd into the Valgrind-safe range */
  extern Int VG_(safe_fd) ( Int oldfd );
 +extern Int reopen_output_fd(Bool xml);
  extern Int VG_(fcntl)   ( Int fd, Int cmd, Addr arg );
@@ skipping 345 matching lines @@
 @@ -74,6 +74,9 @@
  extern Char* VG_(clo_log_fname_expanded);
  extern Char* VG_(clo_xml_fname_expanded);
  
 +extern Char* VG_(clo_log_fname_unexpanded);
 +extern Char* VG_(clo_xml_fname_unexpanded);
 +
  /* Add timestamps to log messages?  default: NO */
  extern Bool  VG_(clo_time_stamp);