[commits] r14374 - in /fsf/trunk/libc: ChangeLog nscd/grpcache.c nscd/servicescache.c sysdeps/generic/dl-irel.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Jun 30 00:02:34 2011
New Revision: 14374

Log:
Import glibc-mainline for 2011-06-30

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nscd/grpcache.c
    fsf/trunk/libc/nscd/servicescache.c
    fsf/trunk/libc/sysdeps/generic/dl-irel.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Jun 30 00:02:34 2011
@@ -1,3 +1,15 @@
+2011-06-29  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* nscd/grpcache.c (cache_addgr): Don't write notfound reply if we
+	are re-adding the entry.
+	* nscd/servicescache.c (cache_addserv): Likewise.
+
+2011-06-30  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
+
+	* sysdeps/generic/dl-irel.h: fix protection against multiple
+	inclusions.
+	* sysdeps/generic/dl-irel.h (elf_ifunc_invoke): New.
+
 2011-06-28  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	[BZ #12935]

Modified: fsf/trunk/libc/nscd/grpcache.c
==============================================================================
--- fsf/trunk/libc/nscd/grpcache.c (original)
+++ fsf/trunk/libc/nscd/grpcache.c Thu Jun 30 00:02:34 2011
@@ -114,8 +114,9 @@
 	     case.  */
 	  total = sizeof (notfound);
 
-	  written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
-					      MSG_NOSIGNAL));
+	  if (fd != -1)
+	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+						MSG_NOSIGNAL));
 
 	  dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len,
 				   1);

Modified: fsf/trunk/libc/nscd/servicescache.c
==============================================================================
--- fsf/trunk/libc/nscd/servicescache.c (original)
+++ fsf/trunk/libc/nscd/servicescache.c Thu Jun 30 00:02:34 2011
@@ -104,8 +104,9 @@
 	     case.  */
 	  total = sizeof (notfound);
 
-	  written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
-					      MSG_NOSIGNAL));
+	  if (fd != -1)
+	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+						MSG_NOSIGNAL));
 
 	  dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len,
 				   1);

Modified: fsf/trunk/libc/sysdeps/generic/dl-irel.h
==============================================================================
--- fsf/trunk/libc/sysdeps/generic/dl-irel.h (original)
+++ fsf/trunk/libc/sysdeps/generic/dl-irel.h Thu Jun 30 00:02:34 2011
@@ -17,7 +17,14 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifndef _DL_IREL_h
+#ifndef _DL_IREL_H
 #define _DL_IREL_H
 
+static inline DL_FIXUP_VALUE_TYPE
+__attribute ((always_inline))
+elf_ifunc_invoke (ElfW(Addr) addr)
+{
+  return ((DL_FIXUP_VALUE_TYPE (*) (void)) (addr)) ();
+}
+
 #endif /* dl-irel.h */