[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4635 - in glibc-package/branches/glibc-branch-squeeze/debian: . patches patches/any



Author: aurel32
Date: 2011-05-02 04:34:34 +0000 (Mon, 02 May 2011)
New Revision: 4635

Added:
   glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-string-restrict.diff
Modified:
   glibc-package/branches/glibc-branch-squeeze/debian/changelog
   glibc-package/branches/glibc-branch-squeeze/debian/patches/series
Log:
  * Add patches/any/cvs-string-restrict.diff to fix wrong memmove/bcopy
    optimization with gcc-4.6.  Closes: #619963.



Modified: glibc-package/branches/glibc-branch-squeeze/debian/changelog
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/changelog	2011-05-02 04:10:57 UTC (rev 4634)
+++ glibc-package/branches/glibc-branch-squeeze/debian/changelog	2011-05-02 04:34:34 UTC (rev 4635)
@@ -1,3 +1,10 @@
+eglibc (2.11.2-10squeeze1) UNRELEASED; urgency=low
+
+  * Add patches/any/cvs-string-restrict.diff to fix wrong memmove/bcopy
+    optimization with gcc-4.6.  Closes: #619963.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Mon, 02 May 2011 06:32:12 +0200
+
 eglibc (2.11.2-10) unstable; urgency=low
 
   * Add patches/amd64/cvs-avx-tcb-alignment.diff from upstream to fix 

Added: glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-string-restrict.diff
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-string-restrict.diff	                        (rev 0)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/any/cvs-string-restrict.diff	2011-05-02 04:34:34 UTC (rev 4635)
@@ -0,0 +1,28 @@
+2010-12-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* string/bits/string3.h (memmove, bcopy): Remove __restrict.
+
+diff --git a/string/bits/string3.h b/string/bits/string3.h
+index 1d759f1..1647725 100644
+--- a/string/bits/string3.h
++++ b/string/bits/string3.h
+@@ -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));
+ }

Modified: glibc-package/branches/glibc-branch-squeeze/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-branch-squeeze/debian/patches/series	2011-05-02 04:10:57 UTC (rev 4634)
+++ glibc-package/branches/glibc-branch-squeeze/debian/patches/series	2011-05-02 04:34:34 UTC (rev 4635)
@@ -269,3 +269,4 @@
 any/cvs-audit-suid.diff
 any/cvs-dont-expand-dst-twice.diff
 any/cvs-ignore-origin-privileged.diff
+any/cvs-string-restrict.diff


Reply to: