diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-03-25 02:32:12 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-03-25 02:32:12 +0100 |
| commit | c3bb673e376492360c895e3f70f49cbbdb48bbaf (patch) | |
| tree | 06995c131eac1424dd02fe383dba2d4293d653cf /nptl/sysdeps/unix/sysv/linux/sparc/sparc64 | |
| parent | d7e5ff94db82853ff8e29017e535132bfc45b2c9 (diff) | |
| parent | 74509f87ae6e2ee8b87dec41c4e2d45fe2fae88f (diff) | |
Merge commit 'refs/top-bases/t/tls-threadvar' into t/tls-threadvar
Conflicts:
sysdeps/mach/hurd/bits/libc-tsd.h
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/sparc/sparc64')
4 files changed, 4 insertions, 4 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/cpu_relax.S b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/cpu_relax.S index 29168e10ec..9d45eb7e42 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/cpu_relax.S +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/cpu_relax.S @@ -1,5 +1,5 @@ /* CPU strand yielding for busy loops. - Copyright (C) 2012-2013 Free Software Foundation, Inc. + Copyright (C) 2012-2014 Free Software Foundation, Inc. Contributed by David S. Miller (davem@davemloft.net) This file is part of the GNU C Library. diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S index a2e6476c5d..0561bd2bb1 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2013 Free Software Foundation, Inc. +/* Copyright (C) 2004-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2004. diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h index 758611e5f0..4dad994ab3 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2013 Free Software Foundation, Inc. +/* Copyright (C) 2002-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S index f9fb48c3f9..be6e269605 100644 --- a/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S +++ b/nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2004-2013 Free Software Foundation, Inc. +/* Copyright (C) 2004-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2004. |