Merge changes between r24468 and r24941 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@24942 7b3dc134-2b1b-0410-93df-9e9f96275f8d

17 files changed, 18 insertions, 18 deletions

diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S
index 66c0cf008..a20d0cf7f 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/____longjmp_chk.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2013 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2014 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
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/brk.c b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/brk.c
index 2c96faa87..40152d5ae 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/brk.c
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/brk.c
@@ -1,5 +1,5 @@
 /* brk system call for Linux/SPARC.
-   Copyright (C) 1995-2013 Free Software Foundation, Inc.
+   Copyright (C) 1995-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Miguel de Icaza (miguel@nuclecu.unam.mx)
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
index 20f99fe15..e007d5deb 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Richard Henderson (rth@tamu.edu).
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/getcontext.S b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/getcontext.S
index e0a4cd476..b7fef42b2 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/getcontext.S
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/getcontext.S
@@ -1,5 +1,5 @@
 /* Save current context.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David S. Miller <davem@davemloft.net>, 2008.
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
index a0da019c5..5b894b83f 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
@@ -14,8 +14,8 @@ struct kernel_stat
     struct timespec st_ctim;
     long int st_blksize;
     long int st_blocks;
-    unsigned long int __unused4;
-    unsigned long int __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 #define _HAVE___UNUSED4
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/makecontext.c b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/makecontext.c
index 5e64efa6a..41a235599 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/makecontext.c
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/makecontext.c
@@ -1,5 +1,5 @@
 /* Create new context.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David S. Miller <davem@davemloft.net>, 2008.
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/pipe.S b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/pipe.S
index 41fd6ee00..8bc121fc1 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/pipe.S
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/pipe.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, 1997.
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/profil-counter.h b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/profil-counter.h
index e8be937e1..31b4ddf7a 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/profil-counter.h
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/profil-counter.h
@@ -1,5 +1,5 @@
 /* Low-level statistical profiling support function.  Linux/SPARC version.
-   Copyright (C) 1997-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2014 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
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h
index 2d8830516..a82f5ce14 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/register-dump.h
@@ -1,5 +1,5 @@
 /* Dump registers.
-   Copyright (C) 1999-2013 Free Software Foundation, Inc.
+   Copyright (C) 1999-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 1999.
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c
index 1a4bbac8f..be8069786 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c
@@ -1,5 +1,5 @@
 /* Semctl for architectures where word sized unions are passed indirectly
-   Copyright (C) 1995-2013 Free Software Foundation, Inc.
+   Copyright (C) 1995-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/setcontext.S b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/setcontext.S
index f78080148..1e80d72c3 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/setcontext.S
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/setcontext.S
@@ -1,5 +1,5 @@
 /* Install given context.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David S. Miller <davem@davemloft.net>, 2008.
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c
index c3adc2d1c..5e8cf6980 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c
@@ -1,5 +1,5 @@
 /* POSIX.1 sigaction call for Linux/SPARC.
-   Copyright (C) 1997-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Miguel de Icaza <miguel@nuclecu.unam.mx>, 1997.
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h
index 0cf908ccd..ff7eb42ed 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sigcontextinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 1999.
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/socket.S b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/socket.S
index 8bb3e1242..00c6d2788 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/socket.S
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/socket.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, 1997.
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/swapcontext.S b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/swapcontext.S
index fa855c670..95cc41125 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/swapcontext.S
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/swapcontext.S
@@ -1,5 +1,5 @@
 /* Save current context and install the given one.
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David S. Miller <davem@davemloft.net>, 2008.
 
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/syscall.S b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/syscall.S
index 5f2cb5644..6fed9ceee 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/syscall.S
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/syscall.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 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
diff --git a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
index 5f42c8c28..8b0d0807f 100644
--- a/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
+++ b/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, January 1997.