1 files changed, 77 insertions, 6 deletions
diff --git a/winsup/cygwin/cygtls.h b/winsup/cygwin/cygtls.h
index 29f2103..846bac5 100644
--- a/winsup/cygwin/cygtls.h
+++ b/winsup/cygwin/cygtls.h
@@ -9,16 +9,83 @@ details. */
 #ifndef _CYGTLS_H
 #define _CYGTLS_H
 
-#include <cygwin/signal.h>
+#include <signal.h>
+#include <pwd.h>
+#include <grp.h>
+#include <sys/time.h>
+#define _NOMNTENT_FUNCS
+#include <mntent.h>
+#undef _NOMNTENT_FUNCS
 
 #define CYGTLS_INITIALIZED 0x43227
 #define CYGTLS_EXCEPTION (0x43227 + true)
 
+#ifndef CYG_MAX_PATH
+# define CYG_MAX_PATH 260
+#endif
+
+#ifndef UNLEN
+# define UNLEN 256
+#endif
+
+#pragma pack(push,4)
+struct _local_storage
+{
+  /*
+     Needed for the group functions
+   */
+  struct __group16 grp;
+  char *namearray[2];
+  int grp_pos;
+
+  /* console.cc */
+  unsigned rarg;
+
+  /* dlfcn.cc */
+  int dl_error;
+  char dl_buffer[256];
+
+  /* passwd.cc */
+  struct passwd res;
+  char pass[_PASSWORD_LEN];
+  int pw_pos;
+
+  /* path.cc */
+  struct mntent mntbuf;
+  int iteration;
+  unsigned available_drives;
+  char mnt_type[80];
+  char mnt_opts[80];
+  char mnt_fsname[CYG_MAX_PATH];
+  char mnt_dir[CYG_MAX_PATH];
+
+  /* strerror */
+  char strerror_buf[20];
+
+  /* sysloc.cc */
+  char *process_ident;
+  int process_logopt;
+  int process_facility;
+  int process_logmask;
+
+  /* times.cc */
+  char timezone_buf[20];
+  struct tm _localtime_buf;
+
+  /* uinfo.cc */
+  char username[UNLEN + 1];
+
+  /* net.cc */
+  char *ntoa_buf;
+  struct protoent *protoent_buf;
+  struct servent *servent_buf;
+  struct hostent *hostent_buf;
+};
+
 /* Please keep this file simple.  Changes to the below structure may require
    acompanying changes to the very simple parser in the perl script
    'gentls_offsets' (<<-- start parsing here).  */
 
-#pragma pack(push,4)
 typedef __uint32_t __stack_t;
 struct _threadinfo
 {
@@ -35,6 +102,8 @@ struct _threadinfo
   siginfo_t *sigwait_info;
   siginfo_t infodata;
   struct pthread *tid;
+  struct _reent local_clib;
+  struct _local_storage locals;
   struct _threadinfo *prev, *next;
   __stack_t stack[8];
   int sig;
@@ -43,9 +112,9 @@ struct _threadinfo
   /*gentls_offsets*/
   static CRITICAL_SECTION protect_linked_list;
   static void init ();
-  void init_thread (void *);
-  static void call (DWORD (*) (void *, void *), void *);
-  void call2 (DWORD (*) (void *, void *), void *, void *);
+  void init_thread (void *) __attribute__ ((regparm (2)));
+  static void call (DWORD (*) (void *, void *), void *) __attribute__ ((regparm (3)));
+  static void call2 (DWORD (*) (void *, void *), void *, void *) __attribute__ ((regparm (3)));
   static struct _threadinfo *find_tls (int sig);
   void remove ();
   void push (__stack_t, bool = false);
@@ -67,5 +136,7 @@ extern char *_tlstop __asm__ ("%fs:8");
 #define _my_tls (((_threadinfo *) _tlsbase)[-1])
 extern _threadinfo *_main_tls;
 
-#define CYGTLS_PADSIZE (sizeof (_threadinfo) + 64)
+#define __getreent() (&_my_tls.local_clib)
+
+#define CYGTLS_PADSIZE (sizeof (_threadinfo))
 #endif /*_CYGTLS_H*/