GNU C Library master sources branch master updated. glibc-2.18-37-g7f9d003

[roland at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  7f9d00341057eb80b43fa83956b8d7798b4dabea (commit)
       via  fb431262c12a8e2630225518300a4e1e0c4e918b (commit)
      from  bd81123a8ba99ac30bcf227be5103cf2863e27cb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7f9d00341057eb80b43fa83956b8d7798b4dabea

commit 7f9d00341057eb80b43fa83956b8d7798b4dabea
Author: Roland McGrath <roland@hack.frob.com>
Date:   Tue Aug 27 11:09:33 2013 -0700

    Clean up h_errno declaration to use __thread unconditionally.

diff --git a/ChangeLog b/ChangeLog
index d5fc59b..59886cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-08-27  Roland McGrath  <roland@hack.frob.com>
 
+	* include/netdb.h [!_ISOMAC]:
+	Don't include <tls.h>.
+	(h_errno, __libc_h_errno): Move declaration and macros out of
+	[_LIBC_REENTRANT].
+
 	* include/resolv.h [_RESOLV_H_]:
 	Don't include <tls.h>.
 	(__resp, _res): Move declaration and macro out of [_LIBC_REENTRANT].
diff --git a/include/netdb.h b/include/netdb.h
index e97d1bf..a7960eb 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -6,17 +6,12 @@
 /* Macros for accessing h_errno from inside libc.  */
 # if !defined NOT_IN_libc || defined IN_LIB
 #  undef  h_errno
-#  ifdef _LIBC_REENTRANT
-#   include <tls.h>
-#   ifndef NOT_IN_libc
-#    define h_errno __libc_h_errno
-#   else
-#    define h_errno h_errno	/* For #ifndef h_errno tests.  */
-#   endif
-extern __thread int h_errno attribute_tls_model_ie;
+#  ifndef NOT_IN_libc
+#   define h_errno __libc_h_errno
 #  else
-extern int h_errno;
-#  endif	/* _LIBC_REENTRANT */
+#   define h_errno h_errno	/* For #ifndef h_errno tests.  */
+#  endif
+extern __thread int h_errno attribute_tls_model_ie;
 # endif /* !NOT_IN_libc || IN_LIB */
 # define __set_h_errno(x) (h_errno = (x))
 

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fb431262c12a8e2630225518300a4e1e0c4e918b

commit fb431262c12a8e2630225518300a4e1e0c4e918b
Author: Roland McGrath <roland@hack.frob.com>
Date:   Tue Aug 27 11:04:46 2013 -0700

    Clean up _res declaration to use __thread unconditionally.

diff --git a/ChangeLog b/ChangeLog
index e73a301..d5fc59b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2013-08-27  Roland McGrath  <roland@hack.frob.com>
 
+	* include/resolv.h [_RESOLV_H_]:
+	Don't include <tls.h>.
+	(__resp, _res): Move declaration and macro out of [_LIBC_REENTRANT].
+	* resolv/res_libc.c: Don't include <tls.h>.
+	(_res): Use __attribute__ ((nocommon)) in place of
+	__attribute__ ((section (".bss"))).
+
 	* Makefile ($(common-objpfx)linkobj/libc_pic.a):
 	If [sunrpc not in $(subdirs)], define to use libc_pic.a directly.
 
diff --git a/include/resolv.h b/include/resolv.h
index 30ea877..87b3598 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -13,20 +13,12 @@
 
 #ifdef _RESOLV_H_
 
-# ifdef _LIBC_REENTRANT
-#  include <tls.h>
-#  undef _res
-#  ifndef NOT_IN_libc
-#   define __resp __libc_resp
-#  endif
-#  define _res (*__resp)
-extern __thread struct __res_state *__resp attribute_tls_model_ie;
-# else
-#  ifndef __BIND_NOSTATIC
-#   undef _res
-extern struct __res_state _res;
-#  endif
+# ifndef NOT_IN_libc
+#  define __resp __libc_resp
 # endif
+extern __thread struct __res_state *__resp attribute_tls_model_ie;
+# undef _res
+# define _res (*__resp)
 
 /* Now define the internal interfaces.  */
 extern int __res_vinit (res_state, int);
diff --git a/resolv/res_libc.c b/resolv/res_libc.c
index 48d3200..0b37f46 100644
--- a/resolv/res_libc.c
+++ b/resolv/res_libc.c
@@ -122,9 +122,7 @@ libc_hidden_def (__res_maybe_init)
    This differs from plain `struct __res_state _res;' in that it doesn't
    create a common definition, but a plain symbol that resides in .bss,
    which can have an alias.  */
-struct __res_state _res __attribute__((section (".bss")));
-
-#include <tls.h>
+struct __res_state _res __attribute__ ((nocommon));
 
 #undef __resp
 __thread struct __res_state *__resp = &_res;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |   12 ++++++++++++
 include/netdb.h   |   15 +++++----------
 include/resolv.h  |   18 +++++-------------
 resolv/res_libc.c |    4 +---
 4 files changed, 23 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources