submitted-string2-strcmp

2010-06-07  Aurelien Jarno  <aurelien@aurel32.net>

        * string/bits/string2.h (strcmp): Use __builtin_strlen instead of
	strlen for values known at compile-time.

Gbp-Pq: Topic any
Gbp-Pq: Name submitted-string2-strcmp.diff

diff --git a/string/bits/string2.h b/string/bits/string2.h
index e5337becf6fd21a7f303f4e9e8152f8571ec96b1..ceea7cc2f002f6190783836c471e16267c4974ac 100644 (file)
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -108,17 +108,17 @@ extern void *__rawmemchr (const void *__s, int __c);
   __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_cg (s2, s1, __s2_len))                             \