[commits] r1548 - in /branches/eglibc-2_5/libc: ./ inet/ malloc/ resolv/ sysdeps/generic/

[richard@xxxxxxxxxx]

Author: richard
Date: Thu Feb 22 08:34:17 2007
New Revision: 1548

Log:
Revert r1542 and r1543 due to copyright concerns.

Modified:
    branches/eglibc-2_5/libc/ChangeLog.eglibc
    branches/eglibc-2_5/libc/inet/inet_ntoa.c
    branches/eglibc-2_5/libc/malloc/memusage.c
    branches/eglibc-2_5/libc/resolv/gai_misc.h
    branches/eglibc-2_5/libc/sysdeps/generic/tls.h

Modified: branches/eglibc-2_5/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_5/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_5/libc/ChangeLog.eglibc Thu Feb 22 08:34:17 2007
@@ -6,26 +6,6 @@
 
 	* elf/elf.h (R_MIPS_GLOB_DAT): Define.
 	(R_MIPS_NUM): Bump by 1.
-
-2007-02-22  Richard Sandiford  <richard@xxxxxxxxxxxxxxxx>
-
-	* sysdeps/generic/tls.h: Include <time.h>.
-
-2007-02-22  Richard Sandiford  <richard@xxxxxxxxxxxxxxxx>
-
-	From Debian:
-
-	2007-02-09  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
-
-	* resolv/gai_misc.h: Include <pthread.h>.
-
-	2007-02-06  Petr Salinger  <petr.salinger@xxxxxxxxx>
-
-	* inet/inet_ntoa.c: Only use __thread if USE___THREAD.
-
-	2005-08-28  Thomas Schwinge  <schwinge@xxxxxxxxxxxxxxxxxx>
-
-	* malloc/memusage.c: Only use __thread if USE___THREAD.
 
 2007-02-20  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 

Modified: branches/eglibc-2_5/libc/inet/inet_ntoa.c
==============================================================================
--- branches/eglibc-2_5/libc/inet/inet_ntoa.c (original)
+++ branches/eglibc-2_5/libc/inet/inet_ntoa.c Thu Feb 22 08:34:17 2007
@@ -21,14 +21,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <arpa/inet.h>
-#include <tls.h>
 
 /* The interface of this function is completely stupid, it requires a
    static buffer.  We relax this a bit in that we allow one buffer for
    each thread.  */
-   
-#if USE_TLS && HAVE___THREAD
-
 static __thread char buffer[18];
 
 
@@ -41,83 +37,3 @@
 
   return buffer;
 }
-
-#else
-#include <bits/libc-lock.h>
-
-/* The interface of this function is completely stupid, it requires a
-   static buffer.  We relax this a bit in that we allow at least one
-   buffer for each thread.  */
-
-/* This is the key for the thread specific memory.  */
-static __libc_key_t key;
-
-/* If nonzero the key allocation failed and we should better use a
-   static buffer than fail.  */
-static char local_buf[18];
-static char *static_buf;
-
-/* Destructor for the thread-specific data.  */
-static void init (void);
-static void free_key_mem (void *mem);
-
-
-char *
-inet_ntoa (struct in_addr in)
-{
-  __libc_once_define (static, once);
-  char *buffer;
-  unsigned char *bytes;
-
-  /* If we have not yet initialized the buffer do it now.  */
-  __libc_once (once, init);
-
-  if (static_buf != NULL)
-    buffer = static_buf;
-  else
-    {
-      /* We don't use the static buffer and so we have a key.  Use it
-	 to get the thread-specific buffer.  */
-      buffer = __libc_getspecific (key);
-      if (buffer == NULL)
-	{
-	  /* No buffer allocated so far.  */
-	  buffer = malloc (18);
-	  if (buffer == NULL)
-	    /* No more memory available.  We use the static buffer.  */
-	    buffer = local_buf;
-	  else
-	    __libc_setspecific (key, buffer);
-	}
-    }
-
-  bytes = (unsigned char *) &in;
-  __snprintf (buffer, 18, "%d.%d.%d.%d",
-	      bytes[0], bytes[1], bytes[2], bytes[3]);
-
-  return buffer;
-}
-
-
-/* Initialize buffer.  */
-static void
-init (void)
-{
-  if (__libc_key_create (&key, free_key_mem))
-    /* Creating the key failed.  This means something really went
-       wrong.  In any case use a static buffer which is better than
-       nothing.  */
-    static_buf = local_buf;
-}
-
-
-/* Free the thread specific data, this is done if a thread terminates.  */
-static void
-free_key_mem (void *mem)
-{
-  free (mem);
-  __libc_setspecific (key, NULL);
-}
-
-#endif
-

Modified: branches/eglibc-2_5/libc/malloc/memusage.c
==============================================================================
--- branches/eglibc-2_5/libc/malloc/memusage.c (original)
+++ branches/eglibc-2_5/libc/malloc/memusage.c Thu Feb 22 08:34:17 2007
@@ -84,11 +84,7 @@
 static memusage_cntr_t decreasing_mremap;
 static memusage_size_t current_heap;
 static memusage_size_t peak_use[3];
-#if USE___THREAD
 static __thread uintptr_t start_sp;
-#else
-static uintptr_t start_sp;
-#endif
 
 /* A few macros to make the source more readable.  */
 #define peak_heap	peak_use[0]

Modified: branches/eglibc-2_5/libc/resolv/gai_misc.h
==============================================================================
--- branches/eglibc-2_5/libc/resolv/gai_misc.h (original)
+++ branches/eglibc-2_5/libc/resolv/gai_misc.h Thu Feb 22 08:34:17 2007
@@ -22,7 +22,6 @@
 
 #include <netdb.h>
 #include <signal.h>
-#include <pthread.h>
 
 
 /* Used to synchronize.  */

Modified: branches/eglibc-2_5/libc/sysdeps/generic/tls.h
==============================================================================
--- branches/eglibc-2_5/libc/sysdeps/generic/tls.h (original)
+++ branches/eglibc-2_5/libc/sysdeps/generic/tls.h Thu Feb 22 08:34:17 2007
@@ -79,8 +79,3 @@
      This normally is done using the the thread register which points
      to the dtv or the TCB (from which the DTV can found).
   */
-
-#ifndef __ASSEMBLER__
-/* All non-dummy versions of tls.h include this file.  */
-#include <time.h>
-#endif