diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2010-12-09 10:38:18 -0500 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-12-13 11:41:09 +0100 |
| commit | 9796df9ff2bc74bbb2bbce62628eb50265a5aa78 (patch) | |
| tree | bdf17f9384a2115e090e496c5f0c5983987c5cb0 | |
| parent | 745cb72f04667f7551e86e87fffd08bb316aae13 (diff) | |
| download | glibc-9796df9ff2bc74bbb2bbce62628eb50265a5aa78.tar.gz glibc-9796df9ff2bc74bbb2bbce62628eb50265a5aa78.tar.xz glibc-9796df9ff2bc74bbb2bbce62628eb50265a5aa78.zip | |
Fix -D_FORTIFY_SOURCE memmove and bcop
(cherry picked from commit 42acbb92c861e97a6e1293ea853db88342a1bf53)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | string/bits/string3.h | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index a78f96d61f..6a86ea7d13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-12-09 Jakub Jelinek <jakub@redhat.com> + + * string/bits/string3.h (memmove, bcopy): Remove __restrict. + 2010-08-11 Ulrich Drepper <drepper@redhat.com> [BZ #11903] diff --git a/string/bits/string3.h b/string/bits/string3.h index 1d759f181b..164772572b 100644 --- a/string/bits/string3.h +++ b/string/bits/string3.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2004, 2005, 2007, 2009, 2010 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 @@ -53,8 +53,7 @@ __NTH (memcpy (void *__restrict __dest, __const void *__restrict __src, } __extern_always_inline void * -__NTH (memmove (void *__restrict __dest, __const void *__restrict __src, - size_t __len)) +__NTH (memmove (void *__dest, __const void *__src, size_t __len)) { return __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest)); } @@ -88,8 +87,7 @@ __NTH (memset (void *__dest, int __ch, size_t __len)) #ifdef __USE_BSD __extern_always_inline void -__NTH (bcopy (__const void *__restrict __src, void *__restrict __dest, - size_t __len)) +__NTH (bcopy (__const void *__src, void *__dest, size_t __len)) { (void) __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest)); } |