From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 9 Dec 2010 15:38:18 +0000 (-0500)
Subject: Fix -D_FORTIFY_SOURCE memmove and bcop
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2796cd94a85e1d6a5acb2a86e2c6cc41abc33efa;p=thirdparty%2Fglibc.git

Fix -D_FORTIFY_SOURCE memmove and bcop

(cherry picked from commit 42acbb92c861e97a6e1293ea853db88342a1bf53)
---

diff --git a/ChangeLog b/ChangeLog
index a96cfd59d2a..ece72c8e902 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-11-30  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/i386/fpu/libm-test-ulps: Relax ynf(10,0.75) test expectations.
diff --git a/string/bits/string3.h b/string/bits/string3.h
index 1d759f181b1..164772572bd 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));
 }