Elliott Hughes
ff4608ae0c
Merge "Add missing dependencies."
2012-09-05 14:46:15 -07:00
Elliott Hughes
2e8f4345df
Add missing dependencies.
...
Change-Id: I53c1cfb59ac7a89952a8d6b906b2b9e16a66624f
2012-09-05 14:27:17 -07:00
Elliott Hughes
db18cbdd85
am d5b14e35
: am faf361a6
: am 2fc3e1ef
: am b2c5bd54
: Merge "ARM: warn about atexit() calls from legacy shared libraries"
...
* commit 'd5b14e35521ee6a038714c42ec523dcfe183b65b':
ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:36:09 -07:00
Elliott Hughes
d5b14e3552
am faf361a6
: am 2fc3e1ef
: am b2c5bd54
: Merge "ARM: warn about atexit() calls from legacy shared libraries"
...
* commit 'faf361a6ac23af030268728f6eb02a3d1080a5ff':
ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:34:23 -07:00
Elliott Hughes
faf361a6ac
am 2fc3e1ef
: am b2c5bd54
: Merge "ARM: warn about atexit() calls from legacy shared libraries"
...
* commit '2fc3e1efda003d9eb110c3fc08bb32f29c6e8a4b':
ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:32:25 -07:00
Elliott Hughes
2fc3e1efda
am b2c5bd54
: Merge "ARM: warn about atexit() calls from legacy shared libraries"
...
* commit 'b2c5bd543dcbbc1b2cbf7afd8b124256ce2c128e':
ARM: warn about atexit() calls from legacy shared libraries
2012-09-05 10:29:23 -07:00
Elliott Hughes
b2c5bd543d
Merge "ARM: warn about atexit() calls from legacy shared libraries"
2012-09-05 10:18:43 -07:00
Elliott Hughes
ec0d2a86b7
am 340ff83f
: am ac3e35cd
: am a76f2eca
: am 26f2e4a1
: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
...
* commit '340ff83f9878a478cfa4b5aaaf4260f96304c416':
ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 10:06:25 -07:00
Elliott Hughes
340ff83f98
am ac3e35cd
: am a76f2eca
: am 26f2e4a1
: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
...
* commit 'ac3e35cd8f1ba8133905ee3700e092efef98ab12':
ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 10:03:37 -07:00
Elliott Hughes
ac3e35cd8f
am a76f2eca
: am 26f2e4a1
: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
...
* commit 'a76f2ecaa203bd8b5cc2ca157f06c0d2de66a52f':
ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 10:01:48 -07:00
Elliott Hughes
a76f2ecaa2
am 26f2e4a1
: Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
...
* commit '26f2e4a1639a959513c4ff5981b4eb52757e8012':
ARM: make CRT_LEGACY_WORKAROUND work as intended
2012-09-05 09:57:15 -07:00
Elliott Hughes
26f2e4a163
Merge "ARM: make CRT_LEGACY_WORKAROUND work as intended"
2012-09-05 09:43:35 -07:00
Ian Rogers
48468f258a
am 64f4e714
: am f71d757f
: am 7310a1c4
: am 82978cae
: Merge "Avoid malloc lock while calling pthread_atfork."
...
* commit '64f4e714186ff69016abcb241fd912ed8ef8472a':
Avoid malloc lock while calling pthread_atfork.
2012-09-05 07:56:21 -07:00
Ian Rogers
64f4e71418
am f71d757f
: am 7310a1c4
: am 82978cae
: Merge "Avoid malloc lock while calling pthread_atfork."
...
* commit 'f71d757f6eea0394654b5c07a580bf3b4d048853':
Avoid malloc lock while calling pthread_atfork.
2012-09-05 07:54:35 -07:00
Ian Rogers
f71d757f6e
am 7310a1c4
: am 82978cae
: Merge "Avoid malloc lock while calling pthread_atfork."
...
* commit '7310a1c4326bc875aeea2ce091a4b6558d183b2d':
Avoid malloc lock while calling pthread_atfork.
2012-09-05 07:52:12 -07:00
Ian Rogers
7310a1c432
am 82978cae
: Merge "Avoid malloc lock while calling pthread_atfork."
...
* commit '82978cae4eec238a9d631d2b61b8985daa02516e':
Avoid malloc lock while calling pthread_atfork.
2012-09-05 07:48:14 -07:00
Ian Rogers
82978cae4e
Merge "Avoid malloc lock while calling pthread_atfork."
2012-09-05 07:41:32 -07:00
The Android Automerger
3a8807df34
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-05 06:33:22 -07:00
Elliott Hughes
3ee5775a0f
am 9deb460a
: am ab558163
: am b9f0a6eb
: am be19a367
: Merge "termios: add tcdrain"
...
* commit '9deb460a26b8d5f6c74b5935e35b6f419775a1e5':
termios: add tcdrain
2012-09-04 18:18:01 -07:00
Elliott Hughes
9deb460a26
am ab558163
: am b9f0a6eb
: am be19a367
: Merge "termios: add tcdrain"
...
* commit 'ab558163a3f79834d4aa3107f4fed20bb242860b':
termios: add tcdrain
2012-09-04 18:15:48 -07:00
Elliott Hughes
ab558163a3
am b9f0a6eb
: am be19a367
: Merge "termios: add tcdrain"
...
* commit 'b9f0a6eb75aa8f1eec95fb5718d84cef1d0f61b8':
termios: add tcdrain
2012-09-04 18:13:50 -07:00
Elliott Hughes
b9f0a6eb75
am be19a367
: Merge "termios: add tcdrain"
...
* commit 'be19a3671709879ccc0156b94f7ef7540027dc37':
termios: add tcdrain
2012-09-04 18:10:07 -07:00
Elliott Hughes
be19a36717
Merge "termios: add tcdrain"
2012-09-04 17:52:40 -07:00
Elliott Hughes
6b08ed7937
am fe7ac11a
: am f34c6d77
: am bc374078
: am 5ff23471
: Merge "Add getsid system call to bionic"
...
* commit 'fe7ac11afa1c3a64c12e7e632e12b5c853ca3d89':
Add getsid system call to bionic
2012-09-04 16:52:05 -07:00
Elliott Hughes
fe7ac11afa
am f34c6d77
: am bc374078
: am 5ff23471
: Merge "Add getsid system call to bionic"
...
* commit 'f34c6d7796102cf33bd8887efd0ba3f70884acd9':
Add getsid system call to bionic
2012-09-04 16:49:27 -07:00
Elliott Hughes
f34c6d7796
am bc374078
: am 5ff23471
: Merge "Add getsid system call to bionic"
...
* commit 'bc3740787ac4108c2e0e247bc7ca2ea66329c5ab':
Add getsid system call to bionic
2012-09-04 16:47:44 -07:00
Elliott Hughes
bc3740787a
am 5ff23471
: Merge "Add getsid system call to bionic"
...
* commit '5ff23471303a1b99ddc1e1751662aa45f34b5e21':
Add getsid system call to bionic
2012-09-04 16:44:54 -07:00
Elliott Hughes
5ff2347130
Merge "Add getsid system call to bionic"
2012-09-04 16:36:27 -07:00
Elliott Hughes
5f517ce256
am ad639c1d
: am 877ad30f
: am 507bcabb
: am e03ab936
: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
...
* commit 'ad639c1d2bf0c12a77c24a3247cedf86cc719d6e':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
2012-09-04 16:05:33 -07:00
Elliott Hughes
ad639c1d2b
am 877ad30f
: am 507bcabb
: am e03ab936
: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
...
* commit '877ad30fd6e8745b43063947a9220d1f1398ee02':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
2012-09-04 16:03:30 -07:00
Elliott Hughes
877ad30fd6
am 507bcabb
: am e03ab936
: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
...
* commit '507bcabb3565d20541242ad61f987bc1a6483ba1':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
2012-09-04 16:00:20 -07:00
Elliott Hughes
507bcabb35
am e03ab936
: Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
...
* commit 'e03ab936996a1a46d461cdad463d7f5bca10b051':
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
2012-09-04 15:56:12 -07:00
Elliott Hughes
e03ab93699
Merge "Add missing MALLOC_FAILURE_ACTION calls to dlmalloc."
2012-09-04 15:51:55 -07:00
Elliott Hughes
63deae5e4f
Add missing MALLOC_FAILURE_ACTION calls to dlmalloc.
...
Without these, sometimes malloc(3) returns NULL without setting errno.
Change-Id: I4708c3f675bf2c878ddcaf012fde7848b255826b
2012-09-04 15:42:23 -07:00
Elliott Hughes
839ae785d8
am 1d07eda8
: am c0e3b9dd
: am b438c54d
: am 1db615b4
: Merge "bionic: Fix TINY_ANDROID build"
...
* commit '1d07eda8db4a8a8986b0e2681eef0d839c9901df':
bionic: Fix TINY_ANDROID build
2012-09-04 13:53:51 -07:00
Elliott Hughes
1d07eda8db
am c0e3b9dd
: am b438c54d
: am 1db615b4
: Merge "bionic: Fix TINY_ANDROID build"
...
* commit 'c0e3b9ddd6c7dae0a402067c79609ddefcde125b':
bionic: Fix TINY_ANDROID build
2012-09-04 13:51:57 -07:00
Elliott Hughes
c0e3b9ddd6
am b438c54d
: am 1db615b4
: Merge "bionic: Fix TINY_ANDROID build"
...
* commit 'b438c54d02b722a93a72ff6e834ab78053ca3add':
bionic: Fix TINY_ANDROID build
2012-09-04 13:49:41 -07:00
Elliott Hughes
b438c54d02
am 1db615b4
: Merge "bionic: Fix TINY_ANDROID build"
...
* commit '1db615b4ae469c9f33dc1d88b24924ca8efc10ef':
bionic: Fix TINY_ANDROID build
2012-09-04 13:46:46 -07:00
Elliott Hughes
1db615b4ae
Merge "bionic: Fix TINY_ANDROID build"
2012-09-04 13:42:57 -07:00
Benoit Goby
5ac9eee1d3
bionic: Fix TINY_ANDROID build
...
(cherry-pick of 545d5dbbcb0dc9e44323c4f2e687a3aace75a483.)
Change-Id: Ifc91e84ffed5a3a287accabd7f08b02752688db6
2012-09-04 13:36:54 -07:00
Vitaly Wool
954923858b
termios: add tcdrain
...
Change-Id: I05c0007f7bcc6ef5295c32f86fafbf1ad31e07fa
2012-09-04 14:11:28 +02:00
The Android Automerger
2b49277d84
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-03 06:33:17 -07:00
Irina Tirdea
1ad10a566e
Add getsid system call to bionic
...
Add getsid() system call to bionic for
all architectures. This is needed for various tools
(e.g. perf).
Adding the getsid system call was done in 3 steps:
() add getsid 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.
() add the system call signature to libc/include/unistd.h
Change-Id: Id69a257e13ec02e1a44085a6b217a3f19ab025b1
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2012-09-03 01:38:34 +03:00
Kirill Artamonov
3e2d2936b0
Avoid malloc lock while calling pthread_atfork.
...
Expecting the memory in a forked child process to be sane wrt threading
is a bad idea. An example of a problem is when the parent process has
the malloc lock and a child process is forked. The malloc lock in the
child will appear locked by a thread that doesn't exist.
This change aims to make bionic more compatible with glibc by reseting
the malloc lock in the child forked process, as well as holding it
during the fork. This is a feature in dlmalloc 2.8.6 called
LOCK_AT_FORK. In general this feature isn't necessary as a forked
process will then exec. Some bad applications rely on being able to use
features like malloc before the exec and having multiple threads running
in the parent program. This isn't a problem with glibc and this patch
makes it not a problem for bionic.
Unfortunately for use in bionic, LOCK_AT_FORK has an issue as internally
it uses pthread_atfork that in bionic uses malloc. This leads to the
LOCK_AT_FORK initialization deadlocking with pthread_atfork's call to
malloc due to the malloc lock. This change moves the pthread_atfork logic
in LOCK_AT_FORK to be called without the malloc lock held.
Change-Id: Id68175a564a6abb936ee4488b44d9479f7311f69
2012-08-31 11:11:40 -07:00
Ian Rogers
a4e3391db2
am 5b0e2de6
: am b9ad1a1e
: am 6abab301
: am 6fe901ef
: Merge "Upgrade to dlmalloc 2.8.6."
...
* commit '5b0e2de6aef96e10c26034d9b447208a56df82d9':
Upgrade to dlmalloc 2.8.6.
2012-08-31 09:03:23 -07:00
Ian Rogers
5b0e2de6ae
am b9ad1a1e
: am 6abab301
: am 6fe901ef
: Merge "Upgrade to dlmalloc 2.8.6."
...
* commit 'b9ad1a1e001cc06db121994ca0da7deb4c60914a':
Upgrade to dlmalloc 2.8.6.
2012-08-31 09:01:07 -07:00
Ian Rogers
b9ad1a1e00
am 6abab301
: am 6fe901ef
: Merge "Upgrade to dlmalloc 2.8.6."
...
* commit '6abab301db84af7c98a4873fbf49997078aa19cc':
Upgrade to dlmalloc 2.8.6.
2012-08-31 08:58:33 -07:00
Ian Rogers
6abab301db
am 6fe901ef
: Merge "Upgrade to dlmalloc 2.8.6."
...
* commit '6fe901ef38898d9cb6007720940e915f7180fc11':
Upgrade to dlmalloc 2.8.6.
2012-08-31 08:55:41 -07:00
Ian Rogers
6fe901ef38
Merge "Upgrade to dlmalloc 2.8.6."
2012-08-31 08:42:41 -07:00
The Android Automerger
83d5e567d6
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-30 06:33:17 -07:00