* dcrt0.cc (dll_crt0_0): Move _main_tls initialization here.

(__dll_crt0): Only initialize _main_tls if it changes.
* fhandler_console.cc (fhandler_console::write): Fix debugging output.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a0b5bbe38412c04136ed651c0eb51fb797edaed5..9c0e08dcc3d9323c1e6899ee6b8dd3504eabe65d 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-02  Christopher Faylor  <me+cygwin@cgf.cx>
+
+       * dcrt0.cc (dll_crt0_0): Move _main_tls initialization here.
+       (__dll_crt0): Only initialize _main_tls if it changes.
+       * fhandler_console.cc (fhandler_console::write): Fix debugging output.
+
 2010-09-02  Corinna Vinschen  <corinna@vinschen.de>
 
        * fhandler_disk_file.cc (fhandler_base::fstat_by_nfs_ea): Simplify.

diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 12ab224640ee6cf44c814a758610dd21c20193d9..13dc33d1772d5906538489f43a740d8181a21909 100644 (file)
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -771,6 +771,8 @@ dll_crt0_0 ()
     disable_dep ();
 #endif
 
+  _main_tls = &_my_tls;
+
   /* Initialize signal processing here, early, in the hopes that the creation
      of a thread early in the process will cause more predictability in memory
      layout for the main thread. */
@@ -970,9 +972,11 @@ _dll_crt0 ()
 {
   main_environ = user_data->envptr;
   if (in_forkee)
-    fork_info->alloc_stack ();
+    {
+      fork_info->alloc_stack ();
+      _main_tls = &_my_tls;
+    }
 
-  _main_tls = &_my_tls;
   _main_tls->call ((DWORD (*) (void *, void *)) dll_crt0_1, NULL);
 }
 

diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index d0c4d6ac4f514bd5dea008021bdc15ce795cc5a4..05a0310a5ccbe59274f1b5a795eac3725212cc65 100644 (file)
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -1987,7 +1987,7 @@ fhandler_console::write (const void *vsrc, size_t len)
        }
     }
 
-  syscall_printf ("%d = fhandler_console::write (\".20s\")", len, vsrc);
+  syscall_printf ("%d = fhandler_console::write (...)", len);
 
   return len;
 }