[commits] r11664 - in /fsf/trunk/libc: ./ sysdeps/sh/sh4/fpu/ sysdeps/unix/sysv/linux/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Oct  2 00:03:26 2010
New Revision: 11664

Log:
Import glibc-mainline for 2010-10-02

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/sh/sh4/fpu/fpu_control.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/linux_fsinfo.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/pathconf.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Oct  2 00:03:26 2010
@@ -1,3 +1,17 @@
+2010-09-28  Nobuhiro Iwamatsu  <iwamatsu@xxxxxxxxxxx>
+
+	* sysdeps/sh/sh4/fpu/fpu_control.h: Add 'extern "C"' protection to
+	__set_fpscr.
+
+2010-09-30  Andreas Jaeger  <aj@xxxxxxx>
+
+	* sysdeps/unix/sysv/linux_fsinfo.h (BTRFS_SUPER_MAGIC): Define.
+	(CGROUP_SUPER_MAGIC): Define.
+	* sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags):
+	Handle btrfs and cgroup file systems.
+	* sysdeps/unix/sysv/linux/pathconf.c (__statfs_filesize_max):
+	Likewise.
+
 2010-09-27  Luis Machado  <luisgpm@xxxxxxxxxx>
 
 	* sysdeps/powerpc/powerpc32/rtld-memset.c: New file.

Modified: fsf/trunk/libc/sysdeps/sh/sh4/fpu/fpu_control.h
==============================================================================
--- fsf/trunk/libc/sysdeps/sh/sh4/fpu/fpu_control.h (original)
+++ fsf/trunk/libc/sysdeps/sh/sh4/fpu/fpu_control.h Sat Oct  2 00:03:26 2010
@@ -1,5 +1,5 @@
 /* FPU control word definitions.  SH version.
-   Copyright (C) 1999, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,6 +19,8 @@
 
 #ifndef _FPU_CONTROL_H
 #define _FPU_CONTROL_H
+
+#include <features.h>
 
 /* masking of interrupts */
 #define _FPU_MASK_VM	0x0800	/* Invalid operation */
@@ -45,6 +47,8 @@
 #define _FPU_GETCW(cw) __asm__ ("sts fpscr,%0" : "=r" (cw))
 
 #if defined __GNUC__
+__BEGIN_DECLS
+
 /* GCC provides this function.  */
 extern void __set_fpscr (unsigned long);
 #define _FPU_SETCW(cw) __set_fpscr ((cw))
@@ -55,4 +59,5 @@
 /* Default control word set at startup.	 */
 extern fpu_control_t __fpu_control;
 
+__END_DECLS
 #endif /* _FPU_CONTROL_H */

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/internal_statvfs.c Sat Oct  2 00:03:26 2010
@@ -108,6 +108,12 @@
       break;
     case LOGFS_MAGIC_U32:
       fsname = "logfs";
+      break;
+    case BTRFS_SUPER_MAGIC:
+      fsname = "btrfs";
+      break;
+    case CGROUP_SUPER_MAGIC:
+      fsname = "cgroup";
       break;
     }
 

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/linux_fsinfo.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/linux_fsinfo.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/linux_fsinfo.h Sat Oct  2 00:03:26 2010
@@ -23,7 +23,7 @@
 /* These definitions come from the kernel headers.  But we cannot
    include the headers here because of type clashes.  If new
    filesystem types will become available we have to add the
-   appropriate definitions here.*/
+   appropriate definitions here.  */
 
 /* Constant that identifies the `adfs' filesystem.  */
 #define ADFS_SUPER_MAGIC	0xadf5
@@ -35,7 +35,13 @@
 #define AUTOFS_SUPER_MAGIC	0x187
 
 /* Constant that identifies the `bfs' filesystem.  */
-#define BFS_MAGIC		0x1BADFACE
+#define BFS_MAGIC		0x1badface
+
+/* Constant that identifies the `btrfs' filesystem.  */
+#define BTRFS_SUPER_MAGIC	0x9123683e
+
+/* Constant that identifies the `cgroup' filesystem.  */
+#define CGROUP_SUPER_MAGIC	0x27e0eb
 
 /* Constant that identifies the `coda' filesystem.  */
 #define CODA_SUPER_MAGIC	0x73757245
@@ -53,7 +59,7 @@
 #define DEVPTS_SUPER_MAGIC	0x1cd1
 
 /* Constants that identifies the `efs' filesystem.  */
-#define EFS_SUPER_MAGIC		0x414A53
+#define EFS_SUPER_MAGIC		0x414a53
 #define EFS_MAGIC		0x072959
 
 /* Constant that identifies the `ext2' and `ext3' filesystems.  */
@@ -74,7 +80,7 @@
 /* Constant that identifies the `jfs' filesystem.  */
 #define JFS_SUPER_MAGIC		0x3153464a
 
-/* Constant that identifies the `logfs´ filesystem.  */
+/* Constant that identifies the `logfs' filesystem.  */
 #define LOGFS_MAGIC_U32		0xc97e8168u
 
 /* Constants that identify the `minix2' filesystem.  */
@@ -118,7 +124,7 @@
 /* Constant that identifies the `smb' filesystem.  */
 #define SMB_SUPER_MAGIC		0x517b
 
-/* Constant that identifies the `sysfs´ filesystem.  */
+/* Constant that identifies the `sysfs' filesystem.  */
 #define SYSFS_MAGIC		0x62656572
 
 /* Constants that identify the `sysV' filesystem.  */

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/pathconf.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/pathconf.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/pathconf.c Sat Oct  2 00:03:26 2010
@@ -1,5 +1,5 @@
 /* Get file-specific information about a file.  Linux version.
-   Copyright (C) 1991,1995,1996,1998-2003,2008 Free Software Foundation, Inc.
+   Copyright (C) 1991,1995,1996,1998-2003,2008,2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -126,6 +126,9 @@
 
   switch (fsbuf->f_type)
     {
+    case BTRFS_SUPER_MAGIC:
+      return 255;
+
     case EXT2_SUPER_MAGIC:
     case UFS_MAGIC:
     case UFS_CIGAM:
@@ -136,6 +139,7 @@
     case UDF_SUPER_MAGIC:
     case JFS_SUPER_MAGIC:
     case VXFS_SUPER_MAGIC:
+    case CGROUP_SUPER_MAGIC:
       return 64;
 
     case MSDOS_SUPER_MAGIC: