[Commits] r24133 - in /fsf/trunk/libc: ./ locale/ localedata/locales/ sysdeps/unix/ sysdeps/unix/sysv/linux/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Sep 30 00:02:02 2013
New Revision: 24133

Log:
Import glibc-mainline for 2013-09-30

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/locale/iso-639.def
    fsf/trunk/libc/localedata/locales/lzh_TW
    fsf/trunk/libc/sysdeps/unix/Makefile
    fsf/trunk/libc/sysdeps/unix/make-syscalls.sh
    fsf/trunk/libc/sysdeps/unix/sysv/linux/tst-fanotify.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Mon Sep 30 00:02:02 2013
@@ -1,3 +1,13 @@
+2013-09-28  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/tst-fanotify.c (do_test): Fix style.
+
+2013-09-28  P. J. McDermott  <pj@xxxxxxxxxxx>
+
+	* sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Don't use
+	${Bash-specific parameter/pattern/string} parameter expansion.
+	* sysdeps/unix/make-syscalls.sh: Likewise.
+
 2013-09-27  Kaz Kojima  <kkojima@xxxxxxxxxxxxxx>
 
 	* sysdeps/sh/stackguard-macros.h: New file.

Modified: fsf/trunk/libc/locale/iso-639.def
==============================================================================
--- fsf/trunk/libc/locale/iso-639.def (original)
+++ fsf/trunk/libc/locale/iso-639.def Mon Sep 30 00:02:02 2013
@@ -46,6 +46,7 @@
 DEFINE_LANGUAGE_CODE ("Avaric", av, ava, ava)
 DEFINE_LANGUAGE_CODE ("Avestan", ae, ave, ave)
 DEFINE_LANGUAGE_CODE3 ("Awadhi", awa, awa)
+DEFINE_LANGUAGE_CODE ("Aymara, Southern", ay, ayc, ayc)
 DEFINE_LANGUAGE_CODE ("Aymara", ay, aym, aym)
 DEFINE_LANGUAGE_CODE ("Azerbaijani", az, aze, aze)
 DEFINE_LANGUAGE_CODE3 ("Balinese", ban, ban)

Modified: fsf/trunk/libc/localedata/locales/lzh_TW
==============================================================================
--- fsf/trunk/libc/localedata/locales/lzh_TW (original)
+++ fsf/trunk/libc/localedata/locales/lzh_TW Mon Sep 30 00:02:02 2013
@@ -150,6 +150,7 @@
             "<U5EFF><U4E5D>";/
             "<U5345>";/
             "<U5345><U4E00>"
+%
 END LC_TIME
 
 LC_NUMERIC

Modified: fsf/trunk/libc/sysdeps/unix/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/Makefile (original)
+++ fsf/trunk/libc/sysdeps/unix/Makefile Mon Sep 30 00:02:02 2013
@@ -51,12 +51,14 @@
 	 for call in $(unix-stub-syscalls); do \
 	   case $$call in \
 	   *@@*) \
-	     ver=$${call##*@}; call=$${call%%@*}; ver=$${ver//./_}; \
+	     ver=$${call##*@}; call=$${call%%@*}; \
+	     ver=`echo "$ver" | sed 's/\./_/g'`; \
 	     echo "strong_alias (_no_syscall, __$${call}_$${ver})"; \
 	     echo "versioned_symbol (libc, __$${call}_$${ver}, $$call, $$ver);"\
 	     ;; \
 	   *@*) \
-	     ver=$${call##*@}; call=$${call%%@*}; ver=$${ver//./_}; \
+	     ver=$${call##*@}; call=$${call%%@*}; \
+	     ver=`echo "$ver" | sed 's/\./_/g'`; \
 	     echo "strong_alias (_no_syscall, __$${call}_$${ver})"; \
 	     echo "compat_symbol (libc, __$${call}_$${ver}, $$call, $$ver);" \
 	     ;; \

Modified: fsf/trunk/libc/sysdeps/unix/make-syscalls.sh
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/make-syscalls.sh (original)
+++ fsf/trunk/libc/sysdeps/unix/make-syscalls.sh Mon Sep 30 00:02:02 2013
@@ -275,7 +275,7 @@
     # name in the vDSO and KERNEL_X.Y is its symbol version.
     vdso_symbol="${vdso_syscall%@*}"
     vdso_symver="${vdso_syscall#*@}"
-    vdso_symver="${vdso_symver//./_}"
+    vdso_symver=`echo "$vdso_symver" | sed 's/\./_/g'`
     echo "\
 \$(foreach p,\$(sysd-rules-targets),\$(objpfx)\$(patsubst %,\$p,$file).os): \\
 		\$(..)sysdeps/unix/make-syscalls.sh\

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 Mon Sep 30 00:02:02 2013
@@ -29,14 +29,15 @@
   fd = fanotify_init (0, 0);
   if (fd < 0)
     {
-      switch (errno) {
-      case ENOSYS:
-	puts ("SKIP: missing support for fanotify (check CONFIG_FANOTIFY=y)");
-	return 0;
-      case EPERM:
-	puts ("SKIP: missing proper permissions for runtime test");
-	return 0;
-      }
+      switch (errno)
+	{
+	case ENOSYS:
+	  puts ("SKIP: missing support for fanotify (check CONFIG_FANOTIFY=y)");
+	  return 0;
+	case EPERM:
+	  puts ("SKIP: missing proper permissions for runtime test");
+	  return 0;
+	}
 
       perror ("fanotify_init (0, 0) failed");
       return 1;

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