diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-08-09 16:04:37 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-08-09 16:04:37 -0700 |
| commit | f85fa27058eb7d4b56b8deaf885064cf8d730f68 (patch) | |
| tree | f7e63a9691ff3c88f60506816e388e17bcfbeb89 /sysdeps/x86_64/multiarch | |
| parent | 6dcf80c78273c5e0bdcacaf64a9b34fd930b405f (diff) | |
| download | glibc-f85fa27058eb7d4b56b8deaf885064cf8d730f68.tar.gz | |
Avoid DWARF definition DIE on ifunc symbols
Diffstat (limited to 'sysdeps/x86_64/multiarch')
| -rw-r--r-- | sysdeps/x86_64/multiarch/memmove.c | 25 | ||||
| -rw-r--r-- | sysdeps/x86_64/multiarch/strstr-c.c | 17 |
2 files changed, 32 insertions, 10 deletions
diff --git a/sysdeps/x86_64/multiarch/memmove.c b/sysdeps/x86_64/multiarch/memmove.c index ca16263a17..6e91025eb6 100644 --- a/sysdeps/x86_64/multiarch/memmove.c +++ b/sysdeps/x86_64/multiarch/memmove.c @@ -17,7 +17,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <string.h> +#include <stddef.h> #ifndef NOT_IN_libc #include <shlib-compat.h> @@ -29,20 +29,31 @@ # define libc_hidden_builtin_def(name) \ __hidden_ver1 (__memmove_sse2, __GI_memmove, __memmove_sse2); #endif -#endif -extern __typeof (memmove) __memmove_sse2 attribute_hidden; -extern __typeof (memmove) __memmove_ssse3 attribute_hidden; -extern __typeof (memmove) __memmove_ssse3_back attribute_hidden; +/* Redefine memmove so that the compiler won't complain about the type + mismatch with the IFUNC selector in strong_alias, below. */ +#undef memmove +#define memmove __redirect_memmove +#endif #include "string/memmove.c" #ifndef NOT_IN_libc -libc_ifunc (memmove, +extern __typeof (__redirect_memmove) __memmove_sse2 attribute_hidden; +extern __typeof (__redirect_memmove) __memmove_ssse3 attribute_hidden; +extern __typeof (__redirect_memmove) __memmove_ssse3_back attribute_hidden; + +/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle + ifunc symbol properly. */ +extern __typeof (__redirect_memmove) __libc_memmove; +libc_ifunc (__libc_memmove, HAS_SSSE3 ? (HAS_FAST_COPY_BACKWARD ? __memmove_ssse3_back : __memmove_ssse3) - : __memmove_sse2); + : __memmove_sse2) + +#undef memmove +strong_alias (__libc_memmove, memmove) #if SHLIB_COMPAT (libc, GLIBC_2_2_5, GLIBC_2_14) compat_symbol (libc, memmove, memcpy, GLIBC_2_2_5); diff --git a/sysdeps/x86_64/multiarch/strstr-c.c b/sysdeps/x86_64/multiarch/strstr-c.c index b8ed3161d5..795789e704 100644 --- a/sysdeps/x86_64/multiarch/strstr-c.c +++ b/sysdeps/x86_64/multiarch/strstr-c.c @@ -7,9 +7,20 @@ __hidden_ver1 (__strstr_sse2, __GI_strstr, __strstr_sse2); #endif +/* Redefine strstr so that the compiler won't complain about the type + mismatch with the IFUNC selector in strong_alias, below. */ +#undef strstr +#define strstr __redirect_strstr + #include "string/strstr.c" -extern char *__strstr_sse42 (const char *, const char *) attribute_hidden; -extern __typeof (__strstr_sse2) __strstr_sse2 attribute_hidden; +extern __typeof (__redirect_strstr) __strstr_sse42 attribute_hidden; +extern __typeof (__redirect_strstr) __strstr_sse2 attribute_hidden; + +/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle + ifunc symbol properly. */ +extern __typeof (__redirect_strstr) __libc_strstr; +libc_ifunc (__libc_strstr, HAS_SSE4_2 ? __strstr_sse42 : __strstr_sse2) -libc_ifunc (strstr, HAS_SSE4_2 ? __strstr_sse42 : __strstr_sse2); +#undef strstr +strong_alias (__libc_strstr, strstr) |