tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_bionic/libc/Android.mk

1097 lines
33 KiB
Makefile
Raw Normal View History

auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
LOCAL_PATH:= $(call my-dir)
include $(LOCAL_PATH)/arch-$(TARGET_ARCH)/syscalls.mk
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
# Make everything depend on any changes to included makefiles.
libc_common_additional_dependencies := \
$(LOCAL_PATH)/arch-$(TARGET_ARCH)/syscalls.mk \
$(LOCAL_PATH)/Android.mk \
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
# Define the common source files for all the libc instances
# =========================================================
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
libc_common_src_files := \
$(syscall_src) \
unistd/alarm.c \
unistd/exec.c \
unistd/fnmatch.c \
unistd/syslog.c \
unistd/system.c \
unistd/time.c \
stdio/asprintf.c \
stdio/fflush.c \
stdio/fgetc.c \
stdio/findfp.c \
stdio/fprintf.c \
stdio/fputc.c \
stdio/fread.c \
stdio/freopen.c \
stdio/fscanf.c \
stdio/fseek.c \
stdio/ftell.c \
stdio/fvwrite.c \
stdio/gets.c \
stdio/printf.c \
stdio/refill.c \
stdio/rewind.c \
stdio/scanf.c \
stdio/snprintf.c\
stdio/sprintf.c \
stdio/sscanf.c \
stdio/stdio.c \
stdio/ungetc.c \
stdio/vasprintf.c \
stdio/vfprintf.c \
stdio/vfscanf.c \
stdio/vprintf.c \
stdio/vsnprintf.c \
stdio/vsprintf.c \
stdio/vscanf.c \
stdio/vsscanf.c \
stdio/wbuf.c \
stdlib/atexit.c \
stdlib/ctype_.c \
stdlib/exit.c \
stdlib/getenv.c \
stdlib/putenv.c \
stdlib/setenv.c \
stdlib/strtod.c \
stdlib/strtoimax.c \
stdlib/strtol.c \
stdlib/strtoll.c \
stdlib/strtoul.c \
stdlib/strtoull.c \
stdlib/strtoumax.c \
stdlib/tolower_.c \
stdlib/toupper_.c \
string/strcasecmp.c \
string/strcspn.c \
string/strdup.c \
string/strpbrk.c \
string/strsep.c \
string/strspn.c \
string/strstr.c \
string/strtok.c \
wchar.h: improve wchar_t support in Bionic Change-Id: Iffd41046fd0933c66542abf7627a1569522dfcb2
2010-06-15 02:18:35 +02:00
wchar/wcswidth.c \
Just link fixes for b 2763938. Added wcsxfrm.c and wmemcmp.c to the src files in Android.mk and removed wcsxfrm from wchar.c Change-Id: Iab9b45cf78c27880d2941c360340a7af6b8964fe
2010-06-16 15:51:52 +02:00
wchar/wcsxfrm.c \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
bionic/arc4random.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/atoi.c \
bionic/atol.c \
bionic/atoll.c \
bionic/bindresvport.c \
bionic/bionic_clone.c \
Add implementation of fdprintf, clearenv, and stubs for ttyname_r, *usershell Change-Id: I5fe7e8b6ee5edbb49e707c3b6737a58563781fa3
2010-01-14 02:48:34 +01:00
bionic/clearenv.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/daemon.c \
Add fts, err, and sys/queue for grep Change-Id: Id47514a1812d828e95efa2fab0e9c15c5b682b58
2010-01-14 06:19:52 +01:00
bionic/err.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/ether_aton.c \
bionic/ether_ntoa.c \
Add implementation of fdprintf, clearenv, and stubs for ttyname_r, *usershell Change-Id: I5fe7e8b6ee5edbb49e707c3b6737a58563781fa3
2010-01-14 02:48:34 +01:00
bionic/fdprintf.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/flockfile.c \
bionic/ftime.c \
bionic/ftok.c \
Add fts, err, and sys/queue for grep Change-Id: Id47514a1812d828e95efa2fab0e9c15c5b682b58
2010-01-14 06:19:52 +01:00
bionic/fts.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/getdtablesize.c \
bionic/gethostname.c \
bionic/getpgrp.c \
bionic/getpriority.c \
bionic/getpt.c \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
bionic/if_indextoname.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/if_nametoindex.c \
bionic/initgroups.c \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
bionic/ioctl.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/isatty.c \
bionic/issetugid.c \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
bionic/ldexp.c \
bionic/md5.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/memmem.c \
bionic/memswap.c \
bionic/pathconf.c \
bionic/perror.c \
bionic/ptsname.c \
bionic/ptsname_r.c \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
bionic/pututline.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/reboot.c \
bionic/recv.c \
<sched.h>: Add sched_getcpu() and cpu_set_t This adds the cpu_set_t type definition and related functions and macros used to handle CPU thread affinity. sched_getcpu() sched_setaffinity() sched_getaffinity() Change-Id: If382ecafde8926341a88478062b275553645065b
2010-12-03 18:04:01 +01:00
bionic/sched_cpualloc.c \
bionic/sched_cpucount.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/sched_getcpu.c \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
bionic/semaphore.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/send.c \
bionic/setpgrp.c \
bionic/sigblock.c \
bionic/siginterrupt.c \
bionic/siglist.c \
bionic/signame.c \
bionic/sigsetmask.c \
bionic/sleep.c \
bionic/strndup.c \
bionic/strntoimax.c \
bionic/strntoumax.c \
bionic/strtotimeval.c \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
bionic/system_properties.c \
bionic: add compatibility mode for properties Allow a new bionic to work with an old init property area by supporting the old format. (cherry picked from commit ad76c85b9ca587084089d086f954158bc0eae905) Change-Id: Ib496e818a62a5834d40c71eb4745783d998be893
2013-06-25 03:36:39 +02:00
bionic/system_properties_compat.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/tcgetpgrp.c \
bionic/tcsetpgrp.c \
bionic/time64.c \
bionic/umount.c \
bionic/unlockpt.c \
bionic/usleep.c \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
bionic/utmp.c \
Move non-upstream code into the libc/bionic directory. I'll need at least one more pass, because there's some upstream code lurking in libc/bionic, but this is still a step in the right direction. Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-02 02:35:49 +02:00
bionic/wcscoll.c \
Fix x86_64 build, clean up intermediate libraries. The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
2013-10-10 00:50:50 +02:00
libc_dns_src_files += \
netbsd/gethnamaddr.c \
netbsd/inet/nsap_addr.c \
netbsd/nameser/ns_name.c \
netbsd/nameser/ns_netint.c \
netbsd/nameser/ns_parse.c \
netbsd/nameser/ns_print.c \
netbsd/nameser/ns_samedomain.c \
netbsd/nameser/ns_ttl.c \
netbsd/net/base64.c \
netbsd/net/getaddrinfo.c \
netbsd/net/getnameinfo.c \
netbsd/net/getservbyname.c \
netbsd/net/getservbyport.c \
netbsd/net/getservent.c \
netbsd/net/nsdispatch.c \
netbsd/resolv/__dn_comp.c \
netbsd/resolv/herror.c \
netbsd/resolv/res_cache.c \
netbsd/resolv/__res_close.c \
netbsd/resolv/res_comp.c \
netbsd/resolv/res_data.c \
netbsd/resolv/res_debug.c \
netbsd/resolv/res_init.c \
netbsd/resolv/res_mkquery.c \
netbsd/resolv/res_query.c \
netbsd/resolv/__res_send.c \
netbsd/resolv/res_send.c \
netbsd/resolv/res_state.c \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
Clean up the 32-bit kernel support, fix LP64 fcntl declaration. In practice, thanks to all the registers the stubs don't actually change, but it's confusing to have an incorrect declaration. I suspect that fcntl remains broken for aarch64; it happens to work for x86_64 because the first vararg argument gets placed in the right register anyway, but I have no reason to believe that's true for aarch64. This patch adds a unit test, though, so we'll be able to tell when we get as far as running the unit tests. Change-Id: I58dd0054fe99d7d51d04c22781d8965dff1afbf3
2013-11-07 01:20:54 +01:00
# These are used by the 32-bit targets, but not the 64-bit ones.
x86_64: Update Makefiles for x86_64 targets and add symlinks Use basic .c versions of all functions for x86_64 until they are manually optimized and .s versions released. Change-Id: I59bba08931e894822db485c8803c2665c226234a Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-12-18 14:30:02 +01:00
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm mips x86))
libc_common_src_files += \
Clean up the 32-bit kernel support, fix LP64 fcntl declaration. In practice, thanks to all the registers the stubs don't actually change, but it's confusing to have an incorrect declaration. I suspect that fcntl remains broken for aarch64; it happens to work for x86_64 because the first vararg argument gets placed in the right register anyway, but I have no reason to believe that's true for aarch64. This patch adds a unit test, though, so we'll be able to tell when we get as far as running the unit tests. Change-Id: I58dd0054fe99d7d51d04c22781d8965dff1afbf3
2013-11-07 01:20:54 +01:00
bionic/legacy_32_bit_support.cpp \
Start moving 32-bit cruft somewhere it won't pollute 64-bit. Change-Id: I03a6a50a5243f29e50fb58a3cf8b5e7198640baa
2013-10-25 02:14:55 +02:00
bionic/ndk_cruft.cpp \
x86_64: Update Makefiles for x86_64 targets and add symlinks Use basic .c versions of all functions for x86_64 until they are manually optimized and .s versions released. Change-Id: I59bba08931e894822db485c8803c2665c226234a Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-12-18 14:30:02 +01:00
endif
Optimize __memset_chk, __memcpy_chk. DO NOT MERGE. This change creates assembler versions of __memcpy_chk/__memset_chk that is implemented in the memcpy/memset assembler code. This change avoids an extra call to memcpy/memset, instead allowing a simple fall through to occur from the chk code into the body of the real implementation. Testing: - Ran the libc_test on __memcpy_chk/__memset_chk on all nexus devices. - Wrote a small test executable that has three calls to __memcpy_chk and three calls to __memset_chk. First call dest_len is length + 1. Second call dest_len is length. Third call dest_len is length - 1. Verified that the first two calls pass, and the third fails. Examined the logcat output on all nexus devices to verify that the fortify error message was sent properly. - I benchmarked the new __memcpy_chk and __memset_chk on all systems. For __memcpy_chk and large copies, the savings is relatively small (about 1%). For small copies, the savings is large on cortex-a15/krait devices (between 5% to 30%). For cortex-a9 and small copies, the speed up is present, but relatively small (about 3% to 5%). For __memset_chk and large copies, the savings is also small (about 1%). However, all processors show larger speed-ups on small copies (about 30% to 100%). Bug: 9293744 Merge from internal master. (cherry-picked from 7c860db0747f6276a6e43984d43f8fa5181ea936) Change-Id: I916ad305e4001269460ca6ebd38aaa0be8ac7f52
2013-08-01 22:13:33 +02:00
# Fortify implementations of libc functions.
libc_common_src_files += \
FORTIFY_SOURCE: Add __FD_* checks Add FORTIFY_SOURCE checks for the following macros: * FD_CLR * FD_ISSET * FD_SET Bug: 11047121 Change-Id: I3c5952136aec9eff3288b91b1318677ff971525c
2013-10-03 01:11:30 +02:00
bionic/__FD_chk.cpp \
Optimize __memset_chk, __memcpy_chk. DO NOT MERGE. This change creates assembler versions of __memcpy_chk/__memset_chk that is implemented in the memcpy/memset assembler code. This change avoids an extra call to memcpy/memset, instead allowing a simple fall through to occur from the chk code into the body of the real implementation. Testing: - Ran the libc_test on __memcpy_chk/__memset_chk on all nexus devices. - Wrote a small test executable that has three calls to __memcpy_chk and three calls to __memset_chk. First call dest_len is length + 1. Second call dest_len is length. Third call dest_len is length - 1. Verified that the first two calls pass, and the third fails. Examined the logcat output on all nexus devices to verify that the fortify error message was sent properly. - I benchmarked the new __memcpy_chk and __memset_chk on all systems. For __memcpy_chk and large copies, the savings is relatively small (about 1%). For small copies, the savings is large on cortex-a15/krait devices (between 5% to 30%). For cortex-a9 and small copies, the speed up is present, but relatively small (about 3% to 5%). For __memset_chk and large copies, the savings is also small (about 1%). However, all processors show larger speed-ups on small copies (about 30% to 100%). Bug: 9293744 Merge from internal master. (cherry-picked from 7c860db0747f6276a6e43984d43f8fa5181ea936) Change-Id: I916ad305e4001269460ca6ebd38aaa0be8ac7f52
2013-08-01 22:13:33 +02:00
bionic/__fgets_chk.cpp \
bionic/__memcpy_chk.cpp \
bionic/__memmove_chk.cpp \
bionic/__memset_chk.cpp \
FORTIFY_SOURCE: fortify read() Change-Id: Ic7de163fe121db13e00560adb257331bc709814d
2013-10-10 05:16:34 +02:00
bionic/__read_chk.cpp \
libc: fortify recvfrom() Fortify calls to recv() and recvfrom(). We use __bos0 to match glibc's behavior, and because I haven't tested using __bos. Change-Id: Iad6ae96551a89af17a9c347b80cdefcf2020c505
2013-09-25 01:32:07 +02:00
bionic/__recvfrom_chk.cpp \
Optimize __memset_chk, __memcpy_chk. DO NOT MERGE. This change creates assembler versions of __memcpy_chk/__memset_chk that is implemented in the memcpy/memset assembler code. This change avoids an extra call to memcpy/memset, instead allowing a simple fall through to occur from the chk code into the body of the real implementation. Testing: - Ran the libc_test on __memcpy_chk/__memset_chk on all nexus devices. - Wrote a small test executable that has three calls to __memcpy_chk and three calls to __memset_chk. First call dest_len is length + 1. Second call dest_len is length. Third call dest_len is length - 1. Verified that the first two calls pass, and the third fails. Examined the logcat output on all nexus devices to verify that the fortify error message was sent properly. - I benchmarked the new __memcpy_chk and __memset_chk on all systems. For __memcpy_chk and large copies, the savings is relatively small (about 1%). For small copies, the savings is large on cortex-a15/krait devices (between 5% to 30%). For cortex-a9 and small copies, the speed up is present, but relatively small (about 3% to 5%). For __memset_chk and large copies, the savings is also small (about 1%). However, all processors show larger speed-ups on small copies (about 30% to 100%). Bug: 9293744 Merge from internal master. (cherry-picked from 7c860db0747f6276a6e43984d43f8fa5181ea936) Change-Id: I916ad305e4001269460ca6ebd38aaa0be8ac7f52
2013-08-01 22:13:33 +02:00
bionic/__strcat_chk.cpp \
bionic/__strchr_chk.cpp \
bionic/__strcpy_chk.cpp \
bionic/__strlcat_chk.cpp \
bionic/__strlcpy_chk.cpp \
bionic/__strlen_chk.cpp \
bionic/__strncat_chk.cpp \
bionic/__strncpy_chk.cpp \
bionic/__strrchr_chk.cpp \
bionic/__umask_chk.cpp \
bionic/__vsnprintf_chk.cpp \
bionic/__vsprintf_chk.cpp \
Move setlocale(3) and the wchar stubs over to .cpp. Also separate out the C++ files so we can use -Werror on them. I'd rather wait for LOCAL_CPPFLAGS to be in AOSP, but this also lets us see which files still need to be sorted into one bucket or the other. Change-Id: I6acc1f7c043935c70a3b089f705d218b9aaaba0a
2012-10-23 02:05:27 +02:00
libc_bionic_src_files := \
Clean up abort. * A dlmalloc usage error shouldn't call abort(3) because we want to cause a SIGSEGV by writing the address dlmalloc didn't like to an address the kernel won't like, so that debuggerd will dump the memory around the address that upset dlmalloc. * Switch to the simpler FreeBSD/NetBSD style of registering stdio cleanup. Hopefully this will let us simplify more of the stdio implementation. * Clear the stdio cleanup handler before we abort because of a dlmalloc corruption error. This fixes the reported bug, where we'd hang inside dlmalloc because the stdio cleanup reentered dlmalloc. Bug: 9301265 Change-Id: Ief31b389455d6876e5a68f0f5429567d37277dbc
2013-06-12 23:05:46 +02:00
bionic/abort.cpp \
Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls. Modern architectures only get the *at(2) system calls. For example, aarch64 doesn't have open(2), and expects userspace to use openat(2) instead. Change-Id: I87b4ed79790cb8a80844f5544ac1a13fda26c7b5
2013-10-22 22:28:46 +02:00
bionic/access.cpp \
Clean up the implementation of the <dirent.h> functions. Change-Id: I3c647cc9588525afc41fee90ee468d58cd13503a
2012-10-26 05:55:23 +02:00
bionic/assert.cpp \
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls. (aarch64 kernels don't have these system calls.) Change-Id: I6f64075aa412f71520f2df71c3d69b647f91c1ca
2013-10-25 00:15:14 +02:00
bionic/bionic_time_conversions.cpp \
Remove bogus extra alignment from sbrk. Bug: https://code.google.com/p/android/issues/detail?id=37349 Change-Id: I970c7b6be7bb7fbe6bbbe2c332f05816aeb0e09f
2013-02-06 01:10:59 +01:00
bionic/brk.cpp \
Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls. Modern architectures only get the *at(2) system calls. For example, aarch64 doesn't have open(2), and expects userspace to use openat(2) instead. Change-Id: I87b4ed79790cb8a80844f5544ac1a13fda26c7b5
2013-10-22 22:28:46 +02:00
bionic/chmod.cpp \
bionic/chown.cpp \
libc: Fix alphasort() signature (and implementation). The declaration for alphasort() in <dirent.h> used the deprecated: int alphasort(const void*, const void*); while both Posix and GLibc use instead: int alphasort(const struct dirent** a, const struct dirent** b); See: http://pubs.opengroup.org/onlinepubs/9699919799/functions/alphasort.html This patch does the following: - Update the declaration to match Posix/GLibc - Get rid of the upstream BSD code which isn't compatible with the new signature. - Implement a new trivial alphasort() with the right signature, and ensure that it uses strcoll() instead of strcmp(). - Remove Bionic-specific #ifdef .. #else .. #endif block in dirent_test.cpp which uses alphasort(). Even through strcoll() currently uses strcmp(), this does the right thing in the case where we decide to update strcoll() to properly implement locale-specific ordered comparison. Change-Id: I4fd45604d8a940aaf2eb0ecd7d73e2f11c9bca96
2012-10-29 15:32:54 +01:00
bionic/dirent.cpp \
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls. (aarch64 kernels only have the newer system calls.) Also expose the new functionality that's exposed by glibc in our header files. Change-Id: I45d2d168a03f88723d1f7fbf634701006a4843c5
2013-10-23 18:48:29 +02:00
bionic/dup2.cpp \
bionic/epoll_create.cpp \
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls. (aarch64 kernels don't have these system calls.) Change-Id: I6f64075aa412f71520f2df71c3d69b647f91c1ca
2013-10-25 00:15:14 +02:00
bionic/epoll_wait.cpp \
bionic/epoll_pwait.cpp \
Fix __errno for LP64 and clean up __get_tls. If __get_tls has the right type, a lot of confusing casting can disappear. It was probably a mistake that __get_tls was exposed as a function for mips and x86 (but not arm), so let's (a) ensure that the __get_tls function always matches the macro, (b) that we have the function for arm too, and (c) that we don't have the function for any 64-bit architecture. Change-Id: Ie9cb989b66e2006524ad7733eb6e1a65055463be
2013-10-09 03:50:24 +02:00
bionic/__errno.cpp \
Prevent name conflict for eventfd.cpp and eventfd.s when building libc.a - eventfd.cpp and eventfd.s will output to the same file when building libc.a out/target/product/*/obj/STATIC_LIBRARIES/libc_intermediates/WHOLE/libc_common_objs/eventfd.o - And then `eventfd` will undefined when statically linked to libc. Also add a unit test. (cherry-pick of 8baa929d5d3bcf63381cf78ba76168c80c303f5e.) Change-Id: Icd0eb0f4ce0511fb9ec00a504d491afd47d744d3
2013-04-03 05:29:40 +02:00
bionic/eventfd_read.cpp \
bionic/eventfd_write.cpp \
Let the compiler worry about implementing ffs(3). It does at least as good a job as our old hand-written assembly anyway. Change-Id: If7c4a1ac508bace0b71ee7b67808caa6eabf11d2
2013-10-25 01:29:40 +02:00
bionic/ffs.cpp \
Clean up the cpuacct cruft. Change-Id: I6ed63af8dfc2368e211420389fa8af4d5dc0908f
2013-10-10 02:35:36 +02:00
bionic/fork.cpp \
Add futimens. Bug: 10239370 Change-Id: I518340084103dc339ef8a065d4837d6258a1381d
2013-08-09 02:13:33 +02:00
bionic/futimens.cpp \
libc: add getauxval() Add support for getauxval(). This method allows a program an easy way to retrieve information from the kernel auxiliary vector, and will hopefully replace other clumsy ways of accessing this same information. This particular function was also added to glibc in glibc 2.16. See the following URLs for more details. * http://lwn.net/Articles/519085/ * http://www.gnu.org/software/libc/manual/html_node/Auxiliary-Vector.html This change is a prerequisite for bug 7959813. Bug: http://code.google.com/p/android/issues/detail?id=38441 Change-Id: Iba19d899df334bddc6f4899077ece2fc87564ea8
2013-01-11 23:43:05 +01:00
bionic/getauxval.cpp \
Clean up the implementation of the <dirent.h> functions. Change-Id: I3c647cc9588525afc41fee90ee468d58cd13503a
2012-10-26 05:55:23 +02:00
bionic/getcwd.cpp \
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls. (aarch64 kernels only have the newer system calls.) Also expose the new functionality that's exposed by glibc in our header files. Change-Id: I45d2d168a03f88723d1f7fbf634701006a4843c5
2013-10-23 18:48:29 +02:00
bionic/inotify_init.cpp \
Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls. Modern architectures only get the *at(2) system calls. For example, aarch64 doesn't have open(2), and expects userspace to use openat(2) instead. Change-Id: I87b4ed79790cb8a80844f5544ac1a13fda26c7b5
2013-10-22 22:28:46 +02:00
bionic/lchown.cpp \
Clean up the argc/argv/envp/auxv handling. There's now only one place where we deal with this stuff, it only needs to be parsed once by the dynamic linker (rather than by each recipient), and it's now easier for us to get hold of auxv data early on. Change-Id: I6314224257c736547aac2e2a650e66f2ea53bef5
2013-02-07 19:14:39 +01:00
bionic/libc_init_common.cpp \
Clean up internal libc logging. We only need one logging API, and I prefer the one that does no allocation and is thus safe to use in any context. Also use O_CLOEXEC when opening the /dev/log files. Move everything logging-related into one header file. Change-Id: Ic1e3ea8e9b910dc29df351bff6c0aa4db26fbb58
2013-03-15 23:30:25 +01:00
bionic/libc_logging.cpp \
Clean up the <libgen.h> implementation a little, bring in tests. Most of these tests were in system/extras, but I've added more to cover other cases explicitly mentioned by POSIX. Change-Id: I5e8d77e4179028d77306935cceadbb505515dcde
2012-10-29 22:27:10 +01:00
bionic/libgen.cpp \
Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls. Modern architectures only get the *at(2) system calls. For example, aarch64 doesn't have open(2), and expects userspace to use openat(2) instead. Change-Id: I87b4ed79790cb8a80844f5544ac1a13fda26c7b5
2013-10-22 22:28:46 +02:00
bionic/link.cpp \
bionic/lstat.cpp \
bionic/mkdir.cpp \
Make sure we have a mkfifo symbol. Bug: https://code.google.com/p/android/issues/detail?id=58888 Change-Id: Ic0a883a5f30beb82cb7be3c4e81b6d693d5fbb4d
2013-10-22 19:54:11 +02:00
bionic/mkfifo.cpp \
Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls. Modern architectures only get the *at(2) system calls. For example, aarch64 doesn't have open(2), and expects userspace to use openat(2) instead. Change-Id: I87b4ed79790cb8a80844f5544ac1a13fda26c7b5
2013-10-22 22:28:46 +02:00
bionic/mknod.cpp \
bionic/open.cpp \
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls. (aarch64 kernels don't have these system calls.) Change-Id: I6f64075aa412f71520f2df71c3d69b647f91c1ca
2013-10-25 00:15:14 +02:00
bionic/pause.cpp \
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_NO_FLAGS syscalls. (aarch64 kernels only have the newer system calls.) Also expose the new functionality that's exposed by glibc in our header files. Change-Id: I45d2d168a03f88723d1f7fbf634701006a4843c5
2013-10-23 18:48:29 +02:00
bionic/pipe.cpp \
Remove dependencies on obsolete __ARCH_WANT_SYSCALL_DEPRECATED system calls. (aarch64 kernels don't have these system calls.) Change-Id: I6f64075aa412f71520f2df71c3d69b647f91c1ca
2013-10-25 00:15:14 +02:00
bionic/poll.cpp \
<pthread.h> fixes and pthread cleanup. <pthread.h> was missing nonnull attributes, noreturn on pthread_exit, and had incorrect cv qualifiers for several standard functions. I've also marked the non-standard stuff (where I count glibc rather than POSIX as "standard") so we can revisit this cruft for LP64 and try to ensure we're compatible with glibc. I've also broken out the pthread_cond* functions into a new file. I've made the remaining pthread files (plus ptrace) part of the bionic code and fixed all the warnings. I've added a few more smoke tests for chunks of untested pthread functionality. We no longer need the libc_static_common_src_files hack for any of the pthread implementation because we long since stripped out the rest of the armv5 support, and this hack was just to ensure that __get_tls in libc.a went via the kernel if necessary. This patch also finishes the job of breaking up the pthread.c monolith, and adds a handful of new tests. Change-Id: Idc0ae7f5d8aa65989598acd4c01a874fe21582c7
2013-10-30 22:40:09 +01:00
bionic/pthread_atfork.cpp \
Revert "Revert "More pthreads cleanup."" This reverts commit 6f94de3ca49e4ea147b1c59e5818fa175846518f (Doesn't try to increase the number of TLS slots; that leads to an inability to boot. Adds more tests.) Change-Id: Ia7d25ba3995219ed6e686463dbba80c95cc831ca
2013-02-12 17:40:24 +01:00
bionic/pthread_attr.cpp \
<pthread.h> fixes and pthread cleanup. <pthread.h> was missing nonnull attributes, noreturn on pthread_exit, and had incorrect cv qualifiers for several standard functions. I've also marked the non-standard stuff (where I count glibc rather than POSIX as "standard") so we can revisit this cruft for LP64 and try to ensure we're compatible with glibc. I've also broken out the pthread_cond* functions into a new file. I've made the remaining pthread files (plus ptrace) part of the bionic code and fixed all the warnings. I've added a few more smoke tests for chunks of untested pthread functionality. We no longer need the libc_static_common_src_files hack for any of the pthread implementation because we long since stripped out the rest of the armv5 support, and this hack was just to ensure that __get_tls in libc.a went via the kernel if necessary. This patch also finishes the job of breaking up the pthread.c monolith, and adds a handful of new tests. Change-Id: Idc0ae7f5d8aa65989598acd4c01a874fe21582c7
2013-10-30 22:40:09 +01:00
bionic/pthread_cond.cpp \
bionic/pthread_create.cpp \
Fix pthreads functions that should return ESRCH. imgtec pointed out that pthread_kill(3) was broken, but most of the other functions that ought to return ESRCH for invalid/exited threads were equally broken. Change-Id: I96347f6195549aee0c72dc39063e6c5d06d2e01f
2013-02-16 04:21:51 +01:00
bionic/pthread_detach.cpp \
bionic/pthread_equal.cpp \
<pthread.h> fixes and pthread cleanup. <pthread.h> was missing nonnull attributes, noreturn on pthread_exit, and had incorrect cv qualifiers for several standard functions. I've also marked the non-standard stuff (where I count glibc rather than POSIX as "standard") so we can revisit this cruft for LP64 and try to ensure we're compatible with glibc. I've also broken out the pthread_cond* functions into a new file. I've made the remaining pthread files (plus ptrace) part of the bionic code and fixed all the warnings. I've added a few more smoke tests for chunks of untested pthread functionality. We no longer need the libc_static_common_src_files hack for any of the pthread implementation because we long since stripped out the rest of the armv5 support, and this hack was just to ensure that __get_tls in libc.a went via the kernel if necessary. This patch also finishes the job of breaking up the pthread.c monolith, and adds a handful of new tests. Change-Id: Idc0ae7f5d8aa65989598acd4c01a874fe21582c7
2013-10-30 22:40:09 +01:00
bionic/pthread_exit.cpp \
Fix pthreads functions that should return ESRCH. imgtec pointed out that pthread_kill(3) was broken, but most of the other functions that ought to return ESRCH for invalid/exited threads were equally broken. Change-Id: I96347f6195549aee0c72dc39063e6c5d06d2e01f
2013-02-16 04:21:51 +01:00
bionic/pthread_getcpuclockid.cpp \
bionic/pthread_getschedparam.cpp \
bionic/pthread_internals.cpp \
bionic/pthread_join.cpp \
<pthread.h> fixes and pthread cleanup. <pthread.h> was missing nonnull attributes, noreturn on pthread_exit, and had incorrect cv qualifiers for several standard functions. I've also marked the non-standard stuff (where I count glibc rather than POSIX as "standard") so we can revisit this cruft for LP64 and try to ensure we're compatible with glibc. I've also broken out the pthread_cond* functions into a new file. I've made the remaining pthread files (plus ptrace) part of the bionic code and fixed all the warnings. I've added a few more smoke tests for chunks of untested pthread functionality. We no longer need the libc_static_common_src_files hack for any of the pthread implementation because we long since stripped out the rest of the armv5 support, and this hack was just to ensure that __get_tls in libc.a went via the kernel if necessary. This patch also finishes the job of breaking up the pthread.c monolith, and adds a handful of new tests. Change-Id: Idc0ae7f5d8aa65989598acd4c01a874fe21582c7
2013-10-30 22:40:09 +01:00
bionic/pthread_key.cpp \
Fix pthreads functions that should return ESRCH. imgtec pointed out that pthread_kill(3) was broken, but most of the other functions that ought to return ESRCH for invalid/exited threads were equally broken. Change-Id: I96347f6195549aee0c72dc39063e6c5d06d2e01f
2013-02-16 04:21:51 +01:00
bionic/pthread_kill.cpp \
<pthread.h> fixes and pthread cleanup. <pthread.h> was missing nonnull attributes, noreturn on pthread_exit, and had incorrect cv qualifiers for several standard functions. I've also marked the non-standard stuff (where I count glibc rather than POSIX as "standard") so we can revisit this cruft for LP64 and try to ensure we're compatible with glibc. I've also broken out the pthread_cond* functions into a new file. I've made the remaining pthread files (plus ptrace) part of the bionic code and fixed all the warnings. I've added a few more smoke tests for chunks of untested pthread functionality. We no longer need the libc_static_common_src_files hack for any of the pthread implementation because we long since stripped out the rest of the armv5 support, and this hack was just to ensure that __get_tls in libc.a went via the kernel if necessary. This patch also finishes the job of breaking up the pthread.c monolith, and adds a handful of new tests. Change-Id: Idc0ae7f5d8aa65989598acd4c01a874fe21582c7
2013-10-30 22:40:09 +01:00
bionic/pthread_mutex.cpp \
bionic/pthread_once.cpp \
bionic/pthread_rwlock.cpp \
Fix pthreads functions that should return ESRCH. imgtec pointed out that pthread_kill(3) was broken, but most of the other functions that ought to return ESRCH for invalid/exited threads were equally broken. Change-Id: I96347f6195549aee0c72dc39063e6c5d06d2e01f
2013-02-16 04:21:51 +01:00
bionic/pthread_self.cpp \
Revert "Revert "More pthreads cleanup."" This reverts commit 6f94de3ca49e4ea147b1c59e5818fa175846518f (Doesn't try to increase the number of TLS slots; that leads to an inability to boot. Adds more tests.) Change-Id: Ia7d25ba3995219ed6e686463dbba80c95cc831ca
2013-02-12 17:40:24 +01:00
bionic/pthread_setname_np.cpp \
Fix pthreads functions that should return ESRCH. imgtec pointed out that pthread_kill(3) was broken, but most of the other functions that ought to return ESRCH for invalid/exited threads were equally broken. Change-Id: I96347f6195549aee0c72dc39063e6c5d06d2e01f
2013-02-16 04:21:51 +01:00
bionic/pthread_setschedparam.cpp \
Only have one copy of the kernel_sigset_t hack, and add more tests. Change-Id: I377522fcba6fb4b5fd2754ab15b091014bd7c16f
2013-01-10 23:42:14 +01:00
bionic/pthread_sigmask.cpp \
<pthread.h> fixes and pthread cleanup. <pthread.h> was missing nonnull attributes, noreturn on pthread_exit, and had incorrect cv qualifiers for several standard functions. I've also marked the non-standard stuff (where I count glibc rather than POSIX as "standard") so we can revisit this cruft for LP64 and try to ensure we're compatible with glibc. I've also broken out the pthread_cond* functions into a new file. I've made the remaining pthread files (plus ptrace) part of the bionic code and fixed all the warnings. I've added a few more smoke tests for chunks of untested pthread functionality. We no longer need the libc_static_common_src_files hack for any of the pthread implementation because we long since stripped out the rest of the armv5 support, and this hack was just to ensure that __get_tls in libc.a went via the kernel if necessary. This patch also finishes the job of breaking up the pthread.c monolith, and adds a handful of new tests. Change-Id: Idc0ae7f5d8aa65989598acd4c01a874fe21582c7
2013-10-30 22:40:09 +01:00
bionic/ptrace.cpp \
Use pthread_kill() in raise() raise() should use pthread_kill() in a pthreads environment. For bionic this means it should always be used. Change-Id: Ic679272b664d2b8a7068b628fb83a9f7395c441f
2012-12-08 03:41:10 +01:00
bionic/raise.cpp \
Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls. Modern architectures only get the *at(2) system calls. For example, aarch64 doesn't have open(2), and expects userspace to use openat(2) instead. Change-Id: I87b4ed79790cb8a80844f5544ac1a13fda26c7b5
2013-10-22 22:28:46 +02:00
bionic/readlink.cpp \
bionic/rename.cpp \
bionic/rmdir.cpp \
Remove bogus extra alignment from sbrk. Bug: https://code.google.com/p/android/issues/detail?id=37349 Change-Id: I970c7b6be7bb7fbe6bbbe2c332f05816aeb0e09f
2013-02-06 01:10:59 +01:00
bionic/sbrk.cpp \
Reimplement scandir(3). The old scandir implementation didn't take into account the varying size of directory entries, and didn't correctly clean up on its error exits. Bug: 7339844 Change-Id: Ib40e3564709752241a3119a496cbb2192e3f9abe
2013-02-25 22:14:31 +01:00
bionic/scandir.cpp \
Add missing include and function prototype for sched_getaffinity. Change-Id: I649633c8d074def5d05bd0c8b92fb680d9d11d51
2013-04-09 18:57:42 +02:00
bionic/sched_getaffinity.cpp \
Clean up the cpuacct cruft. Change-Id: I6ed63af8dfc2368e211420389fa8af4d5dc0908f
2013-10-10 02:35:36 +02:00
bionic/setegid.cpp \
Reduce the exposure of the __set_errno implementation detail. Change-Id: I395e1b46a9491e34fc53e71853e932ea90b3d1cc
2012-11-30 20:58:57 +01:00
bionic/__set_errno.cpp \
Clean up the cpuacct cruft. Change-Id: I6ed63af8dfc2368e211420389fa8af4d5dc0908f
2013-10-10 02:35:36 +02:00
bionic/seteuid.cpp \
Clean up the implementation of the <dirent.h> functions. Change-Id: I3c647cc9588525afc41fee90ee468d58cd13503a
2012-10-26 05:55:23 +02:00
bionic/setlocale.cpp \
Add signalfd call to bionic Add signalfd() call to bionic. Adding the signalfd call was done in 3 steps: - add signalfd4 system call (function name and syscall number) to libc/SYSCALLS.TXT - generate all necessary headers by calling libc/tools/gensyscalls.py. This patch is adding the generated files since the build system does not call gensyscalls.py. - create the signalfd wrapper in signalfd.cpp and add the function prototype to sys/signalfd.h (cherry-pick of 0c11611c11f4dc1b6d43587b72c3ccbe8c51a51c, modified to work with older versions of GCC still in use on some branches.) Change-Id: I4c6c3f12199559af8be63f93a5336851b7e63355
2013-01-10 00:46:06 +01:00
bionic/signalfd.cpp \
Fix sigaction(3) for 64-bit. Also clean up <signal.h> and revert the hacks that were necessary for 64-bit in linker/debugger.cpp until now. Change-Id: I3b0554ca8a49ee1c97cda086ce2c1954ebc11892
2013-10-17 07:27:54 +02:00
bionic/sigaction.cpp \
bionic/sigaddset.cpp \
bionic/sigdelset.cpp \
bionic/sigemptyset.cpp \
bionic/sigfillset.cpp \
bionic/sigismember.cpp \
bionic/signal.cpp \
Switch sigpending over to rt_sigpending. Change-Id: I7b28984796b5fb343cfbcc47e0afc3a84293d417
2013-10-16 21:53:58 +02:00
bionic/sigpending.cpp \
Clean up the sigprocmask/pthread_sigmask implementation. Let's have both use rt_sigprocmask, like in glibc. The 64-bit ABIs can share the same code as the 32-bit ABIs. Also, let's test the return side of these calls, not just the setting. Bug: 11069919 Change-Id: I11da99f85b5b481870943c520d05ec929b15eddb
2013-10-15 20:23:57 +02:00
bionic/sigprocmask.cpp \
Fix sigsuspend to use rt_sigsuspend on all platforms. Change-Id: I981c1a66d35480d4457a0a08a1b042dac94daa5b
2013-10-16 03:01:56 +02:00
bionic/sigsuspend.cpp \
Only have one copy of the kernel_sigset_t hack, and add more tests. Change-Id: I377522fcba6fb4b5fd2754ab15b091014bd7c16f
2013-01-10 23:42:14 +01:00
bionic/sigwait.cpp \
Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls. Modern architectures only get the *at(2) system calls. For example, aarch64 doesn't have open(2), and expects userspace to use openat(2) instead. Change-Id: I87b4ed79790cb8a80844f5544ac1a13fda26c7b5
2013-10-22 22:28:46 +02:00
bionic/stat.cpp \
Add <sys/statvfs.h>. Bug: 2512019 Change-Id: I6e7fd3fa281977cc4bc270481a95416b5b2dc351
2013-07-09 22:25:03 +02:00
bionic/statvfs.cpp \
Clean up the implementation of the <dirent.h> functions. Change-Id: I3c647cc9588525afc41fee90ee468d58cd13503a
2012-10-26 05:55:23 +02:00
bionic/strerror.cpp \
bionic/strerror_r.cpp \
bionic/strsignal.cpp \
bionic/stubs.cpp \
Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls. Modern architectures only get the *at(2) system calls. For example, aarch64 doesn't have open(2), and expects userspace to use openat(2) instead. Change-Id: I87b4ed79790cb8a80844f5544ac1a13fda26c7b5
2013-10-22 22:28:46 +02:00
bionic/symlink.cpp \
Everyone has a TLS register. Change-Id: Id7cdf67087aa7d5074c9c59b7e595bc391d9f146
2013-02-13 06:56:42 +01:00
bionic/sysconf.cpp \
<pthread.h> fixes and pthread cleanup. <pthread.h> was missing nonnull attributes, noreturn on pthread_exit, and had incorrect cv qualifiers for several standard functions. I've also marked the non-standard stuff (where I count glibc rather than POSIX as "standard") so we can revisit this cruft for LP64 and try to ensure we're compatible with glibc. I've also broken out the pthread_cond* functions into a new file. I've made the remaining pthread files (plus ptrace) part of the bionic code and fixed all the warnings. I've added a few more smoke tests for chunks of untested pthread functionality. We no longer need the libc_static_common_src_files hack for any of the pthread implementation because we long since stripped out the rest of the armv5 support, and this hack was just to ensure that __get_tls in libc.a went via the kernel if necessary. This patch also finishes the job of breaking up the pthread.c monolith, and adds a handful of new tests. Change-Id: Idc0ae7f5d8aa65989598acd4c01a874fe21582c7
2013-10-30 22:40:09 +01:00
bionic/thread_atexit.cpp \
Clean up the implementation of the <dirent.h> functions. Change-Id: I3c647cc9588525afc41fee90ee468d58cd13503a
2012-10-26 05:55:23 +02:00
bionic/tdestroy.cpp \
Fix x86_64 build, clean up intermediate libraries. The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
2013-10-10 00:50:50 +02:00
bionic/__thread_entry.cpp \
<pthread.h> fixes and pthread cleanup. <pthread.h> was missing nonnull attributes, noreturn on pthread_exit, and had incorrect cv qualifiers for several standard functions. I've also marked the non-standard stuff (where I count glibc rather than POSIX as "standard") so we can revisit this cruft for LP64 and try to ensure we're compatible with glibc. I've also broken out the pthread_cond* functions into a new file. I've made the remaining pthread files (plus ptrace) part of the bionic code and fixed all the warnings. I've added a few more smoke tests for chunks of untested pthread functionality. We no longer need the libc_static_common_src_files hack for any of the pthread implementation because we long since stripped out the rest of the armv5 support, and this hack was just to ensure that __get_tls in libc.a went via the kernel if necessary. This patch also finishes the job of breaking up the pthread.c monolith, and adds a handful of new tests. Change-Id: Idc0ae7f5d8aa65989598acd4c01a874fe21582c7
2013-10-30 22:40:09 +01:00
bionic/timer.cpp \
Clean up the implementation of the <dirent.h> functions. Change-Id: I3c647cc9588525afc41fee90ee468d58cd13503a
2012-10-26 05:55:23 +02:00
bionic/tmpfile.cpp \
Move away from the __ARCH_WANT_SYSCALL_NO_AT system calls. Modern architectures only get the *at(2) system calls. For example, aarch64 doesn't have open(2), and expects userspace to use openat(2) instead. Change-Id: I87b4ed79790cb8a80844f5544ac1a13fda26c7b5
2013-10-22 22:28:46 +02:00
bionic/unlink.cpp \
bionic/utimes.cpp \
Expose wait4 as wait4 rather than __wait4. This helps strace(1) compile with one fewer hack. Change-Id: I5296d0cfec5546709cda990abd705ad33d7c4626
2013-03-21 23:43:53 +01:00
bionic/wait.cpp \
Clean up the implementation of the <dirent.h> functions. Change-Id: I3c647cc9588525afc41fee90ee468d58cd13503a
2012-10-26 05:55:23 +02:00
bionic/wchar.cpp \
Move setlocale(3) and the wchar stubs over to .cpp. Also separate out the C++ files so we can use -Werror on them. I'd rather wait for LOCAL_CPPFLAGS to be in AOSP, but this also lets us see which files still need to be sorted into one bucket or the other. Change-Id: I6acc1f7c043935c70a3b089f705d218b9aaaba0a
2012-10-23 02:05:27 +02:00
x86_64: Update Makefiles for x86_64 targets and add symlinks Use basic .c versions of all functions for x86_64 until they are manually optimized and .s versions released. Change-Id: I59bba08931e894822db485c8803c2665c226234a Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-12-18 14:30:02 +01:00
# These are shared by all the 32-bit targets, but not the 64-bit ones.
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm mips x86))
libc_bionic_src_files += \
bionic/mmap.cpp \
endif
Upgrade to tzcode2013d. Well, kinda... localtime.c still contains a bunch of Android-specific hacks, as does strftime.c. But the other files are now exactly the same as upstream. This catches up with several years of bug fixes, and fixes most of the compiler warnings that were in this code. (Just two remain.) Bug: 1744909 Change-Id: I2ddfecb6fd408c847397c17afb0fff859e27feef
2013-07-13 02:31:11 +02:00
libc_tzcode_src_files := \
tzcode/asctime.c \
tzcode/difftime.c \
tzcode/localtime.c \
tzcode/strftime.c \
tzcode/strptime.c \
Move realpath.c to upstream-freebsd. This is actually a slightly newer upstream version than the one I originally pulled. Hopefully now it's in upstream-freebsd it will be easier to track upstream, though I still need to sit down and write the necessary scripts at some point. Bug: 5110679 Change-Id: I87e563f0f95aa8e68b45578e2a8f448bbf827a33
2013-03-02 01:59:46 +01:00
libc_upstream_freebsd_src_files := \
Start moving to current FreeBSD stdio. This only touches the easy stuff. Change-Id: Iecee57f1681dba5c56bff59f0e9a89811a71f0ca
2013-04-11 22:54:48 +02:00
upstream-freebsd/lib/libc/stdio/clrerr.c \
upstream-freebsd/lib/libc/stdio/fclose.c \
upstream-freebsd/lib/libc/stdio/fdopen.c \
upstream-freebsd/lib/libc/stdio/feof.c \
upstream-freebsd/lib/libc/stdio/ferror.c \
upstream-freebsd/lib/libc/stdio/fgetln.c \
upstream-freebsd/lib/libc/stdio/fgetpos.c \
upstream-freebsd/lib/libc/stdio/fgets.c \
upstream-freebsd/lib/libc/stdio/fileno.c \
upstream-freebsd/lib/libc/stdio/flags.c \
upstream-freebsd/lib/libc/stdio/fopen.c \
upstream-freebsd/lib/libc/stdio/fpurge.c \
upstream-freebsd/lib/libc/stdio/fputs.c \
upstream-freebsd/lib/libc/stdio/fsetpos.c \
upstream-freebsd/lib/libc/stdio/funopen.c \
upstream-freebsd/lib/libc/stdio/fwalk.c \
upstream-freebsd/lib/libc/stdio/fwrite.c \
upstream-freebsd/lib/libc/stdio/getc.c \
upstream-freebsd/lib/libc/stdio/getchar.c \
Switch to current upstream stdio makebuf.c and setvbuf.c. Change-Id: I4761b5e94459815520f01062eef39abf62af621f
2013-06-13 00:24:15 +02:00
upstream-freebsd/lib/libc/stdio/makebuf.c \
Upgrade mktemp.c to the current upstream version. Yet another archaic relic containing bugs that had been fixed years before the Android project even started... Bug: 9935113 Change-Id: I3c9d019a216efd609ee568cf8c70bc360f357403
2013-07-20 00:20:31 +02:00
upstream-freebsd/lib/libc/stdio/mktemp.c \
Start moving to current FreeBSD stdio. This only touches the easy stuff. Change-Id: Iecee57f1681dba5c56bff59f0e9a89811a71f0ca
2013-04-11 22:54:48 +02:00
upstream-freebsd/lib/libc/stdio/putc.c \
upstream-freebsd/lib/libc/stdio/putchar.c \
upstream-freebsd/lib/libc/stdio/puts.c \
upstream-freebsd/lib/libc/stdio/putw.c \
upstream-freebsd/lib/libc/stdio/remove.c \
upstream-freebsd/lib/libc/stdio/rget.c \
upstream-freebsd/lib/libc/stdio/setbuf.c \
upstream-freebsd/lib/libc/stdio/setbuffer.c \
Switch to current upstream stdio makebuf.c and setvbuf.c. Change-Id: I4761b5e94459815520f01062eef39abf62af621f
2013-06-13 00:24:15 +02:00
upstream-freebsd/lib/libc/stdio/setvbuf.c \
Start moving to current FreeBSD stdio. This only touches the easy stuff. Change-Id: Iecee57f1681dba5c56bff59f0e9a89811a71f0ca
2013-04-11 22:54:48 +02:00
upstream-freebsd/lib/libc/stdio/tempnam.c \
upstream-freebsd/lib/libc/stdio/tmpnam.c \
upstream-freebsd/lib/libc/stdio/wsetup.c \
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols. Change-Id: I94c411c22634e43184445c82e7388e51fc46a8cc
2013-08-12 21:07:05 +02:00
upstream-freebsd/lib/libc/stdlib/abs.c \
Switch to current upstream getopt_long. Change-Id: I4c646dcb8be9e88dd54d069a03bbc5fbfd92de03
2013-06-25 23:48:10 +02:00
upstream-freebsd/lib/libc/stdlib/getopt_long.c \
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols. Change-Id: I94c411c22634e43184445c82e7388e51fc46a8cc
2013-08-12 21:07:05 +02:00
upstream-freebsd/lib/libc/stdlib/imaxabs.c \
upstream-freebsd/lib/libc/stdlib/imaxdiv.c \
upstream-freebsd/lib/libc/stdlib/labs.c \
upstream-freebsd/lib/libc/stdlib/llabs.c \
Switch to current FreeBSD qsort. Change-Id: Ic46cd0b663dc5fa78c99dd38db0bfe849a25e789
2013-04-12 03:08:34 +02:00
upstream-freebsd/lib/libc/stdlib/qsort.c \
Move realpath.c to upstream-freebsd. This is actually a slightly newer upstream version than the one I originally pulled. Hopefully now it's in upstream-freebsd it will be easier to track upstream, though I still need to sit down and write the necessary scripts at some point. Bug: 5110679 Change-Id: I87e563f0f95aa8e68b45578e2a8f448bbf827a33
2013-03-02 01:59:46 +01:00
upstream-freebsd/lib/libc/stdlib/realpath.c \
Switch to upstream-freebsd for the unmolested wchar code. Change-Id: I87b4d76ff8da04109ae53638eec4f11629798960
2013-03-02 03:35:56 +01:00
upstream-freebsd/lib/libc/string/wcpcpy.c \
upstream-freebsd/lib/libc/string/wcpncpy.c \
upstream-freebsd/lib/libc/string/wcscasecmp.c \
upstream-freebsd/lib/libc/string/wcscspn.c \
upstream-freebsd/lib/libc/string/wcsdup.c \
upstream-freebsd/lib/libc/string/wcslcat.c \
upstream-freebsd/lib/libc/string/wcslcpy.c \
upstream-freebsd/lib/libc/string/wcsncasecmp.c \
upstream-freebsd/lib/libc/string/wcsncat.c \
upstream-freebsd/lib/libc/string/wcsncmp.c \
upstream-freebsd/lib/libc/string/wcsncpy.c \
upstream-freebsd/lib/libc/string/wcsnlen.c \
upstream-freebsd/lib/libc/string/wcspbrk.c \
upstream-freebsd/lib/libc/string/wcsspn.c \
upstream-freebsd/lib/libc/string/wcsstr.c \
upstream-freebsd/lib/libc/string/wcstok.c \
upstream-freebsd/lib/libc/string/wmemchr.c \
upstream-freebsd/lib/libc/string/wmemcpy.c \
upstream-freebsd/lib/libc/string/wmemmove.c \
upstream-freebsd/lib/libc/string/wmemset.c \
Move realpath.c to upstream-freebsd. This is actually a slightly newer upstream version than the one I originally pulled. Hopefully now it's in upstream-freebsd it will be easier to track upstream, though I still need to sit down and write the necessary scripts at some point. Bug: 5110679 Change-Id: I87e563f0f95aa8e68b45578e2a8f448bbf827a33
2013-03-02 01:59:46 +01:00
Revert "Revert "Switch to NetBSD's strxfrm(3)."" This reverts commit 8793e7c7d21a0434d1b5e63364c88b2b125a3d29, and fixes the build by building upstream NetBSD source as a separate library that's then swallowed whole into libc_common. Change-Id: I6c9317d8c48b5ccaf85a7b185bc07fb31176ff97
2012-08-10 20:39:58 +02:00
libc_upstream_netbsd_src_files := \
Upgrade more functions to the current upstream NetBSD copy. Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
2012-10-23 21:26:26 +02:00
upstream-netbsd/common/lib/libc/hash/sha1/sha1.c \
upstream-netbsd/common/lib/libc/inet/inet_addr.c \
upstream-netbsd/libc/compat-43/creat.c \
upstream-netbsd/libc/gen/ftw.c \
upstream-netbsd/libc/gen/nftw.c \
upstream-netbsd/libc/gen/nice.c \
Upgrade to current NetBSD popen/pclose. This gets us back to using vfork now our ARM vfork assembler stub is fixed, and adds the missing thread safety for the 'pidlist'. Bug: 5335385 Change-Id: Ib08bfa65b2cb9fa695717aae629ea14816bf988d
2013-03-07 01:20:55 +01:00
upstream-netbsd/libc/gen/popen.c \
Upgrade more functions to the current upstream NetBSD copy. Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
2012-10-23 21:26:26 +02:00
upstream-netbsd/libc/gen/psignal.c \
More upstream NetBSD upgrades. Change-Id: Idb781d37de3b05585271d7d258ecffd5ba87d0b8
2012-10-24 01:05:09 +02:00
upstream-netbsd/libc/gen/setjmperr.c \
Upgrade more functions to the current upstream NetBSD copy. Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
2012-10-23 21:26:26 +02:00
upstream-netbsd/libc/gen/utime.c \
upstream-netbsd/libc/inet/inet_ntoa.c \
upstream-netbsd/libc/inet/inet_ntop.c \
upstream-netbsd/libc/inet/inet_pton.c \
More upstream NetBSD upgrades. Change-Id: Idb781d37de3b05585271d7d258ecffd5ba87d0b8
2012-10-24 01:05:09 +02:00
upstream-netbsd/libc/isc/ev_streams.c \
upstream-netbsd/libc/isc/ev_timers.c \
Upgrade more functions to the current upstream NetBSD copy. Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
2012-10-23 21:26:26 +02:00
upstream-netbsd/libc/regex/regcomp.c \
upstream-netbsd/libc/regex/regerror.c \
upstream-netbsd/libc/regex/regexec.c \
upstream-netbsd/libc/regex/regfree.c \
upstream-netbsd/libc/stdio/getdelim.c \
upstream-netbsd/libc/stdio/getline.c \
More upstream NetBSD upgrades. Change-Id: Idb781d37de3b05585271d7d258ecffd5ba87d0b8
2012-10-24 01:05:09 +02:00
upstream-netbsd/libc/stdlib/bsearch.c \
upstream-netbsd/libc/stdlib/div.c \
Upgrade more functions to the current upstream NetBSD copy. Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
2012-10-23 21:26:26 +02:00
upstream-netbsd/libc/stdlib/drand48.c \
upstream-netbsd/libc/stdlib/erand48.c \
upstream-netbsd/libc/stdlib/jrand48.c \
More upstream NetBSD upgrades. Change-Id: Idb781d37de3b05585271d7d258ecffd5ba87d0b8
2012-10-24 01:05:09 +02:00
upstream-netbsd/libc/stdlib/ldiv.c \
upstream-netbsd/libc/stdlib/lldiv.c \
Upgrade more functions to the current upstream NetBSD copy. Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
2012-10-23 21:26:26 +02:00
upstream-netbsd/libc/stdlib/lrand48.c \
upstream-netbsd/libc/stdlib/mrand48.c \
upstream-netbsd/libc/stdlib/nrand48.c \
upstream-netbsd/libc/stdlib/_rand48.c \
upstream-netbsd/libc/stdlib/seed48.c \
upstream-netbsd/libc/stdlib/srand48.c \
upstream-netbsd/libc/stdlib/tdelete.c \
upstream-netbsd/libc/stdlib/tfind.c \
upstream-netbsd/libc/stdlib/tsearch.c \
Avoid overflow in memccpy. Just take the upstream NetBSD code. Bug: http://code.google.com/p/android/issues/detail?id=43078 Change-Id: Ibbbde9d00e8bc6a09c9503aab2b04b4e3d1f98b0
2013-01-22 23:41:23 +01:00
upstream-netbsd/libc/string/memccpy.c \
Upgrade more functions to the current upstream NetBSD copy. Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
2012-10-23 21:26:26 +02:00
upstream-netbsd/libc/string/strcasestr.c \
Our strcoll(3) is no different from NetBSD's, so take exactly theirs. Change-Id: I45251047202a229f9175735ecc23c0ebcda71e8d
2013-01-23 00:10:19 +01:00
upstream-netbsd/libc/string/strcoll.c \
Upgrade more functions to the current upstream NetBSD copy. Change-Id: Ie0b3f8b3fccef28609eb210434413ebd51d6ef45
2012-10-23 21:26:26 +02:00
upstream-netbsd/libc/string/strxfrm.c \
More upstream NetBSD upgrades. Change-Id: Idb781d37de3b05585271d7d258ecffd5ba87d0b8
2012-10-24 01:05:09 +02:00
upstream-netbsd/libc/unistd/killpg.c \
Revert "Revert "Switch to NetBSD's strxfrm(3)."" This reverts commit 8793e7c7d21a0434d1b5e63364c88b2b125a3d29, and fixes the build by building upstream NetBSD source as a separate library that's then swallowed whole into libc_common. Change-Id: I6c9317d8c48b5ccaf85a7b185bc07fb31176ff97
2012-08-10 20:39:58 +02:00
Factor out some of the makefile cruft. I really don't want to add yet another copy for aarch64. Also sort arm, mips, and x86. Also silence the "TARGET_ARCH_VARIANT" warning for non-ARM; Intel and MIPS have both complained about it. Change-Id: I32c592a90c0cf0cdae250d84035b3e4655543781
2013-10-30 00:59:54 +01:00
# Architecture specific source files go here
# =========================================================
ifeq ($(TARGET_ARCH),arm)
libc_common_src_files += \
bionic/memchr.c \
bionic/memmove.c.arm \
bionic/memrchr.c \
bionic/strchr.cpp \
bionic/strnlen.c \
string/bcopy.c \
string/index.c \
string/strlcat.c \
string/strlcpy.c \
string/strncat.c \
string/strncmp.c \
string/strncpy.c \
string/strrchr.c \
upstream-freebsd/lib/libc/string/wcscat.c \
upstream-freebsd/lib/libc/string/wcschr.c \
upstream-freebsd/lib/libc/string/wcscmp.c \
upstream-freebsd/lib/libc/string/wcscpy.c \
upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \
endif # arm
ifeq ($(TARGET_ARCH),mips)
libc_common_src_files += \
bionic/memchr.c \
bionic/memcmp.c \
bionic/memrchr.c \
bionic/strchr.cpp \
bionic/strnlen.c \
string/bcopy.c \
string/index.c \
string/strcat.c \
string/strcmp.c \
string/strcpy.c \
string/strlcat.c \
string/strlcpy.c \
string/strncat.c \
string/strncmp.c \
string/strncpy.c \
string/strrchr.c \
upstream-freebsd/lib/libc/string/wcscat.c \
upstream-freebsd/lib/libc/string/wcschr.c \
upstream-freebsd/lib/libc/string/wcscmp.c \
upstream-freebsd/lib/libc/string/wcscpy.c \
upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \
endif # mips
added and modified bionic code to support SuperH architecture modified: libc/Android.mk new files: libc/arch-sh/bionic/* new files: libc/arch-sh/include/*
2009-09-28 09:11:39 +02:00
x86_64: Update Makefiles for x86_64 targets and add symlinks Use basic .c versions of all functions for x86_64 until they are manually optimized and .s versions released. Change-Id: I59bba08931e894822db485c8803c2665c226234a Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-12-18 14:30:02 +01:00
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86_64))
libc_common_src_files += \
bionic/memchr.c \
bionic/memcmp.c \
bionic/memcpy.c \
bionic/memmove.c \
bionic/memrchr.c \
bionic/memset.c \
bionic/strchr.cpp \
bionic/strnlen.c \
string/bcopy.c \
string/index.c \
string/strcat.c \
string/strcmp.c \
string/strcpy.c \
string/strlcat.c \
string/strlcpy.c \
string/strlen.c \
string/strncat.c \
string/strncmp.c \
string/strncpy.c \
string/strrchr.c \
upstream-freebsd/lib/libc/string/wcscat.c \
upstream-freebsd/lib/libc/string/wcschr.c \
upstream-freebsd/lib/libc/string/wcscmp.c \
upstream-freebsd/lib/libc/string/wcscpy.c \
upstream-freebsd/lib/libc/string/wcslen.c \
upstream-freebsd/lib/libc/string/wcsrchr.c \
upstream-freebsd/lib/libc/string/wmemcmp.c \
endif # x86_64
Factor out some of the makefile cruft. I really don't want to add yet another copy for aarch64. Also sort arm, mips, and x86. Also silence the "TARGET_ARCH_VARIANT" warning for non-ARM; Intel and MIPS have both complained about it. Change-Id: I32c592a90c0cf0cdae250d84035b3e4655543781
2013-10-30 00:59:54 +01:00
ifeq ($(TARGET_ARCH),arm)
ifeq ($(strip $(TARGET_CPU_VARIANT)),)
$(warning TARGET_ARCH is arm, but TARGET_CPU_VARIANT is not defined)
endif
Break bionic implementations into arch versions. DO NOT MERGE Move arch specific code for arm, mips, x86 into separate makefiles. In addition, add different arm cpu versions of memcpy/memset. Bug: 8005082 (cherry picked from commit acdde8c1cf8e8beed98c052757d96695b820b50c) Change-Id: I0108d432af9f6283ae99adfc92a3399e5ab3e31d
2013-02-26 10:30:00 +01:00
endif
###########################################################
## Add cpu specific source files.
##
## This can be called multiple times, but it will only add
## the first source file for each unique $(1).
## $(1): Unique identifier to identify the cpu variant
## implementation.
## $(2): Cpu specific source file.
###########################################################
define libc-add-cpu-variant-src
$(if $(filter true,$(_LIBC_ARCH_CPU_VARIANT_HAS_$(1))), \
, \
$(eval _LIBC_ARCH_CPU_VARIANT_HAS_$(1) := true) \
$(eval _LIBC_ARCH_CPU_VARIANT_SRC_FILE.$(1) := $(2)) \
$(eval _LIBC_ARCH_CPU_VARIANT_SRC_FILES += $(2)) \
)
endef
_LIBC_ARCH_COMMON_SRC_FILES :=
_LIBC_ARCH_CPU_VARIANT_SRC_FILES :=
_LIBC_ARCH_STATIC_SRC_FILES :=
_LIBC_ARCH_DYNAMIC_SRC_FILES :=
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
_LIBC_ARCH_ADDITIONAL_DEPENDENCIES :=
libc_common_additional_dependencies += \
$(LOCAL_PATH)/arch-$(TARGET_ARCH)/$(TARGET_ARCH).mk
include $(LOCAL_PATH)/arch-$(TARGET_ARCH)/$(TARGET_ARCH).mk
Break bionic implementations into arch versions. DO NOT MERGE Move arch specific code for arm, mips, x86 into separate makefiles. In addition, add different arm cpu versions of memcpy/memset. Bug: 8005082 (cherry picked from commit acdde8c1cf8e8beed98c052757d96695b820b50c) Change-Id: I0108d432af9f6283ae99adfc92a3399e5ab3e31d
2013-02-26 10:30:00 +01:00
Fix x86_64 build, clean up intermediate libraries. The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
2013-10-10 00:50:50 +02:00
libc_bionic_src_files += $(_LIBC_ARCH_COMMON_SRC_FILES)
libc_bionic_src_files += $(_LIBC_ARCH_CPU_VARIANT_SRC_FILES)
Break bionic implementations into arch versions. DO NOT MERGE Move arch specific code for arm, mips, x86 into separate makefiles. In addition, add different arm cpu versions of memcpy/memset. Bug: 8005082 (cherry picked from commit acdde8c1cf8e8beed98c052757d96695b820b50c) Change-Id: I0108d432af9f6283ae99adfc92a3399e5ab3e31d
2013-02-26 10:30:00 +01:00
libc_arch_static_src_files := $(_LIBC_ARCH_STATIC_SRC_FILES)
libc_arch_dynamic_src_files := $(_LIBC_ARCH_DYNAMIC_SRC_FILES)
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
libc_common_additional_dependencies += $(_LIBC_ARCH_ADDITIONAL_DEPENDENCIES)
Break bionic implementations into arch versions. DO NOT MERGE Move arch specific code for arm, mips, x86 into separate makefiles. In addition, add different arm cpu versions of memcpy/memset. Bug: 8005082 (cherry picked from commit acdde8c1cf8e8beed98c052757d96695b820b50c) Change-Id: I0108d432af9f6283ae99adfc92a3399e5ab3e31d
2013-02-26 10:30:00 +01:00
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
# Define some common cflags
# ========================================================
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
libc_common_cflags := \
Give the timer_create SIGEV_THREAD helper threads sensible names. Bug: 6609676 Change-Id: I286b197c75beee4d9930b0973f2d7dd47c14e91c
2012-06-06 19:32:56 +02:00
-DANDROID_CHANGES \
-D_LIBC=1 \
Don't allow int<->pointer conversions. Normally we don't have -Werror for upstream code, but for those warnings that probably point to 32-bit assumptions about pointers, we want those warnings to always be errors. Change-Id: Ibece9caf09b2f7989ca600ef448d07868669a8fb
2013-10-09 02:04:33 +02:00
-Wall -Wextra \
# Try to catch typical 32-bit assumptions that break with 64-bit pointers.
libc_common_cflags += \
-Werror=pointer-to-int-cast \
-Werror=int-to-pointer-cast \
-Werror=type-limits \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
libc: Replace a reference to TARGET_BUILD_TYPE with DEBUG_BIONIC_LIBC We're soon going to stop using TARGET_BUILD_TYPE==debug to debug native modules. Signed-off-by: Dave Bort <dbort@android.com>
2009-04-24 00:50:03 +02:00
ifeq ($(strip $(DEBUG_BIONIC_LIBC)),true)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
libc_common_cflags += -DDEBUG
endif
bionic: allow the board to customize MALLOC_ALIGNMENT Currently the dlmalloc allocates the memory with 8-byte alignment. According to the com.aurorasoftworks.quadrant.ui.professional benchmark data: We can get much better memory performance if we change it to be 16-byte aligned. For example, On Nexus-S: 8-byte aligned : 1378 1070 1142 1665 1765 1163 1179 1263 1404 avg: 1336.555555556 16-byte aligned: 1691 1731 1780 1691 1671 1678 1802 1758 1780 avg: 1731.333333333 gain: 29.53% That patch provides flexibity to customize the MALLOC_ALIGNMENT from the board config.The macro MALLOC_ALIGNMENT defaults to 8. To change it, please define BOARD_MALLOC_ALIGNMENT in the BoardConfig.mk: BOARD_MALLOC_ALIGNMENT := <whatever> Change-Id: I8da0376944a0bbcef1d0fc026bfb6d9125db9739 Signed-off-by: Jin Wei <wei.a.jin@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
2011-11-19 02:48:03 +01:00
# To customize dlmalloc's alignment, set BOARD_MALLOC_ALIGNMENT in
# the appropriate BoardConfig.mk file.
#
ifneq ($(BOARD_MALLOC_ALIGNMENT),)
libc_common_cflags += -DMALLOC_ALIGNMENT=$(BOARD_MALLOC_ALIGNMENT)
endif
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
ifeq ($(TARGET_ARCH),arm)
MIPS support to the libc Makefile Change-Id: Ia1f3f545ca61a5abb235e99046cb3cdaf24d4205
2012-08-07 21:23:24 +02:00
libc_common_cflags += -DSOFTFLOAT
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
libc_common_cflags += -fstrict-aliasing
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
libc_crt_target_cflags := -mthumb-interwork
Remove useless x86 fallbacks. The NDK ABI requires that you support SSE2, and the build system won't let you build with ARCH_X86_HAVE_SSE2 set to false. So let's stop pretending this constant is actually a variable, and let's remove the corresponding dead code. Also, the USE_SSE2 and USE_SSE3 macros are unused, so let's not bother setting them. Change-Id: I40b501d998530d22518ce1c4d14575513a8125bb
2013-10-04 08:30:33 +02:00
endif # arm
MIPS support to the libc Makefile Change-Id: Ia1f3f545ca61a5abb235e99046cb3cdaf24d4205
2012-08-07 21:23:24 +02:00
ifeq ($(TARGET_ARCH),mips)
ifneq ($(ARCH_MIPS_HAS_FPU),true)
libc_common_cflags += -DSOFTFLOAT
endif
libc_common_cflags += -fstrict-aliasing
libc_crt_target_cflags := $(TARGET_GLOBAL_CFLAGS)
endif # mips
Remove useless x86 fallbacks. The NDK ABI requires that you support SSE2, and the build system won't let you build with ARCH_X86_HAVE_SSE2 set to false. So let's stop pretending this constant is actually a variable, and let's remove the corresponding dead code. Also, the USE_SSE2 and USE_SSE3 macros are unused, so let's not bother setting them. Change-Id: I40b501d998530d22518ce1c4d14575513a8125bb
2013-10-04 08:30:33 +02:00
ifeq ($(TARGET_ARCH),x86)
libc_crt_target_cflags := -m32
libc_crt_target_ldflags := -melf_i386
endif # x86
ifeq ($(TARGET_ARCH),x86_64)
libc_crt_target_cflags := -m64
libc_crt_target_ldflags := -melf_x86_64
endif # x86_64
Atomic/SMP update, part 3. Update ARM atomic ops to use LDREX/STREX. Stripped out #if 0 chunk. Insert explicit memory barriers in pthread and semaphore code. For bug 2721865. Change-Id: I0f153b797753a655702d8be41679273d1d5d6ae7
2010-05-28 22:31:45 +02:00
# Define ANDROID_SMP appropriately.
ifeq ($(TARGET_CPU_SMP),true)
libc_common_cflags += -DANDROID_SMP=1
else
libc_common_cflags += -DANDROID_SMP=0
endif
Clean up libc/Android.mk a bit after the crtbrand changes. Change-Id: Icfb95fffe70967418cd93da8cbeae22dcd68f8c9
2012-08-08 23:07:37 +02:00
# crtbrand.c needs <stdint.h> and a #define for the platform SDK version.
libc_crt_target_cflags += \
-I$(LOCAL_PATH)/include \
Fix x86_64 build, clean up intermediate libraries. The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
2013-10-10 00:50:50 +02:00
-I$(LOCAL_PATH)/arch-$(TARGET_ARCH)/include \
-DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION) \
Atomic/SMP update, part 3. Update ARM atomic ops to use LDREX/STREX. Stripped out #if 0 chunk. Insert explicit memory barriers in pthread and semaphore code. For bug 2721865. Change-Id: I0f153b797753a655702d8be41679273d1d5d6ae7
2010-05-28 22:31:45 +02:00
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
# Define some common conlyflags
libc_common_conlyflags := \
-std=gnu99
# Define some common cppflags
libc_common_cppflags := \
-std=gnu++11
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
# Define some common includes
# ========================================================
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
libc_common_c_includes := \
$(LOCAL_PATH)/stdlib \
$(LOCAL_PATH)/string \
_FORTIFY_SOURCE: check for integer overflows Ensure that strcat / strncat check for integer overflows when computing the length of the resulting string. Change-Id: Ib806ad33a0d3b50876f384bc17787a28f0dddc37
2012-06-08 01:30:02 +02:00
$(LOCAL_PATH)/stdio \
external/safe-iop/include
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
# Define the libc run-time (crt) support object files that must be built,
# which are needed to build all other objects (shared/static libs and
# executables)
# ==========================================================================
MIPS support to the libc Makefile Change-Id: Ia1f3f545ca61a5abb235e99046cb3cdaf24d4205
2012-08-07 21:23:24 +02:00
# ARM, MIPS, and x86 all need crtbegin_so/crtend_so.
Allow static C++ destructors to be properly called on dlclose(). With this patch, _and_ an upcoming build/ patch, the destruction of static C++ objects contained in shared libraries will happen properly when dlclose() is called. Note that this change introduces crtbegin_so.S and crtend_so.S which are currently ignored by the build system. + move definition of __dso_handle to the right place (before that, all shared libraries used the __dso_handle global variable from the C library). Note that we keep a 'weak' __dso_handle in aeabi.c to avoid breaking the build until the next patch to build/core/combo/ appears. We will be able to remove that later. + move bionic/aeabi.c to arch-arm/bionic/ (its proper location) Change-Id: Ie771aa204e3acbdf02fd30ebd4150373a1398f39 NOTE: The NDK will need to be modified to enable this feature in the shared libraries that are generated through it.
2010-06-18 23:47:22 +02:00
#
# For x86, the .init section must point to a function that calls all
# entries in the .ctors section. (on ARM this is done through the
# .init_array section instead).
#
MIPS support to the libc Makefile Change-Id: Ia1f3f545ca61a5abb235e99046cb3cdaf24d4205
2012-08-07 21:23:24 +02:00
# For all the platforms, the .fini_array section must point to a function
Allow static C++ destructors to be properly called on dlclose(). With this patch, _and_ an upcoming build/ patch, the destruction of static C++ objects contained in shared libraries will happen properly when dlclose() is called. Note that this change introduces crtbegin_so.S and crtend_so.S which are currently ignored by the build system. + move definition of __dso_handle to the right place (before that, all shared libraries used the __dso_handle global variable from the C library). Note that we keep a 'weak' __dso_handle in aeabi.c to avoid breaking the build until the next patch to build/core/combo/ appears. We will be able to remove that later. + move bionic/aeabi.c to arch-arm/bionic/ (its proper location) Change-Id: Ie771aa204e3acbdf02fd30ebd4150373a1398f39 NOTE: The NDK will need to be modified to enable this feature in the shared libraries that are generated through it.
2010-06-18 23:47:22 +02:00
# that will call __cxa_finalize(&__dso_handle) in order to ensure that
# static C++ destructors are properly called on dlclose().
#
Move common arch-* code to arch-common directory Will be helpful on adding x86_64 Change-Id: I96cf6fc7912c02f289c75f07ae0079c32d69173f Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-02 14:38:05 +02:00
libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-common/bionic/crtbegin.c
libc_crt_target_crtbegin_so_file := $(LOCAL_PATH)/arch-common/bionic/crtbegin_so.c
MIPS support to the libc Makefile Change-Id: Ia1f3f545ca61a5abb235e99046cb3cdaf24d4205
2012-08-07 21:23:24 +02:00
ifeq ($(TARGET_ARCH),arm)
libc_crt_target_so_cflags :=
endif
ifeq ($(TARGET_ARCH),mips)
libc_crt_target_so_cflags := -fPIC
Move common arch-* code to arch-common directory Will be helpful on adding x86_64 Change-Id: I96cf6fc7912c02f289c75f07ae0079c32d69173f Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-02 14:38:05 +02:00
libc_crt_target_crtbegin_file := $(LOCAL_PATH)/arch-$(TARGET_ARCH)/bionic/crtbegin.c
MIPS support to the libc Makefile Change-Id: Ia1f3f545ca61a5abb235e99046cb3cdaf24d4205
2012-08-07 21:23:24 +02:00
endif
x86_64: Update Makefiles for x86_64 targets and add symlinks Use basic .c versions of all functions for x86_64 until they are manually optimized and .s versions released. Change-Id: I59bba08931e894822db485c8803c2665c226234a Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-12-18 14:30:02 +01:00
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
MIPS support to the libc Makefile Change-Id: Ia1f3f545ca61a5abb235e99046cb3cdaf24d4205
2012-08-07 21:23:24 +02:00
libc_crt_target_so_cflags := -fPIC
endif
libc_crt_target_so_cflags += $(libc_crt_target_cflags)
Add a .note.android.ident section to Android ELF binaries. This allows debugging tools to know they are working with Android binaries and adapt accordingly. Signed-off-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Signed-off-by: Michael Hope <michael.hope@linaro.org> Change-Id: Ic906992fcad61c028bb765821637a3e1333bf52b
2012-07-31 06:18:22 +02:00
# See the comment in crtbrand.c for the reason why we need to generate
# crtbrand.s before generating crtbrand.o.
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbrand.s
$(GEN): $(LOCAL_PATH)/bionic/crtbrand.c
@mkdir -p $(dir $@)
Generate header dependency makefiles for the crt*.o Bug: 7127743 Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-08 02:06:56 +02:00
$(hide) $(TARGET_CC) $(libc_crt_target_so_cflags) -S \
-MD -MF $(@:%.s=%.d) -o $@ $<
$(hide) sed -i -e '/\.note\.ABI-tag/s/progbits/note/' $@
$(call transform-d-to-p-args,$(@:%.s=%.d),$(@:%.s=%.P))
-include $(GEN:%.s=%.P)
Add a .note.android.ident section to Android ELF binaries. This allows debugging tools to know they are working with Android binaries and adapt accordingly. Signed-off-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Signed-off-by: Michael Hope <michael.hope@linaro.org> Change-Id: Ic906992fcad61c028bb765821637a3e1333bf52b
2012-07-31 06:18:22 +02:00
ALL_GENERATED_SOURCES += $(GEN)
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbrand.o
$(GEN): $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbrand.s
@mkdir -p $(dir $@)
Generate header dependency makefiles for the crt*.o Bug: 7127743 Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-08 02:06:56 +02:00
$(hide) $(TARGET_CC) $(libc_crt_target_so_cflags) -o $@ -c $<
Add a .note.android.ident section to Android ELF binaries. This allows debugging tools to know they are working with Android binaries and adapt accordingly. Signed-off-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Signed-off-by: Michael Hope <michael.hope@linaro.org> Change-Id: Ic906992fcad61c028bb765821637a3e1333bf52b
2012-07-31 06:18:22 +02:00
ALL_GENERATED_SOURCES += $(GEN)
Rename the misleading var name TARGET_OUT_STATIC_LIBRARIES TARGET_OUT_STATIC_LIBRARIES is actually the same as TARGET_OUT_INTERMEDIATE_LIBRARIES. Change-Id: I11ac35256031d461d20156cd4c19ed7eae781d22
2012-05-16 00:15:11 +02:00
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
Rename crtstart variables as crtbegin, to match reality. No functional change, but it's confusing that the variable names don't match the filenames. Change-Id: I7109f917797be2f056e69fddb92e4a7306281813
2012-09-10 20:16:12 +02:00
$(GEN): $(libc_crt_target_crtbegin_so_file)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
@mkdir -p $(dir $@)
Generate header dependency makefiles for the crt*.o Bug: 7127743 Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-08 02:06:56 +02:00
$(hide) $(TARGET_CC) $(libc_crt_target_so_cflags) \
-MD -MF $(@:%.o=%.d) -o $@ -c $<
$(transform-d-to-p)
-include $(GEN:%.o=%.P)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
ALL_GENERATED_SOURCES += $(GEN)
Rename the misleading var name TARGET_OUT_STATIC_LIBRARIES TARGET_OUT_STATIC_LIBRARIES is actually the same as TARGET_OUT_INTERMEDIATE_LIBRARIES. Change-Id: I11ac35256031d461d20156cd4c19ed7eae781d22
2012-05-16 00:15:11 +02:00
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
Move common arch-* code to arch-common directory Will be helpful on adding x86_64 Change-Id: I96cf6fc7912c02f289c75f07ae0079c32d69173f Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-02 14:38:05 +02:00
$(GEN): $(LOCAL_PATH)/arch-common/bionic/crtend_so.S
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
@mkdir -p $(dir $@)
Generate header dependency makefiles for the crt*.o Bug: 7127743 Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-08 02:06:56 +02:00
$(hide) $(TARGET_CC) $(libc_crt_target_so_cflags) \
-MD -MF $(@:%.o=%.d) -o $@ -c $<
$(transform-d-to-p)
-include $(GEN:%.o=%.P)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
ALL_GENERATED_SOURCES += $(GEN)
Install crt(begin|end)_so.o to target library path. BUG=6886348. Change-Id: I176b2c4963d9731b06d10d4e0b92c010a0006b59
2012-07-28 09:33:28 +02:00
Generate header dependency makefiles for the crt*.o Bug: 7127743 Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-08 02:06:56 +02:00
# The following two are installed to device
Install crt(begin|end)_so.o to target library path. BUG=6886348. Change-Id: I176b2c4963d9731b06d10d4e0b92c010a0006b59
2012-07-28 09:33:28 +02:00
GEN := $(TARGET_OUT_SHARED_LIBRARIES)/crtbegin_so.o
Generate header dependency makefiles for the crt*.o Bug: 7127743 Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-08 02:06:56 +02:00
$(GEN): $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
$(hide) mkdir -p $(dir $@) && cp -f $< $@
Install crt(begin|end)_so.o to target library path. BUG=6886348. Change-Id: I176b2c4963d9731b06d10d4e0b92c010a0006b59
2012-07-28 09:33:28 +02:00
ALL_GENERATED_SOURCES += $(GEN)
GEN := $(TARGET_OUT_SHARED_LIBRARIES)/crtend_so.o
Generate header dependency makefiles for the crt*.o Bug: 7127743 Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-08 02:06:56 +02:00
$(GEN): $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
$(hide) mkdir -p $(dir $@) && cp -f $< $@
Install crt(begin|end)_so.o to target library path. BUG=6886348. Change-Id: I176b2c4963d9731b06d10d4e0b92c010a0006b59
2012-07-28 09:33:28 +02:00
ALL_GENERATED_SOURCES += $(GEN)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
Add a .note.android.ident section to Android ELF binaries. This allows debugging tools to know they are working with Android binaries and adapt accordingly. Signed-off-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Signed-off-by: Michael Hope <michael.hope@linaro.org> Change-Id: Ic906992fcad61c028bb765821637a3e1333bf52b
2012-07-31 06:18:22 +02:00
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static1.o
Rename crtstart variables as crtbegin, to match reality. No functional change, but it's confusing that the variable names don't match the filenames. Change-Id: I7109f917797be2f056e69fddb92e4a7306281813
2012-09-10 20:16:12 +02:00
$(GEN): $(libc_crt_target_crtbegin_file)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
@mkdir -p $(dir $@)
Generate header dependency makefiles for the crt*.o Bug: 7127743 Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-08 02:06:56 +02:00
$(hide) $(TARGET_CC) $(libc_crt_target_cflags) \
-MD -MF $(@:%.o=%.d) -o $@ -c $<
$(transform-d-to-p)
-include $(GEN:%.o=%.P)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
ALL_GENERATED_SOURCES += $(GEN)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
Add a .note.android.ident section to Android ELF binaries. This allows debugging tools to know they are working with Android binaries and adapt accordingly. Signed-off-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Signed-off-by: Michael Hope <michael.hope@linaro.org> Change-Id: Ic906992fcad61c028bb765821637a3e1333bf52b
2012-07-31 06:18:22 +02:00
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
$(GEN): $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static1.o $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbrand.o
@mkdir -p $(dir $@)
Add explicit -m32/-melf_i386 for x86 target Required for x86 build with multilib compiler. Change-Id: Iac71cdc3461df6fb48cb2a7b713324ca368e6704 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-08-16 16:11:13 +02:00
$(hide) $(TARGET_LD) $(libc_crt_target_ldflags) -r -o $@ $^
Add a .note.android.ident section to Android ELF binaries. This allows debugging tools to know they are working with Android binaries and adapt accordingly. Signed-off-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Signed-off-by: Michael Hope <michael.hope@linaro.org> Change-Id: Ic906992fcad61c028bb765821637a3e1333bf52b
2012-07-31 06:18:22 +02:00
ALL_GENERATED_SOURCES += $(GEN)
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic1.o
Rename crtstart variables as crtbegin, to match reality. No functional change, but it's confusing that the variable names don't match the filenames. Change-Id: I7109f917797be2f056e69fddb92e4a7306281813
2012-09-10 20:16:12 +02:00
$(GEN): $(libc_crt_target_crtbegin_file)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
@mkdir -p $(dir $@)
Generate header dependency makefiles for the crt*.o Bug: 7127743 Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-08 02:06:56 +02:00
$(hide) $(TARGET_CC) $(libc_crt_target_cflags) \
-MD -MF $(@:%.o=%.d) -o $@ -c $<
$(transform-d-to-p)
-include $(GEN:%.o=%.P)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
ALL_GENERATED_SOURCES += $(GEN)
Add a .note.android.ident section to Android ELF binaries. This allows debugging tools to know they are working with Android binaries and adapt accordingly. Signed-off-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Signed-off-by: Michael Hope <michael.hope@linaro.org> Change-Id: Ic906992fcad61c028bb765821637a3e1333bf52b
2012-07-31 06:18:22 +02:00
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
$(GEN): $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic1.o $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbrand.o
@mkdir -p $(dir $@)
Add explicit -m32/-melf_i386 for x86 target Required for x86 build with multilib compiler. Change-Id: Iac71cdc3461df6fb48cb2a7b713324ca368e6704 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-08-16 16:11:13 +02:00
$(hide) $(TARGET_LD) $(libc_crt_target_ldflags) -r -o $@ $^
Add a .note.android.ident section to Android ELF binaries. This allows debugging tools to know they are working with Android binaries and adapt accordingly. Signed-off-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org> Signed-off-by: Michael Hope <michael.hope@linaro.org> Change-Id: Ic906992fcad61c028bb765821637a3e1333bf52b
2012-07-31 06:18:22 +02:00
ALL_GENERATED_SOURCES += $(GEN)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
# We rename crtend.o to crtend_android.o to avoid a
# name clash between gcc and bionic.
Rename the misleading var name TARGET_OUT_STATIC_LIBRARIES TARGET_OUT_STATIC_LIBRARIES is actually the same as TARGET_OUT_INTERMEDIATE_LIBRARIES. Change-Id: I11ac35256031d461d20156cd4c19ed7eae781d22
2012-05-16 00:15:11 +02:00
GEN := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
Move common arch-* code to arch-common directory Will be helpful on adding x86_64 Change-Id: I96cf6fc7912c02f289c75f07ae0079c32d69173f Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-02 14:38:05 +02:00
$(GEN): $(LOCAL_PATH)/arch-common/bionic/crtend.S
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
@mkdir -p $(dir $@)
Generate header dependency makefiles for the crt*.o Bug: 7127743 Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-08 02:06:56 +02:00
$(hide) $(TARGET_CC) $(libc_crt_target_cflags) \
-MD -MF $(@:%.o=%.d) -o $@ -c $<
$(transform-d-to-p)
-include $(GEN:%.o=%.P)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
ALL_GENERATED_SOURCES += $(GEN)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
# To enable malloc leak check for statically linked programs, add
# "WITH_MALLOC_CHECK_LIBC_A := true" to buildspec.mk
WITH_MALLOC_CHECK_LIBC_A := $(strip $(WITH_MALLOC_CHECK_LIBC_A))
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
Don't use -fstack-protector on ssp.c libc's stack protector initialization routine (__guard_setup) is in bionic/ssp.c. This code deliberately modifies the stack canary. This code should never be compiled with -fstack-protector-all otherwise it will crash (mismatched canary value). Force bionic/ssp.c to be compiled with -fno-stack-protector Change-Id: Ib95a5736e4bafe1a460d6b4e522ca660b417d8d6
2012-07-10 19:46:19 +02:00
# ========================================================
# libbionic_ssp.a - stack protector code
# ========================================================
#
# The stack protector code needs to be compiled
# with -fno-stack-protector, since it modifies the
# stack canary.
include $(CLEAR_VARS)
Fix debug malloc. This was broken by the change to use AT_RANDOM for the stack guards. Bug: 7959813 Bug: 8330764 Change-Id: I791900092b72a9a900f16585237fa7ad82aaed9f
2013-03-07 00:03:53 +01:00
LOCAL_SRC_FILES := bionic/__stack_chk_fail.cpp
Turn on -Werror for ssp.cpp. libc_bionic.a is already compiled -Werror, but this one file gets compiled into its own library because it needs to be compiled with -fno-stack-protector. Change-Id: I273c535ab5c73ccaccbcf793fda1f788a2589abe
2013-02-14 20:15:58 +01:00
LOCAL_CFLAGS := $(libc_common_cflags) -fno-stack-protector -Werror
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
Don't use -fstack-protector on ssp.c libc's stack protector initialization routine (__guard_setup) is in bionic/ssp.c. This code deliberately modifies the stack canary. This code should never be compiled with -fstack-protector-all otherwise it will crash (mismatched canary value). Force bionic/ssp.c to be compiled with -fno-stack-protector Change-Id: Ib95a5736e4bafe1a460d6b4e522ca660b417d8d6
2012-07-10 19:46:19 +02:00
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libbionic_ssp
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
Don't use -fstack-protector on ssp.c libc's stack protector initialization routine (__guard_setup) is in bionic/ssp.c. This code deliberately modifies the stack canary. This code should never be compiled with -fstack-protector-all otherwise it will crash (mismatched canary value). Force bionic/ssp.c to be compiled with -fno-stack-protector Change-Id: Ib95a5736e4bafe1a460d6b4e522ca660b417d8d6
2012-07-10 19:46:19 +02:00
LOCAL_SYSTEM_SHARED_LIBRARIES :=
include $(BUILD_STATIC_LIBRARY)
Upgrade to tzcode2013d. Well, kinda... localtime.c still contains a bunch of Android-specific hacks, as does strftime.c. But the other files are now exactly the same as upstream. This catches up with several years of bug fixes, and fixes most of the compiler warnings that were in this code. (Just two remain.) Bug: 1744909 Change-Id: I2ddfecb6fd408c847397c17afb0fff859e27feef
2013-07-13 02:31:11 +02:00
# ========================================================
# libc_tzcode.a - upstream 'tzcode' code
# ========================================================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libc_tzcode_src_files)
LOCAL_CFLAGS := \
$(libc_common_cflags) \
-DSTD_INSPIRED=1 \
-DTZDIR=\"/system/usr/share/zoneinfo\" \
-DTM_GMTOFF=tm_gmtoff \
-DUSG_COMPAT=1
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
Upgrade to tzcode2013d. Well, kinda... localtime.c still contains a bunch of Android-specific hacks, as does strftime.c. But the other files are now exactly the same as upstream. This catches up with several years of bug fixes, and fixes most of the compiler warnings that were in this code. (Just two remain.) Bug: 1744909 Change-Id: I2ddfecb6fd408c847397c17afb0fff859e27feef
2013-07-13 02:31:11 +02:00
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libc_tzcode
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
Upgrade to tzcode2013d. Well, kinda... localtime.c still contains a bunch of Android-specific hacks, as does strftime.c. But the other files are now exactly the same as upstream. This catches up with several years of bug fixes, and fixes most of the compiler warnings that were in this code. (Just two remain.) Bug: 1744909 Change-Id: I2ddfecb6fd408c847397c17afb0fff859e27feef
2013-07-13 02:31:11 +02:00
LOCAL_SYSTEM_SHARED_LIBRARIES :=
include $(BUILD_STATIC_LIBRARY)
Fix x86_64 build, clean up intermediate libraries. The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
2013-10-10 00:50:50 +02:00
# ========================================================
# libc_dns.a - modified NetBSD DNS code
# ========================================================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libc_dns_src_files)
LOCAL_CFLAGS := \
$(libc_common_cflags) \
-DINET6 \
-I$(LOCAL_PATH)/private \
-I$(LOCAL_PATH)/upstream-netbsd/libc/include # for NetBSD private headers
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libc_dns
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
LOCAL_SYSTEM_SHARED_LIBRARIES :=
include $(BUILD_STATIC_LIBRARY)
Move realpath.c to upstream-freebsd. This is actually a slightly newer upstream version than the one I originally pulled. Hopefully now it's in upstream-freebsd it will be easier to track upstream, though I still need to sit down and write the necessary scripts at some point. Bug: 5110679 Change-Id: I87e563f0f95aa8e68b45578e2a8f448bbf827a33
2013-03-02 01:59:46 +01:00
# ========================================================
# libc_freebsd.a - upstream FreeBSD C library code
# ========================================================
#
# These files are built with the freebsd-compat.h header file
# automatically included.
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libc_upstream_freebsd_src_files)
LOCAL_CFLAGS := \
$(libc_common_cflags) \
-I$(LOCAL_PATH)/upstream-freebsd \
-I$(LOCAL_PATH)/upstream-freebsd/libc/include \
-include upstream-freebsd/freebsd-compat.h
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
Move realpath.c to upstream-freebsd. This is actually a slightly newer upstream version than the one I originally pulled. Hopefully now it's in upstream-freebsd it will be easier to track upstream, though I still need to sit down and write the necessary scripts at some point. Bug: 5110679 Change-Id: I87e563f0f95aa8e68b45578e2a8f448bbf827a33
2013-03-02 01:59:46 +01:00
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libc_freebsd
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
Move realpath.c to upstream-freebsd. This is actually a slightly newer upstream version than the one I originally pulled. Hopefully now it's in upstream-freebsd it will be easier to track upstream, though I still need to sit down and write the necessary scripts at some point. Bug: 5110679 Change-Id: I87e563f0f95aa8e68b45578e2a8f448bbf827a33
2013-03-02 01:59:46 +01:00
LOCAL_SYSTEM_SHARED_LIBRARIES :=
include $(BUILD_STATIC_LIBRARY)
Revert "Revert "Switch to NetBSD's strxfrm(3)."" This reverts commit 8793e7c7d21a0434d1b5e63364c88b2b125a3d29, and fixes the build by building upstream NetBSD source as a separate library that's then swallowed whole into libc_common. Change-Id: I6c9317d8c48b5ccaf85a7b185bc07fb31176ff97
2012-08-10 20:39:58 +02:00
# ========================================================
# libc_netbsd.a - upstream NetBSD C library code
# ========================================================
#
# These files are built with the netbsd-compat.h header file
# automatically included.
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libc_upstream_netbsd_src_files)
LOCAL_CFLAGS := \
$(libc_common_cflags) \
Fix x86_64 build, clean up intermediate libraries. The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
2013-10-10 00:50:50 +02:00
-DPOSIX_MISTAKE \
Fix nice... ...by switching to the NetBSD implementation. Change-Id: I562b27b237a24ded95804035cc322c7bff12ff59
2012-08-14 01:38:29 +02:00
-I$(LOCAL_PATH)/upstream-netbsd \
More upstream NetBSD upgrades. Change-Id: Idb781d37de3b05585271d7d258ecffd5ba87d0b8
2012-10-24 01:05:09 +02:00
-I$(LOCAL_PATH)/upstream-netbsd/libc/include \
Revert "Revert "Switch to NetBSD's strxfrm(3)."" This reverts commit 8793e7c7d21a0434d1b5e63364c88b2b125a3d29, and fixes the build by building upstream NetBSD source as a separate library that's then swallowed whole into libc_common. Change-Id: I6c9317d8c48b5ccaf85a7b185bc07fb31176ff97
2012-08-10 20:39:58 +02:00
-include upstream-netbsd/netbsd-compat.h
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
Revert "Revert "Switch to NetBSD's strxfrm(3)."" This reverts commit 8793e7c7d21a0434d1b5e63364c88b2b125a3d29, and fixes the build by building upstream NetBSD source as a separate library that's then swallowed whole into libc_common. Change-Id: I6c9317d8c48b5ccaf85a7b185bc07fb31176ff97
2012-08-10 20:39:58 +02:00
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libc_netbsd
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
Revert "Revert "Switch to NetBSD's strxfrm(3)."" This reverts commit 8793e7c7d21a0434d1b5e63364c88b2b125a3d29, and fixes the build by building upstream NetBSD source as a separate library that's then swallowed whole into libc_common. Change-Id: I6c9317d8c48b5ccaf85a7b185bc07fb31176ff97
2012-08-10 20:39:58 +02:00
LOCAL_SYSTEM_SHARED_LIBRARIES :=
include $(BUILD_STATIC_LIBRARY)
Move setlocale(3) and the wchar stubs over to .cpp. Also separate out the C++ files so we can use -Werror on them. I'd rather wait for LOCAL_CPPFLAGS to be in AOSP, but this also lets us see which files still need to be sorted into one bucket or the other. Change-Id: I6acc1f7c043935c70a3b089f705d218b9aaaba0a
2012-10-23 02:05:27 +02:00
# ========================================================
# libc_bionic.a - home-grown C library code
# ========================================================
#
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libc_bionic_src_files)
LOCAL_CFLAGS := $(libc_common_cflags) -Werror
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
Move setlocale(3) and the wchar stubs over to .cpp. Also separate out the C++ files so we can use -Werror on them. I'd rather wait for LOCAL_CPPFLAGS to be in AOSP, but this also lets us see which files still need to be sorted into one bucket or the other. Change-Id: I6acc1f7c043935c70a3b089f705d218b9aaaba0a
2012-10-23 02:05:27 +02:00
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_MODULE := libc_bionic
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
Move setlocale(3) and the wchar stubs over to .cpp. Also separate out the C++ files so we can use -Werror on them. I'd rather wait for LOCAL_CPPFLAGS to be in AOSP, but this also lets us see which files still need to be sorted into one bucket or the other. Change-Id: I6acc1f7c043935c70a3b089f705d218b9aaaba0a
2012-10-23 02:05:27 +02:00
LOCAL_SYSTEM_SHARED_LIBRARIES :=
Move the pthread debugging flags to the right place. Change-Id: Ie805bd837d1f72cdf1818e056c0baeb0857e4e84
2013-10-31 22:09:39 +01:00
# Set -DPTHREAD_DEBUG_ENABLED=true to enable support for pthread deadlock prediction.
# Since this code is experimental it is disabled by default.
LOCAL_CFLAGS += $(libc_common_cflags) -DPTHREAD_DEBUG_ENABLED=false
Move setlocale(3) and the wchar stubs over to .cpp. Also separate out the C++ files so we can use -Werror on them. I'd rather wait for LOCAL_CPPFLAGS to be in AOSP, but this also lets us see which files still need to be sorted into one bucket or the other. Change-Id: I6acc1f7c043935c70a3b089f705d218b9aaaba0a
2012-10-23 02:05:27 +02:00
include $(BUILD_STATIC_LIBRARY)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
# ========================================================
# libc_common.a
# ========================================================
Revert "Revert "Switch to NetBSD's strxfrm(3)."" This reverts commit 8793e7c7d21a0434d1b5e63364c88b2b125a3d29, and fixes the build by building upstream NetBSD source as a separate library that's then swallowed whole into libc_common. Change-Id: I6c9317d8c48b5ccaf85a7b185bc07fb31176ff97
2012-08-10 20:39:58 +02:00
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
include $(CLEAR_VARS)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
LOCAL_SRC_FILES := $(libc_common_src_files)
Fix x86_64 build, clean up intermediate libraries. The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
2013-10-10 00:50:50 +02:00
LOCAL_CFLAGS := $(libc_common_cflags)
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
LOCAL_C_INCLUDES := $(libc_common_c_includes)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
LOCAL_MODULE := libc_common
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
Upgrade to tzcode2013d. Well, kinda... localtime.c still contains a bunch of Android-specific hacks, as does strftime.c. But the other files are now exactly the same as upstream. This catches up with several years of bug fixes, and fixes most of the compiler warnings that were in this code. (Just two remain.) Bug: 1744909 Change-Id: I2ddfecb6fd408c847397c17afb0fff859e27feef
2013-07-13 02:31:11 +02:00
LOCAL_WHOLE_STATIC_LIBRARIES := \
libbionic_ssp \
libc_bionic \
Fix x86_64 build, clean up intermediate libraries. The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
2013-10-10 00:50:50 +02:00
libc_dns \
Upgrade to tzcode2013d. Well, kinda... localtime.c still contains a bunch of Android-specific hacks, as does strftime.c. But the other files are now exactly the same as upstream. This catches up with several years of bug fixes, and fixes most of the compiler warnings that were in this code. (Just two remain.) Bug: 1744909 Change-Id: I2ddfecb6fd408c847397c17afb0fff859e27feef
2013-07-13 02:31:11 +02:00
libc_freebsd \
libc_netbsd \
Fix x86_64 build, clean up intermediate libraries. The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
2013-10-10 00:50:50 +02:00
libc_tzcode \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
LOCAL_SYSTEM_SHARED_LIBRARIES :=
Split out LOCAL_ASFLAGS. Bug: 6967574 Change-Id: I5be50d582c1cb8075039b06292cf0745a996c3c4
2012-08-11 23:23:19 +02:00
# TODO: split out the asflags.
LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
include $(BUILD_STATIC_LIBRARY)
libc: Add an intermediate version of the static libc without malloc For now, this will only used by the dynamic loader to ensure that malloc and friends are never called. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
# ========================================================
# libc_nomalloc.a
# ========================================================
#
# This is a version of the static C library that does not
Everyone has a TLS register. Change-Id: Id7cdf67087aa7d5074c9c59b7e595bc391d9f146
2013-02-13 06:56:42 +01:00
# include malloc. It's useful in situations when the user wants
# to provide their own malloc implementation, or wants to
# explicitly disallow the use of the use of malloc,
# such as in the dynamic loader.
libc: Add an intermediate version of the static libc without malloc For now, this will only used by the dynamic loader to ensure that malloc and friends are never called. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
$(libc_arch_static_src_files) \
Fix __get_tls() in static C library to use kernel helpers. This is needed to fix gdbserver's handling of threaded programs, among other things. Change-Id: I823387c602cef9891532da946a01db14be780ab0
2010-08-27 17:19:19 +02:00
$(libc_static_common_src_files) \
Clean up the argc/argv/envp/auxv handling. There's now only one place where we deal with this stuff, it only needs to be parsed once by the dynamic linker (rather than by each recipient), and it's now easier for us to get hold of auxv data early on. Change-Id: I6314224257c736547aac2e2a650e66f2ea53bef5
2013-02-07 19:14:39 +01:00
bionic/libc_init_static.cpp
libc: Add an intermediate version of the static libc without malloc For now, this will only used by the dynamic loader to ensure that malloc and friends are never called. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
LOCAL_C_INCLUDES := $(libc_common_c_includes)
Fix __get_tls() in static C library to use kernel helpers. This is needed to fix gdbserver's handling of threaded programs, among other things. Change-Id: I823387c602cef9891532da946a01db14be780ab0
2010-08-27 17:19:19 +02:00
LOCAL_CFLAGS := $(libc_common_cflags) \
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
-DLIBC_STATIC
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
libc: Add an intermediate version of the static libc without malloc For now, this will only used by the dynamic loader to ensure that malloc and friends are never called. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
LOCAL_MODULE := libc_nomalloc
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
libc: Add an intermediate version of the static libc without malloc For now, this will only used by the dynamic loader to ensure that malloc and friends are never called. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
LOCAL_SYSTEM_SHARED_LIBRARIES :=
include $(BUILD_STATIC_LIBRARY)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
# ========================================================
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
# libc.a
# ========================================================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
$(libc_arch_static_src_files) \
Fix __get_tls() in static C library to use kernel helpers. This is needed to fix gdbserver's handling of threaded programs, among other things. Change-Id: I823387c602cef9891532da946a01db14be780ab0
2010-08-27 17:19:19 +02:00
$(libc_static_common_src_files) \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
bionic/dlmalloc.c \
Clean up warnings in the malloc_debug_* files. Also clean up cpplint.py-detected lint. Change-Id: Ia18e89c4c6878764f8d7ed34b8247e7a8d8fe88b
2012-08-28 23:15:04 +02:00
bionic/malloc_debug_common.cpp \
Clean up the argc/argv/envp/auxv handling. There's now only one place where we deal with this stuff, it only needs to be parsed once by the dynamic linker (rather than by each recipient), and it's now easier for us to get hold of auxv data early on. Change-Id: I6314224257c736547aac2e2a650e66f2ea53bef5
2013-02-07 19:14:39 +01:00
bionic/libc_init_static.cpp
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
LOCAL_CFLAGS := $(libc_common_cflags) \
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
-DLIBC_STATIC
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
LOCAL_C_INCLUDES := $(libc_common_c_includes)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
LOCAL_MODULE := libc
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
LOCAL_SYSTEM_SHARED_LIBRARIES :=
include $(BUILD_STATIC_LIBRARY)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
# ========================================================
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
# libc.so
# ========================================================
include $(CLEAR_VARS)
Move the pthread debugging flags to the right place. Change-Id: Ie805bd837d1f72cdf1818e056c0baeb0857e4e84
2013-10-31 22:09:39 +01:00
LOCAL_CFLAGS := $(libc_common_cflags)
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_SRC_FILES := \
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
$(libc_arch_dynamic_src_files) \
Fix __get_tls() in static C library to use kernel helpers. This is needed to fix gdbserver's handling of threaded programs, among other things. Change-Id: I823387c602cef9891532da946a01db14be780ab0
2010-08-27 17:19:19 +02:00
$(libc_static_common_src_files) \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
bionic/dlmalloc.c \
Clean up warnings in the malloc_debug_* files. Also clean up cpplint.py-detected lint. Change-Id: Ia18e89c4c6878764f8d7ed34b8247e7a8d8fe88b
2012-08-28 23:15:04 +02:00
bionic/malloc_debug_common.cpp \
Fix the duplication in the debugging code. We had two copies of the backtrace code, and two copies of the libcorkscrew /proc/pid/maps code. This patch gets us down to one. We also had hacks so we could log in the malloc debugging code. This patch pulls the non-allocating "printf" code out of the dynamic linker so everyone can share. This patch also makes the leak diagnostics easier to read, and makes it possible to paste them directly into the 'stack' tool (by using relative PCs). This patch also fixes the stdio standard stream leak that was causing a leak warning every time tf_daemon ran. Bug: 7291287 Change-Id: I66e4083ac2c5606c8d2737cb45c8ac8a32c7cfe8
2013-01-18 03:36:06 +01:00
bionic/pthread_debug.cpp \
Clean up the argc/argv/envp/auxv handling. There's now only one place where we deal with this stuff, it only needs to be parsed once by the dynamic linker (rather than by each recipient), and it's now easier for us to get hold of auxv data early on. Change-Id: I6314224257c736547aac2e2a650e66f2ea53bef5
2013-02-07 19:14:39 +01:00
bionic/libc_init_dynamic.cpp
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
ARM: make CRT_LEGACY_WORKAROUND work as intended To properly support legacy ARM shared libraries, libc.so needs to export the symbols __dso_handle and atexit, even though these are now supplied by the crt startup code. This patch reshuffles the existing CRT_LEGACY_WORKAROUND conditionally compiled code slightly so it works as the original author likely intended. Change-Id: Id6c0e94dc65b7928324a5f0bad7eba6eb2f464b9 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-21 14:13:50 +02:00
ifeq ($(TARGET_ARCH),arm)
LOCAL_NO_CRT := true
LOCAL_CFLAGS += -DCRT_LEGACY_WORKAROUND
LOCAL_SRC_FILES := \
Move common arch-* code to arch-common directory Will be helpful on adding x86_64 Change-Id: I96cf6fc7912c02f289c75f07ae0079c32d69173f Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-02 14:38:05 +02:00
arch-common/bionic/crtbegin_so.c \
ARM: make CRT_LEGACY_WORKAROUND work as intended To properly support legacy ARM shared libraries, libc.so needs to export the symbols __dso_handle and atexit, even though these are now supplied by the crt startup code. This patch reshuffles the existing CRT_LEGACY_WORKAROUND conditionally compiled code slightly so it works as the original author likely intended. Change-Id: Id6c0e94dc65b7928324a5f0bad7eba6eb2f464b9 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-21 14:13:50 +02:00
arch-arm/bionic/atexit_legacy.c \
$(LOCAL_SRC_FILES) \
Move common arch-* code to arch-common directory Will be helpful on adding x86_64 Change-Id: I96cf6fc7912c02f289c75f07ae0079c32d69173f Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-02 14:38:05 +02:00
arch-common/bionic/crtend_so.S
ARM: make CRT_LEGACY_WORKAROUND work as intended To properly support legacy ARM shared libraries, libc.so needs to export the symbols __dso_handle and atexit, even though these are now supplied by the crt startup code. This patch reshuffles the existing CRT_LEGACY_WORKAROUND conditionally compiled code slightly so it works as the original author likely intended. Change-Id: Id6c0e94dc65b7928324a5f0bad7eba6eb2f464b9 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-21 14:13:50 +02:00
endif
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
LOCAL_MODULE:= libc
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
Make bionic's dependency on the tzdata explicit. Also stop building the obsolete three files, now bionic and libcore both use the new single file. Bug: 7012465 Change-Id: I1b9b49af7382c57b6cb8820c2275e6d4044b2bb6
2012-10-18 20:28:56 +02:00
LOCAL_REQUIRED_MODULES := tzdata
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
# WARNING: The only library libc.so should depend on is libdl.so! If you add other libraries,
# make sure to add -Wl,--exclude-libs=libgcc.a to the LOCAL_LDFLAGS for those libraries. This
# ensures that symbols that are pulled into those new libraries from libgcc.a are not declared
# external; if that were the case, then libc would not pull those symbols from libgcc.a as it
# should, instead relying on the external symbols from the dependent libraries. That would
# create an "cloaked" dependency on libgcc.a in libc though the libraries, which is not what
# you wanted!
LOCAL_SHARED_LIBRARIES := libdl
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
LOCAL_SYSTEM_SHARED_LIBRARIES :=
include $(BUILD_SHARED_LIBRARY)
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
# For all builds, except for the -user build we will enable memory
# allocation checking (including memory leaks, buffer overwrites, etc.)
# Note that all these checks are also controlled by env. settings
# that can enable, or disable specific checks. Note also that some of
# the checks are available only in emulator and are implemeted in
# libc_malloc_qemu_instrumented.so.
ifneq ($(TARGET_BUILD_VARIANT),user)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
# ========================================================
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
# libc_malloc_debug_leak.so
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
# ========================================================
include $(CLEAR_VARS)
libc: Cleanup the libc makefile. Removes a lot of redundant code, and reorganizes the file. We first setup all the comomn variables we may need, and then define the actual libraries that need to be generated. Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 19:52:37 +02:00
LOCAL_CFLAGS := \
$(libc_common_cflags) \
-DMALLOC_LEAK_CHECK
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_SRC_FILES := \
Fix the duplication in the debugging code. We had two copies of the backtrace code, and two copies of the libcorkscrew /proc/pid/maps code. This patch gets us down to one. We also had hacks so we could log in the malloc debugging code. This patch pulls the non-allocating "printf" code out of the dynamic linker so everyone can share. This patch also makes the leak diagnostics easier to read, and makes it possible to paste them directly into the 'stack' tool (by using relative PCs). This patch also fixes the stdio standard stream leak that was causing a leak warning every time tf_daemon ran. Bug: 7291287 Change-Id: I66e4083ac2c5606c8d2737cb45c8ac8a32c7cfe8
2013-01-18 03:36:06 +01:00
bionic/debug_mapinfo.cpp \
bionic/debug_stacktrace.cpp \
Clean up warnings in the malloc_debug_* files. Also clean up cpplint.py-detected lint. Change-Id: Ia18e89c4c6878764f8d7ed34b8247e7a8d8fe88b
2012-08-28 23:15:04 +02:00
bionic/malloc_debug_leak.cpp \
bionic/malloc_debug_check.cpp \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
LOCAL_MODULE:= libc_malloc_debug_leak
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
Add libdl into libc_malloc_debug_leak build Otherwise libc_malloc_debug_leak.so is failed to load runtime in x86 case Change-Id: I8207ce06d1ec17b233f4e4fcfdd2b161673b4fa8 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2012-09-10 17:35:25 +02:00
LOCAL_SHARED_LIBRARIES := libc libdl
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
LOCAL_SYSTEM_SHARED_LIBRARIES :=
Fix undefined reference to dl_iterate_phdr for x86 Change-Id: I22410b27939e8f54da932d7a1104102550c4685f Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-08 23:47:50 +02:00
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
bionic: remove LOCAL_PRELINK_MODULE Change-Id: Iad65ae18446b20d2aace7b8fe19b1a032b616e9c Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-14 22:02:05 +01:00
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
# Don't install on release build
LOCAL_MODULE_TAGS := eng debug
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
include $(BUILD_SHARED_LIBRARY)
# ========================================================
# libc_malloc_debug_qemu.so
# ========================================================
include $(CLEAR_VARS)
LOCAL_CFLAGS := \
$(libc_common_cflags) \
-DMALLOC_QEMU_INSTRUMENT
Use gnu++11 and gnu99 explicitly for C++/C files. Clang and gcc default to different standards, so we should be explicit about the versions we want to compile for. Change-Id: I65495a2392dd29f36373b94c616c2506173e6033
2013-10-01 02:10:53 +02:00
LOCAL_CONLYFLAGS := $(libc_common_conlyflags)
LOCAL_CPPFLAGS := $(libc_common_cppflags)
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
LOCAL_C_INCLUDES := $(libc_common_c_includes)
LOCAL_SRC_FILES := \
Clean up warnings in the malloc_debug_* files. Also clean up cpplint.py-detected lint. Change-Id: Ia18e89c4c6878764f8d7ed34b8247e7a8d8fe88b
2012-08-28 23:15:04 +02:00
bionic/malloc_debug_qemu.cpp
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
LOCAL_MODULE:= libc_malloc_debug_qemu
Add dependencies on included makefiles. Bug: 11050594 Merge from internal master. (cherry-picked from f389284e86bbcbdb257d7388a17fde007113b0d6) Change-Id: I2b3e38329a09d26c16870906f9ed1257e2a9dbc8
2013-10-03 22:26:22 +02:00
LOCAL_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies)
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
implement pthread mutex deadlock detection this works by building a directed graph of acquired pthread mutexes and making sure there are no loops in that graph. this feature is enabled with: setprop debug.libc.pthread 1 when a potential deadlock is detected, a large warning is output to the log with appropriate back traces. currently disabled at compile-time. set PTHREAD_DEBUG_ENABLED=1 to enable. Change-Id: I916eed2319599e8aaf8f229d3f18a8ddbec3aa8a
2011-09-06 08:54:55 +02:00
LOCAL_SHARED_LIBRARIES := libc libdl
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
LOCAL_SYSTEM_SHARED_LIBRARIES :=
bionic: remove LOCAL_PRELINK_MODULE Change-Id: Iad65ae18446b20d2aace7b8fe19b1a032b616e9c Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-14 22:02:05 +01:00
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
# Don't install on release build
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
LOCAL_MODULE_TAGS := eng debug
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
include $(BUILD_SHARED_LIBRARY)
Split libc_debug.so into two .so modules loaded on demand from libc.so This change is intended to eliminate need to replace libc.so with libc_debug.so in order to enablememory allocation debugging. This is also the first step towards implementing extended memoryallocation debugging using emulator's capabilities in monitoring memory access.
2009-11-17 23:13:38 +01:00
endif #!user
auto import from //depot/cupcake/@135843
2009-03-04 04:28:35 +01:00
# ========================================================
include $(call all-makefiles-under,$(LOCAL_PATH))
Reference in a new issue Copy permalink