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 /sysdeps/i386/i486/strlen.S | |
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 'sysdeps/i386/i486/strlen.S')
-rw-r--r-- | sysdeps/i386/i486/strlen.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/i386/i486/strlen.S b/sysdeps/i386/i486/strlen.S index 67bee4eb2b..4592f73b3d 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-2013 Free Software Foundation, Inc. + Copyright (C) 1991-2014 Free Software Foundation, Inc. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>. This file is part of the GNU C Library. |