Contents of /trunk/glibc/patches/glibc-2.15-multiarch-x86-strcmp.patch
Parent Directory | Revision Log
Revision 1806 -
(show annotations)
(download)
Tue Jun 12 12:33:27 2012 UTC (12 years, 3 months ago) by niro
File size: 1607 byte(s)
Tue Jun 12 12:33:27 2012 UTC (12 years, 3 months ago) by niro
File size: 1607 byte(s)
-added patches for 2.15-r1
1 | diff --git a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c |
2 | index d10e872..d4fcd2b 100644 |
3 | --- a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c |
4 | +++ b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c |
5 | @@ -6,6 +6,8 @@ extern __typeof (strcasecmp_l) __strcasecmp_l_nonascii; |
6 | #define USE_IN_EXTENDED_LOCALE_MODEL 1 |
7 | #include <string/strcasecmp.c> |
8 | |
9 | +strong_alias (__strcasecmp_l_nonascii, __strcasecmp_l_ia32) |
10 | + |
11 | /* The needs of strcasecmp in libc are minimal, no need to go through |
12 | the IFUNC. */ |
13 | strong_alias (__strcasecmp_l_nonascii, __GI___strcasecmp_l) |
14 | diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S |
15 | index 5410d17..b3b9eb8 100644 |
16 | --- a/sysdeps/i386/i686/multiarch/strcmp.S |
17 | +++ b/sysdeps/i386/i686/multiarch/strcmp.S |
18 | @@ -111,6 +111,7 @@ END(STRCMP) |
19 | # endif |
20 | #endif |
21 | |
22 | -#ifndef USE_AS_STRNCMP |
23 | +#if !defined USE_AS_STRNCMP && !defined USE_AS_STRCASECMP_L \ |
24 | + && !defined USE_AS_STRNCASECMP_L |
25 | # include "../strcmp.S" |
26 | #endif |
27 | diff --git a/sysdeps/i386/i686/multiarch/strncase_l-c.c b/sysdeps/i386/i686/multiarch/strncase_l-c.c |
28 | index 0c68b8d..7e601af 100644 |
29 | --- a/sysdeps/i386/i686/multiarch/strncase_l-c.c |
30 | +++ b/sysdeps/i386/i686/multiarch/strncase_l-c.c |
31 | @@ -6,6 +6,8 @@ extern __typeof (strncasecmp_l) __strncasecmp_l_nonascii; |
32 | #define USE_IN_EXTENDED_LOCALE_MODEL 1 |
33 | #include <string/strncase.c> |
34 | |
35 | +strong_alias (__strncasecmp_l_nonascii, __strncasecmp_l_ia32) |
36 | + |
37 | /* The needs of strcasecmp in libc are minimal, no need to go through |
38 | the IFUNC. */ |
39 | strong_alias (__strncasecmp_l_nonascii, __GI___strncasecmp_l) |