From cf5c9e2f72c9394f899de61fe2b069d0cb133e5e08430070220016ef32786716 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 9 Dec 2010 15:11:47 +0000 Subject: [PATCH] Accepting request 55356 from home:rguenther:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/55356 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=45 --- glibc-2.11.3-bnc658509.diff | 20 ++++++++++++++++++++ glibc.changes | 6 ++++++ glibc.spec | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 glibc-2.11.3-bnc658509.diff diff --git a/glibc-2.11.3-bnc658509.diff b/glibc-2.11.3-bnc658509.diff new file mode 100644 index 0000000..bdafe1f --- /dev/null +++ b/glibc-2.11.3-bnc658509.diff @@ -0,0 +1,20 @@ +--- ./string/bits/string3.h.orig 2010-12-09 13:29:45.000000000 +0100 ++++ ./string/bits/string3.h 2010-12-09 13:30:15.000000000 +0100 +@@ -53,7 +53,7 @@ + } + + __extern_always_inline void * +-__NTH (memmove (void *__restrict __dest, __const void *__restrict __src, ++__NTH (memmove (void * __dest, __const void * __src, + size_t __len)) + { + return __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest)); +@@ -88,7 +88,7 @@ + + #ifdef __USE_BSD + __extern_always_inline void +-__NTH (bcopy (__const void *__restrict __src, void *__restrict __dest, ++__NTH (bcopy (__const void * __src, void * __dest, + size_t __len)) + { + (void) __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest)); diff --git a/glibc.changes b/glibc.changes index 1f510b3..82d5407 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 9 12:33:35 UTC 2010 - rguenther@novell.com + +- Drop restrict qualifiers from memmove and bcopy fortify wrappers. + [bnc#658509] + ------------------------------------------------------------------- Tue Nov 30 01:53:42 CET 2010 - pbaudis@suse.cz diff --git a/glibc.spec b/glibc.spec index d960b04..3f17936 100644 --- a/glibc.spec +++ b/glibc.spec @@ -141,6 +141,7 @@ Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff Patch503: ARM_glibc-2.10.1-local-no-hwcap.diff # http://sources.redhat.com/bugzilla/show_bug.cgi?id=11155 Patch600: glibc-sparc64-fxstat.diff +Patch601: glibc-2.11.3-bnc658509.diff %description The GNU C Library provides the most important standard libraries used @@ -362,6 +363,7 @@ rm nscd/s-stamp %patch503 %endif %patch600 -p1 +%patch601 # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! #