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/powerpc/powerpc64/multiarch/strnlen-power7.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/powerpc/powerpc64/multiarch/strnlen-power7.S')
-rw-r--r-- | sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S b/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S index 69a3683a0b..057e5a8d2d 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S +++ b/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S @@ -1,5 +1,5 @@ /* Optimized strnlen version for POWER7. - Copyright (C) 2013 Free Software Foundation, Inc. + Copyright (C) 2013-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 @@ -35,7 +35,7 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#undef weak_alias(name, alias) +#undef weak_alias #define weak_alias(name, alias) #include <sysdeps/powerpc/powerpc64/power7/strnlen.S> |