891dedb935
The C library didn't export the 'index' symbol, but its C++ name-mangling instead, which broke the ABI and prevented some applications from loading properly. The main reason was that the implementation under bionic/index.cpp relied on the declaration to specify that the function has C linkage. However, the declaration for index() was removed from both <string.h> and <strings.h> in a recent patch, which made the compiler think it was ok to compile the function with C++ linkage instead! This patch does the following: - Move index() definition to bionic/ndk_cruft.cpp and ensure it uses C linkage. Note that this removes index() from the 64-bit library entirely, this is intentional and will break source compatibility. Simply replacing an index() call with the equivalent strchr() should be enough to fix this in third-party code. - Remove bionic/index.cpp from the tree and build files. - Remove x86 assembly implementation from arch-x86/ to avoid conflict with the one in ndk_cruft.cpp BUG=15606653 Change-Id: I816b589f69c8f8a6511f6be6195d20cf1c4e8123
32 lines
1.4 KiB
Makefile
32 lines
1.4 KiB
Makefile
libc_bionic_src_files_x86 += \
|
|
arch-x86/atom/string/sse2-bzero-atom.S \
|
|
arch-x86/atom/string/sse2-memchr-atom.S \
|
|
arch-x86/atom/string/sse2-memrchr-atom.S \
|
|
arch-x86/atom/string/sse2-memset-atom.S \
|
|
arch-x86/atom/string/sse2-strchr-atom.S \
|
|
arch-x86/atom/string/sse2-strlen-atom.S \
|
|
arch-x86/atom/string/sse2-strnlen-atom.S \
|
|
arch-x86/atom/string/sse2-strrchr-atom.S \
|
|
arch-x86/atom/string/sse2-wcschr-atom.S \
|
|
arch-x86/atom/string/sse2-wcsrchr-atom.S \
|
|
arch-x86/atom/string/sse2-wcslen-atom.S \
|
|
arch-x86/atom/string/sse2-wcscmp-atom.S \
|
|
arch-x86/atom/string/ssse3-bcopy-atom.S \
|
|
arch-x86/atom/string/ssse3-memcmp-atom.S \
|
|
arch-x86/atom/string/ssse3-memcpy-atom.S \
|
|
arch-x86/atom/string/ssse3-memmove-atom.S \
|
|
arch-x86/atom/string/ssse3-strcat-atom.S \
|
|
arch-x86/atom/string/ssse3-strcmp-atom.S \
|
|
arch-x86/atom/string/ssse3-strcpy-atom.S \
|
|
arch-x86/atom/string/ssse3-strlcat-atom.S \
|
|
arch-x86/atom/string/ssse3-strlcpy-atom.S \
|
|
arch-x86/atom/string/ssse3-strncat-atom.S \
|
|
arch-x86/atom/string/ssse3-strncmp-atom.S \
|
|
arch-x86/atom/string/ssse3-strncpy-atom.S \
|
|
arch-x86/atom/string/ssse3-wcscat-atom.S \
|
|
arch-x86/atom/string/ssse3-wcscpy-atom.S \
|
|
arch-x86/atom/string/ssse3-wmemcmp-atom.S
|
|
|
|
libc_bionic_src_files_x86 += \
|
|
arch-x86/silvermont/string/sse2-stpcpy-slm.S \
|
|
arch-x86/silvermont/string/sse2-stpncpy-slm.S
|