Skip to content

Commit

Permalink
Fix -D_FORTIFY_SOURCE memmove and bcop
Browse files Browse the repository at this point in the history
(cherry picked from commit 42acbb9)
  • Loading branch information
Jakub Jelinek authored and Andreas Schwab committed Dec 13, 2010
1 parent 745cb72 commit 9796df9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
8 changes: 3 additions & 5 deletions string/bits/string3.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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));
}
Expand Down Expand Up @@ -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));
}
Expand Down

0 comments on commit 9796df9

Please sign in to comment.