Author: aurel32
Date: 2010-06-07 15:50:39 +0000 (Mon, 07 Jun 2010)
New Revision: 4330
Added:
glibc-package/trunk/debian/patches/any/submitted-string2-strcmp.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add patches/any/submitted-string2-strcmp.diff to fix warnings in the
testsuite on armel.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-06-07 14:50:32 UTC (rev
4329)
+++ glibc-package/trunk/debian/changelog 2010-06-07 15:50:39 UTC (rev
4330)
@@ -12,8 +12,10 @@
when an i586 Intel CPU is running the i686 library, as valgrind does.
Closes: bug#584748.
* mips testsuite: allow failure of tst-tls3 as it is not a regression.
+ * Add patches/any/submitted-string2-strcmp.diff to fix warnings in the
+ testsuite on armel.
- -- Aurelien Jarno <[email protected]> Mon, 07 Jun 2010 16:23:17 +0200
+ -- Aurelien Jarno <[email protected]> Mon, 07 Jun 2010 17:47:07 +0200
eglibc (2.11.1-2) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/submitted-string2-strcmp.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-string2-strcmp.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/any/submitted-string2-strcmp.diff
2010-06-07 15:50:39 UTC (rev 4330)
@@ -0,0 +1,30 @@
+2010-06-07 Aurelien Jarno <[email protected]>
+
+ * string/bits/string2.h (strcmp): Use __builtin_strlen instead of
+ strlen for values known at compile-time.
+
+diff --git a/string/bits/string2.h b/string/bits/string2.h
+index d298bed..a798acf 100644
+--- a/string/bits/string2.h
++++ b/string/bits/string2.h
+@@ -801,17 +801,17 @@ __stpcpy_small (char *__dest,
+ __extension__
\
+ ({ size_t __s1_len, __s2_len;
\
+ (__builtin_constant_p (s1) && __builtin_constant_p (s2) \
+- && (__s1_len = strlen (s1), __s2_len = strlen (s2), \
++ && (__s1_len = __builtin_strlen (s1), __s2_len = __builtin_strlen (s2),
\
+ (!__string2_1bptr_p (s1) || __s1_len >= 4) \
+ && (!__string2_1bptr_p (s2) || __s2_len >= 4)) \
+ ? __builtin_strcmp (s1, s2) \
+ : (__builtin_constant_p (s1) && __string2_1bptr_p (s1) \
+- && (__s1_len = strlen (s1), __s1_len < 4) \
++ && (__s1_len = __builtin_strlen (s1), __s1_len < 4) \
+ ? (__builtin_constant_p (s2) && __string2_1bptr_p (s2) \
+ ? __builtin_strcmp (s1, s2) \
+ : __strcmp_cg (s1, s2, __s1_len)) \
+ : (__builtin_constant_p (s2) && __string2_1bptr_p (s2) \
+- && (__s2_len = strlen (s2), __s2_len < 4) \
++ && (__s2_len = __builtin_strlen (s2), __s2_len < 4) \
+ ? (__builtin_constant_p (s1) && __string2_1bptr_p (s1) \
+ ? __builtin_strcmp (s1, s2) \
+ : __strcmp_gc (s1, s2, __s2_len)) \
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2010-06-07 14:50:32 UTC (rev
4329)
+++ glibc-package/trunk/debian/patches/series 2010-06-07 15:50:39 UTC (rev
4330)
@@ -241,3 +241,4 @@
any/cvs-glob.diff
any/local-dlfptr.diff
any/local-cpuid-level2.diff
+any/submitted-string2-strcmp.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
