Elliott Hughes
e8b4d67a37
am 59726bed
: Merge "Rename crtstart variables as crtbegin, to match reality."
...
* commit '59726beda5bec7e3db9d0c403a0ef11d0a7f182f':
Rename crtstart variables as crtbegin, to match reality.
2012-09-10 12:01:04 -07:00
Elliott Hughes
59726beda5
Merge "Rename crtstart variables as crtbegin, to match reality."
2012-09-10 11:52:12 -07:00
Elliott Hughes
12949e5d39
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 11:16:12 -07:00
Ying Wang
e3738414a6
am f9920563
: am 67546bf2
: Merge "Generate header dependency makefiles for the crt*.o"
...
* commit 'f9920563dabc21a5c741ef630e6ca8fe66fbbe5b':
Generate header dependency makefiles for the crt*.o
2012-09-10 10:07:17 -07:00
Ying Wang
f9920563da
am 67546bf2
: Merge "Generate header dependency makefiles for the crt*.o"
...
* commit '67546bf209b2c5480aa4811b2bb3c42e7862af62':
Generate header dependency makefiles for the crt*.o
2012-09-10 10:05:14 -07:00
Ying Wang
67546bf209
Merge "Generate header dependency makefiles for the crt*.o"
2012-09-10 09:48:46 -07:00
The Android Automerger
9209fd3868
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-09 06:59:39 -07:00
Elliott Hughes
af4371b46b
am 56ba6336
: am f1d57e16
: Merge "Add more pthreads tests."
...
* commit '56ba6336d9c07cdfb5af2324aaa52da0c8d00ef2':
Add more pthreads tests.
2012-09-07 20:35:01 -07:00
Elliott Hughes
56ba6336d9
am f1d57e16
: Merge "Add more pthreads tests."
...
* commit 'f1d57e16686153b69a27c1eb9e339c77232c0edd':
Add more pthreads tests.
2012-09-07 18:38:41 -07:00
Elliott Hughes
f1d57e1668
Merge "Add more pthreads tests."
2012-09-07 18:30:18 -07:00
Ying Wang
cf464878ef
Generate header dependency makefiles for the crt*.o
...
Bug: 7127743
Change-Id: I606e5f7cd2b513f855a1fefd2b001abd365fc854
2012-09-07 17:13:37 -07:00
Elliott Hughes
4d014e15b4
Add more pthreads tests.
...
Someone reported a bug if pthread_detach is called while a pthread_join is
already in progress, but I'm unable to reproduce it. Keep the tests I wrote,
though.
Change-Id: I3d71450bbbb5345f2cb213dc56310ec020d528cc
2012-09-07 16:47:54 -07:00
Elliott Hughes
b010245490
am 7c7a7f8e
: am d10309c3
: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
...
* commit '7c7a7f8e526518f37eae3ce2a785344316f263e0':
Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:09:23 -07:00
Elliott Hughes
b18d4f6361
am 72fcdbe9
: am 691ef3c8
: Merge "Add mlockall and munlockall for Google TV."
...
* commit '72fcdbe9025b0405251c17eb391f326e03bf92ef':
Add mlockall and munlockall for Google TV.
2012-09-07 11:09:23 -07:00
Elliott Hughes
7c7a7f8e52
am d10309c3
: Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
...
* commit 'd10309c36b93176a473baeeddef6f3fba8bf0678':
Rename __dso_handle_so.c to __dso_handle_so.h
2012-09-07 11:07:13 -07:00
Elliott Hughes
72fcdbe902
am 691ef3c8
: Merge "Add mlockall and munlockall for Google TV."
...
* commit '691ef3c80b4af278aa90d6e005ba42de1e52c140':
Add mlockall and munlockall for Google TV.
2012-09-07 11:07:10 -07:00
Elliott Hughes
d10309c36b
Merge "Rename __dso_handle_so.c to __dso_handle_so.h"
2012-09-07 10:59:20 -07:00
Elliott Hughes
691ef3c80b
Merge "Add mlockall and munlockall for Google TV."
2012-09-07 10:51:49 -07:00
Andrew Hsieh
048569be54
Rename __dso_handle_so.c to __dso_handle_so.h
...
Also chang libc/arch-arm/bionic/crtbegin_so.c to include it
as a header.
Change-Id: Ib91b0b8caf5c8b936425aa8a4fc1a229b2b27929
2012-09-07 12:49:41 +08:00
Ian Rogers
973bf681b7
am 77039d34
: am e8f81547
: Merge "Fix build warning of initialization but no use."
...
* commit '77039d34449e369b9425a36eaed38d41b9d20884':
Fix build warning of initialization but no use.
2012-09-06 11:50:22 -07:00
Ian Rogers
77039d3444
am e8f81547
: Merge "Fix build warning of initialization but no use."
...
* commit 'e8f815473ba463b875cea757bc0a52fc32f10748':
Fix build warning of initialization but no use.
2012-09-06 11:45:54 -07:00
Ian Rogers
e8f815473b
Merge "Fix build warning of initialization but no use."
2012-09-06 11:41:52 -07:00
Elliott Hughes
1ad05db9ce
Add mlockall and munlockall for Google TV.
...
Change-Id: I10e961d701e74aab07211ec7975f61167e387853
2012-09-06 11:24:45 -07:00
Elliott Hughes
de0dc25112
am 41ff8b98
: am 6e3b0f2d
: Merge "Don\'t corrupt the thread list in static executables."
...
* commit '41ff8b98044de19d6ea5228452c2d555c4224da7':
Don't corrupt the thread list in static executables.
2012-09-06 10:44:13 -07:00
Elliott Hughes
41ff8b9804
am 6e3b0f2d
: Merge "Don\'t corrupt the thread list in static executables."
...
* commit '6e3b0f2d2e89a8f3bbfc5d26dcdc13233c1111ba':
Don't corrupt the thread list in static executables.
2012-09-06 10:40:43 -07:00
Elliott Hughes
6e3b0f2d2e
Merge "Don't corrupt the thread list in static executables."
2012-09-06 10:31:52 -07:00
Ian Rogers
09f76cdd9b
Fix build warning of initialization but no use.
...
first_run is only used with LOCK_AT_FORK, however, care needs to be
taken with the #if to avoid compiler warnings when LOCK_AT_FORK isn't
being used.
Change-Id: I6bcfac2ab8732c91607f4a1bcd7c0019f29c2eec
2012-09-06 09:59:13 -07:00
The Android Automerger
abce26b05a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-06 06:33:25 -07:00
Ajay Dudani
183d0a57a2
Update msm_ion.h ioctls so they dont conflict with ion.h
...
Change-Id: Ib6ffcc147e39b3f9f2eb9a8ed403b74d99bc755f
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-05 21:47:32 -07:00
Ajay Dudani
85811fc7c2
Revert "msm_ion: switch to using legacy_ion.h"
...
This reverts commit 66edcd9dad
.
2012-09-05 21:43:15 -07:00
Ajay Dudani
dc81b44759
Revert "add legacy_ion.h"
...
This reverts commit 5f1d206de3
.
2012-09-05 21:42:10 -07:00
Elliott Hughes
bfeab1bbe7
Don't corrupt the thread list in static executables.
...
Several previous changes conspired to make a mess of the thread list
in static binaries. This was most obvious when trying to call
pthread_key_delete(3) on the main thread.
Bug: http://code.google.com/p/android/issues/detail?id=36893
Change-Id: I2a2f553114d8fb40533c481252b410c10656da2e
2012-09-05 17:47:37 -07:00
Elliott Hughes
2da907059e
am 008f4df5
: am ff4608ae
: Merge "Add missing dependencies."
...
* commit '008f4df5ba52ff502651da957ad8dbe149ff2ed6':
Add missing dependencies.
2012-09-05 14:55:45 -07:00
Elliott Hughes
008f4df5ba
am ff4608ae
: Merge "Add missing dependencies."
...
* commit 'ff4608ae0cb78caa05b83e109fc2633682958089':
Add missing dependencies.
2012-09-05 14:51:30 -07:00
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
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
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
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
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
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