From: GNU Libc Maintainers Date: Wed, 29 Nov 2017 03:00:21 +0000 (+0000) Subject: submitted-string2-strcmp X-Git-Tag: archive/raspbian/2.25-3+rpi1~18 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1f1689fd4028bc9d280ae2e33d1f43638048b8e9;p=glibc.git submitted-string2-strcmp 2010-06-07 Aurelien Jarno * 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 e5337becf..ceea7cc2f 100644 --- 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)) \