[Commits] r24952 - in /fsf/trunk/libc: ./ nscd/ ports/ ports/sysdeps/ia64/ sysdeps/unix/sysv/linux/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun Jan  5 00:02:00 2014
New Revision: 24952

Log:
Import glibc-mainline for 2014-01-05

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/config.h.in
    fsf/trunk/libc/nscd/nscd.c
    fsf/trunk/libc/ports/ChangeLog.ia64
    fsf/trunk/libc/ports/sysdeps/ia64/dl-tls.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/configure
    fsf/trunk/libc/sysdeps/unix/sysv/linux/configure.ac
    fsf/trunk/libc/sysdeps/unix/sysv/linux/tst-fanotify.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Jan  5 00:02:00 2014
@@ -1,3 +1,14 @@
+2014-01-04  Sami Kerola  <kerolasa@xxxxxx>
+
+	* nscd/nscd.c: Improve usage() output.
+
+2014-01-04  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* config.h.in: Add HAVE_LINUX_FANOTIFY_H template.
+	* sysdeps/unix/sysv/linux/configure: Regenerated.
+	* sysdeps/unix/sysv/linux/configure.ac: Call AC_DEFINE.
+	* sysdeps/unix/sysv/linux/tst-fanotify.c: Include config.h.
+
 2014-01-03  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	[BZ #16390]

Modified: fsf/trunk/libc/config.h.in
==============================================================================
--- fsf/trunk/libc/config.h.in (original)
+++ fsf/trunk/libc/config.h.in Sun Jan  5 00:02:00 2014
@@ -191,6 +191,9 @@
 
 /* Define if STT_GNU_IFUNC support actually works.  */
 #undef HAVE_IFUNC
+
+/* Define if linux/fanotify.h is available.  */
+#undef HAVE_LINUX_FANOTIFY_H
 
 /*
  */

Modified: fsf/trunk/libc/nscd/nscd.c
==============================================================================
--- fsf/trunk/libc/nscd/nscd.c (original)
+++ fsf/trunk/libc/nscd/nscd.c Sun Jan  5 00:02:00 2014
@@ -442,19 +442,38 @@
 static char *
 more_help (int key, const char *text, void *input)
 {
-  char *tp = NULL;
+  char *tables, *tp = NULL;
+
   switch (key)
     {
     case ARGP_KEY_HELP_EXTRA:
+      {
+	dbtype cnt;
+
+	tables = xmalloc (sizeof (dbnames) + 1);
+	for (cnt = 0; cnt < lastdb; cnt++)
+	  {
+	    strcat (tables, dbnames[cnt]);
+	    strcat (tables, " ");
+	  }
+      }
+
       /* We print some extra information.  */
       if (asprintf (&tp, gettext ("\
+Supported tables:\n\
+%s\n\
+\n\
 For bug reporting instructions, please see:\n\
-%s.\n"), REPORT_BUGS_TO) < 0)
-	return NULL;
+%s.\n\
+"), tables, REPORT_BUGS_TO) < 0)
+	tp = NULL;
+      free (tables);
       return tp;
+
     default:
       break;
     }
+
   return (char *) text;
 }
 

Modified: fsf/trunk/libc/ports/ChangeLog.ia64
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.ia64 (original)
+++ fsf/trunk/libc/ports/ChangeLog.ia64 Sun Jan  5 00:02:00 2014
@@ -1,3 +1,10 @@
+2014-01-04  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* sysdeps/ia64/dl-tls.h (GET_ADDR_ARGS): Add "tls_ia64_" prefix to vars.
+	(GET_ADDR_PARAM): Likewise.
+	(GET_ADDR_MODULE): Likewise.
+	(GET_ADDR_OFFSET): Likewise.
+
 2013-12-30  Mike Frysinger  <vapier@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/ia64/Makefile (gen-as-const-headers): Add

Modified: fsf/trunk/libc/ports/sysdeps/ia64/dl-tls.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/ia64/dl-tls.h (original)
+++ fsf/trunk/libc/ports/sysdeps/ia64/dl-tls.h Sun Jan  5 00:02:00 2014
@@ -19,10 +19,10 @@
 
 /* On IA-64 the __tls_get_addr function take the module ID and the
    offset as parameters.  */
-#define GET_ADDR_ARGS		size_t m, size_t offset
-#define GET_ADDR_PARAM		m, offset
-#define GET_ADDR_MODULE		m
-#define GET_ADDR_OFFSET		offset
+#define GET_ADDR_ARGS		size_t tls_ia64_m, size_t tls_ia64_offset
+#define GET_ADDR_PARAM		tls_ia64_m, tls_ia64_offset
+#define GET_ADDR_MODULE		tls_ia64_m
+#define GET_ADDR_OFFSET		tls_ia64_offset
 
 /* We have no tls_index type.  */
 #define DONT_USE_TLS_INDEX	1

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/configure
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/configure (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/configure Sun Jan  5 00:02:00 2014
@@ -303,7 +303,8 @@
 ac_fn_c_check_header_compile "$LINENO" "linux/fanotify.h" "ac_cv_header_linux_fanotify_h" "/* No default includes.  */
 "
 if test "x$ac_cv_header_linux_fanotify_h" = xyes; then :
-  DEFINES="$DEFINES -DHAVE_LINUX_FANOTIFY_H=1"
+  $as_echo "#define HAVE_LINUX_FANOTIFY_H 1" >>confdefs.h
+
 fi
 
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/configure.ac
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/configure.ac (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/configure.ac Sun Jan  5 00:02:00 2014
@@ -108,7 +108,7 @@
 # Until we start requiring 2.6.37+ headers, we need to check for the
 # availability of linux/fanotify.h for testing purposes.
 AC_CHECK_HEADER(linux/fanotify.h,
-  [DEFINES="$DEFINES -DHAVE_LINUX_FANOTIFY_H=1"], ,
+  [AC_DEFINE(HAVE_LINUX_FANOTIFY_H)], ,
   [/* No default includes.  */])
 
 # The result of the above test for the use of the FDE code is invalid if

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/tst-fanotify.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/tst-fanotify.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/tst-fanotify.c Sun Jan  5 00:02:00 2014
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <config.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits