diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-20 23:14:07 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-20 23:14:07 +0200 |
commit | c59fc9e953db9723b34eebe96c3ad2cef893c4bb (patch) | |
tree | bd9c6dd8e8343d17c80a1a5d6762e1f99f3367b7 /mach | |
parent | 654611b4d68129954697bb94d49c671e164ec938 (diff) | |
parent | 784b06732b24f3079e88e5be4284b645aa715512 (diff) |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
configure
configure.in
hurd/ctty-input.c
hurd/ctty-output.c
hurd/hurd/signal.h
hurd/hurdexec.c
hurd/hurdmsg.c
hurd/hurdsig.c
hurd/hurdsocket.h
socket/recvmmsg.c
socket/sendmmsg.c
sysdeps/mach/hurd/i386/sigreturn.c
sysdeps/mach/hurd/i386/trampoline.c
sysdeps/mach/hurd/pipe.c
sysdeps/mach/hurd/recvmsg.c
sysdeps/mach/hurd/sendmsg.c
sysdeps/mach/hurd/sigaction.c
sysdeps/mach/hurd/sigpending.c
sysdeps/mach/hurd/sigprocmask.c
sysdeps/mach/hurd/sigsuspend.c
sysdeps/mach/hurd/sigwait.c
sysdeps/mach/hurd/socketpair.c
sysdeps/mach/hurd/tls.h
sysdeps/unix/sysv/linux/recvmmsg.c
sysdeps/unix/sysv/linux/sendmmsg.c
Diffstat (limited to 'mach')
-rw-r--r-- | mach/Machrules | 3 | ||||
-rw-r--r-- | mach/Makefile | 3 | ||||
-rw-r--r-- | mach/devstream.c | 2 | ||||
-rw-r--r-- | mach/lock-intern.h | 2 | ||||
-rw-r--r-- | mach/mach.h | 2 | ||||
-rw-r--r-- | mach/mach/mach_traps.h | 2 | ||||
-rw-r--r-- | mach/mach/mig_support.h | 2 | ||||
-rw-r--r-- | mach/mach_init.c | 2 | ||||
-rw-r--r-- | mach/mach_init.h | 2 | ||||
-rw-r--r-- | mach/mig-alloc.c | 2 | ||||
-rw-r--r-- | mach/mig-dealloc.c | 2 | ||||
-rw-r--r-- | mach/mig-reply.c | 2 | ||||
-rw-r--r-- | mach/msgserver.c | 2 | ||||
-rw-r--r-- | mach/mutex-init.c | 2 | ||||
-rw-r--r-- | mach/mutex-solid.c | 2 | ||||
-rw-r--r-- | mach/setup-thread.c | 2 | ||||
-rw-r--r-- | mach/spin-lock.h | 2 | ||||
-rw-r--r-- | mach/spin-solid.c | 2 |
18 files changed, 18 insertions, 20 deletions
diff --git a/mach/Machrules b/mach/Machrules index d211bce057..ac0197a9bd 100644 --- a/mach/Machrules +++ b/mach/Machrules @@ -1,6 +1,5 @@ # Rules for MiG interfaces that want to go into the C library. -# Copyright (C) 1991,1992,1993,1994,1995,1996,1998,1999,2001,2002,2006 -# Free Software Foundation, Inc. +# Copyright (C) 1991-2013 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/mach/Makefile b/mach/Makefile index 00de7a505e..08bb3757e1 100644 --- a/mach/Makefile +++ b/mach/Makefile @@ -1,5 +1,4 @@ -# Copyright (C) 1991,92,93,94,95,96,97,98,2001,02,12 -# Free Software Foundation, Inc. +# Copyright (C) 1991-2013 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/mach/devstream.c b/mach/devstream.c index 0f515c2925..0fc837bf87 100644 --- a/mach/devstream.c +++ b/mach/devstream.c @@ -1,6 +1,6 @@ /* stdio on a Mach device port. Translates \n to \r\n on output, echos and translates \r to \n on input. - Copyright (C) 1992-2012 Free Software Foundation, Inc. + Copyright (C) 1992-2013 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/mach/lock-intern.h b/mach/lock-intern.h index 84196b52cc..f6e20825ab 100644 --- a/mach/lock-intern.h +++ b/mach/lock-intern.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1996, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1994-2013 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/mach/mach.h b/mach/mach.h index 61a8c1ffea..2acc3f3b4c 100644 --- a/mach/mach.h +++ b/mach/mach.h @@ -1,5 +1,5 @@ /* Standard header for all Mach programs. - Copyright (C) 1993,94,96,97,2002 Free Software Foundation, Inc. + Copyright (C) 1993-2013 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/mach/mach/mach_traps.h b/mach/mach/mach_traps.h index 29ebbe9ba2..8dbda6a256 100644 --- a/mach/mach/mach_traps.h +++ b/mach/mach/mach_traps.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1994,96,97,2002 Free Software Foundation, Inc. +/* Copyright (C) 1994-2013 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/mach/mach/mig_support.h b/mach/mach/mig_support.h index 83ea742bf8..2c0893a9b3 100644 --- a/mach/mach/mig_support.h +++ b/mach/mach/mig_support.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,94,97,99,2001,2007 Free Software Foundation, Inc. +/* Copyright (C) 1993-2013 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/mach/mach_init.c b/mach/mach_init.c index 6e69f12830..e1ec8eac14 100644 --- a/mach/mach_init.c +++ b/mach/mach_init.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992,93,95,97,2001,02 Free Software Foundation, Inc. +/* Copyright (C) 1992-2013 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/mach/mach_init.h b/mach/mach_init.h index 5b015a6387..98540333ba 100644 --- a/mach/mach_init.h +++ b/mach/mach_init.h @@ -1,5 +1,5 @@ /* Declarations and macros for the basic Mach things set at startup. - Copyright (C) 1993, 1994, 1997 Free Software Foundation, Inc. + Copyright (C) 1993-2013 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/mach/mig-alloc.c b/mach/mig-alloc.c index ec465a1ccb..7920345e4b 100644 --- a/mach/mig-alloc.c +++ b/mach/mig-alloc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992-2013 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/mach/mig-dealloc.c b/mach/mig-dealloc.c index 635db5ab74..1a3f74e6e1 100644 --- a/mach/mig-dealloc.c +++ b/mach/mig-dealloc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992-2013 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/mach/mig-reply.c b/mach/mig-reply.c index 3bfd9c16f0..c2898ece3e 100644 --- a/mach/mig-reply.c +++ b/mach/mig-reply.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992-2013 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/mach/msgserver.c b/mach/msgserver.c index 915a08868a..fc34d71968 100644 --- a/mach/msgserver.c +++ b/mach/msgserver.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,94,95,96,2001,02 Free Software Foundation, Inc. +/* Copyright (C) 1993-2013 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/mach/mutex-init.c b/mach/mutex-init.c index 46ec114f79..d5010334ca 100644 --- a/mach/mutex-init.c +++ b/mach/mutex-init.c @@ -1,5 +1,5 @@ /* Initialize a cthreads mutex structure. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1995-2013 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/mach/mutex-solid.c b/mach/mutex-solid.c index 025b3914e6..61a09ef977 100644 --- a/mach/mutex-solid.c +++ b/mach/mutex-solid.c @@ -1,5 +1,5 @@ /* Stub versions of mutex_lock_solid/mutex_unlock_solid for no -lthreads. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1995-2013 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/mach/setup-thread.c b/mach/setup-thread.c index 4422f7c3fc..bf3e843d15 100644 --- a/mach/setup-thread.c +++ b/mach/setup-thread.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,94,1995,1997,2002,2005 Free Software Foundation, Inc. +/* Copyright (C) 1991-2013 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/mach/spin-lock.h b/mach/spin-lock.h index 624ee275bd..6fb07c5084 100644 --- a/mach/spin-lock.h +++ b/mach/spin-lock.h @@ -1,5 +1,5 @@ /* Definitions of user-visible names for spin locks. - Copyright (C) 1994, 1997 Free Software Foundation, Inc. + Copyright (C) 1994-2013 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/mach/spin-solid.c b/mach/spin-solid.c index 0bd0a50350..9a3326bda5 100644 --- a/mach/spin-solid.c +++ b/mach/spin-solid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1994-2013 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 |