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 /sysdeps/i386/i486 | |
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 'sysdeps/i386/i486')
-rw-r--r-- | sysdeps/i386/i486/bits/atomic.h | 2 | ||||
-rw-r--r-- | sysdeps/i386/i486/htonl.S | 2 | ||||
-rw-r--r-- | sysdeps/i386/i486/strcat.S | 2 | ||||
-rw-r--r-- | sysdeps/i386/i486/string-inlines.c | 2 | ||||
-rw-r--r-- | sysdeps/i386/i486/strlen.S | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/i386/i486/bits/atomic.h b/sysdeps/i386/i486/bits/atomic.h index f52e020c93..42a1678a40 100644 --- a/sysdeps/i386/i486/bits/atomic.h +++ b/sysdeps/i386/i486/bits/atomic.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002-2012 Free Software Foundation, Inc. +/* Copyright (C) 2002-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. diff --git a/sysdeps/i386/i486/htonl.S b/sysdeps/i386/i486/htonl.S index e348263e55..b4989f0775 100644 --- a/sysdeps/i386/i486/htonl.S +++ b/sysdeps/i386/i486/htonl.S @@ -1,5 +1,5 @@ /* Change byte order in word. For Intel 80x86, x >= 4. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997-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/sysdeps/i386/i486/strcat.S b/sysdeps/i386/i486/strcat.S index 7596a0dcdb..6549b5c162 100644 --- a/sysdeps/i386/i486/strcat.S +++ b/sysdeps/i386/i486/strcat.S @@ -1,6 +1,6 @@ /* strcat(dest, src) -- Append SRC on the end of DEST. For Intel 80x86, x>=4. - Copyright (C) 1994-1997,2000,2003,2005 Free Software Foundation, Inc. + Copyright (C) 1994-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@ipd.info.uni-karlsruhe.de>. Optimised a little by Alan Modra <Alan@SPRI.Levels.UniSA.Edu.Au> diff --git a/sysdeps/i386/i486/string-inlines.c b/sysdeps/i386/i486/string-inlines.c index e05f825720..65fa298d8f 100644 --- a/sysdeps/i386/i486/string-inlines.c +++ b/sysdeps/i386/i486/string-inlines.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1999-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/sysdeps/i386/i486/strlen.S b/sysdeps/i386/i486/strlen.S index 3ba4df92d9..743918044e 100644 --- a/sysdeps/i386/i486/strlen.S +++ b/sysdeps/i386/i486/strlen.S @@ -1,6 +1,6 @@ /* strlen(str) -- determine the length of the string STR. Optimized for Intel 80x86, x>=4. - Copyright (C) 1991-1997, 2000, 2003 Free Software Foundation, Inc. + Copyright (C) 1991-2013 Free Software Foundation, Inc. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>. This file is part of the GNU C Library. |