Dima Zavin
3fa6746536
Merge "add factory property file definition"
2013-02-12 18:33:26 +00:00
Elliott Hughes
bfa199ab40
am fcaf4e9f
: Merge "Revert "More pthreads cleanup.""
...
# Via Gerrit Code Review
* commit 'fcaf4e9f9b735e053469c7ecbf63584e10fd67a7':
Revert "More pthreads cleanup."
2013-02-11 22:16:56 -08:00
Elliott Hughes
fcaf4e9f9b
Merge "Revert "More pthreads cleanup.""
2013-02-12 06:07:32 +00:00
Elliott Hughes
6f94de3ca4
Revert "More pthreads cleanup."
...
This reverts commit 2a1bb4e646
Change-Id: Ia443d0748015c8e9fc3121e40e68258616767b51
2013-02-12 06:06:22 +00:00
Elliott Hughes
a2a9817f4c
am 85f491f9
: Merge "More pthreads cleanup."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '85f491f96da3b79d0d7cc5368bc1f649e1a82340':
More pthreads cleanup.
2013-02-11 18:35:56 -08:00
Elliott Hughes
85f491f96d
Merge "More pthreads cleanup."
2013-02-12 02:33:08 +00:00
Elliott Hughes
605cc29358
am 83bf28e6
: Merge "Fix MIPS build."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '83bf28e6a38dbf28707147b50d29e81f4b555046':
Fix MIPS build.
2013-02-11 18:19:34 -08:00
Elliott Hughes
83bf28e6a3
Merge "Fix MIPS build."
2013-02-12 02:08:05 +00:00
Elliott Hughes
ba342c11ad
Fix MIPS build.
...
Change-Id: I4863f21f3c2fd597ea36cb7096fc72db808643a3
2013-02-11 18:06:23 -08:00
Elliott Hughes
8e2b28cb6c
am c56be54a
: Merge "Use ENTRY/END in ARM __get_sp."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'c56be54a18eff7e1c35c9a19cfc8b84a80780b73':
Use ENTRY/END in ARM __get_sp.
2013-02-11 17:27:40 -08:00
Elliott Hughes
bdff26df27
Use ENTRY/END in custom x86 assembler too.
...
Change-Id: Ic2e482e5daff29c65d3b2ab0b2111c996bbc6226
2013-02-11 17:08:16 -08:00
Elliott Hughes
c56be54a18
Merge "Use ENTRY/END in ARM __get_sp."
2013-02-12 00:59:43 +00:00
Elliott Hughes
d7a3a403c1
Use ENTRY/END in ARM __get_sp.
...
Change-Id: If2f159b266f5fa4ad9d188a17d4cd318b605e446
2013-02-11 16:58:34 -08:00
Elliott Hughes
c440d24423
am cae7b2cf
: Merge "Fix __pthread_clone on ARM to set errno on failure."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'cae7b2cfb509e7d5d10a8085b1ec319daaef768f':
Fix __pthread_clone on ARM to set errno on failure.
2013-02-11 16:55:16 -08:00
Elliott Hughes
cae7b2cfb5
Merge "Fix __pthread_clone on ARM to set errno on failure."
2013-02-12 00:49:28 +00:00
Elliott Hughes
5e3fc43dde
Fix __pthread_clone on ARM to set errno on failure.
...
MIPS and x86 appear to have been correct already.
(Also fix unit tests that ASSERT_EQ with errno so that the
arguments are in the retarded junit order.)
Bug: 3461078
Change-Id: I2418ea98927b56e15b4ba9cfec97f5e7094c6291
2013-02-11 16:39:10 -08:00
Elliott Hughes
03798dd23c
am 1fea0f25
: Merge "Clean up ARM assembler files to use ENTRY/END."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '1fea0f258a45d918fe5ae8e9769f45c0348bd095':
Clean up ARM assembler files to use ENTRY/END.
2013-02-11 16:17:48 -08:00
Elliott Hughes
1fea0f258a
Merge "Clean up ARM assembler files to use ENTRY/END."
2013-02-12 00:05:27 +00:00
Elliott Hughes
f94fd3ccc6
Clean up ARM assembler files to use ENTRY/END.
...
We also don't need legacy syscall support (non-"swi 0").
Change-Id: Id1012e8ca18bf13f3f4e42200f39ba0e2e632cbf
2013-02-11 15:36:59 -08:00
Elliott Hughes
2a1bb4e646
More pthreads cleanup.
...
POSIX says pthread_create returns EAGAIN, not ENOMEM.
Also pull pthread_attr_t functions into their own file.
Also pull pthread_setname_np into its own file.
Also remove unnecessary #includes from pthread_key.cpp.
Also account for those pthread keys used internally by bionic,
so they don't count against the number of keys available to user
code. (They do with glibc, but glibc's limit is the much more
generous 1024.)
Also factor out the common errno-restoring idiom to reduce gotos.
Bug: 6702535
Change-Id: I555e66efffcf2c1b5a2873569e91489156efca42
2013-02-11 14:56:39 -08:00
Elliott Hughes
6b73d13fa4
am 2d3e7233
: Merge "Revert "Revert "Pull the pthread_key_t functions out of pthread.c."""
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '2d3e72336e76180fb00822386da4f14203d117ce':
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
2013-02-11 12:38:30 -08:00
Elliott Hughes
2d3e72336e
Merge "Revert "Revert "Pull the pthread_key_t functions out of pthread.c."""
2013-02-11 20:21:59 +00:00
Elliott Hughes
e4b08318c1
am 8397cdba
: Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""
...
# Via Gerrit Code Review
* commit '8397cdba9424febeaed4068829a5b0174ee1138c':
Revert "Pull the pthread_key_t functions out of pthread.c."
2013-02-11 12:21:50 -08:00
Elliott Hughes
44b53ad681
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
...
This reverts commit 6260553d48
(Removing the accidental libm/Android.mk change.)
Change-Id: I6cddd9857c31facc05636e8221505b3d2344cb75
2013-02-11 12:20:33 -08:00
Elliott Hughes
8397cdba94
Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""
2013-02-11 20:18:28 +00:00
Elliott Hughes
6260553d48
Revert "Pull the pthread_key_t functions out of pthread.c."
...
This reverts commit ad59322ae4
somehow my unfinished libm/Android.mk change got into here.
Change-Id: I46be626c5269d60fb1ced9862f2ebaa380b4e0af
2013-02-11 20:18:16 +00:00
Elliott Hughes
024246ec27
am 09e89c3c
: Merge "Pull the pthread_key_t functions out of pthread.c."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '09e89c3ced51d846e13c2508fbb6812bb61475cd':
Pull the pthread_key_t functions out of pthread.c.
2013-02-11 12:05:45 -08:00
Elliott Hughes
09e89c3ced
Merge "Pull the pthread_key_t functions out of pthread.c."
2013-02-11 20:02:29 +00:00
Elliott Hughes
ad59322ae4
Pull the pthread_key_t functions out of pthread.c.
...
This was originally motivated by noticing that we were setting the
wrong bits for the well-known tls entries. That was a harmless bug
because none of the well-known tls entries has a destructor, but
it's best not to leave land mines lying around.
Also add some missing POSIX constants, a new test, and fix
pthread_key_create's return value when we hit the limit.
Change-Id: Ife26ea2f4b40865308e8410ec803b20bcc3e0ed1
2013-02-11 12:00:48 -08:00
Elliott Hughes
8f509e8be1
am 9a9bb243
: Merge "Switch to using AT_RANDOM for the stack guards."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '9a9bb243b50be5e3910b8edad72327bc216e72d0':
Switch to using AT_RANDOM for the stack guards.
2013-02-08 11:22:05 -08:00
Elliott Hughes
9a9bb243b5
Merge "Switch to using AT_RANDOM for the stack guards."
2013-02-08 19:17:33 +00:00
Elliott Hughes
d3920b3a99
Switch to using AT_RANDOM for the stack guards.
...
Bug: 7959813
Change-Id: I8db4b8912ba649bfe668c6f22aa44690ddd401a2
2013-02-08 11:16:13 -08:00
Elliott Hughes
636d21f32b
am 03579da2
: Merge "Add a few more missing libm long double stubs."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '03579da2d91a57a0f22da14e4216ecaf811869f4':
Add a few more missing libm long double stubs.
2013-02-07 18:15:06 -08:00
Elliott Hughes
03579da2d9
Merge "Add a few more missing libm long double stubs."
2013-02-08 02:02:39 +00:00
Elliott Hughes
170dbe25d6
Add a few more missing libm long double stubs.
...
Change-Id: I6c44b9f3eee730253a958d6cefdac99e6f79da3e
2013-02-07 17:45:11 -08:00
Nick Kralevich
f156b901b1
am fa75fce5
: Merge "update xattr.h"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'fa75fce56641255a571b8b472f010863c3095b70':
update xattr.h
2013-02-07 16:50:08 -08:00
Nick Kralevich
fa75fce566
Merge "update xattr.h"
2013-02-08 00:42:29 +00:00
Nick Kralevich
b184d3ba33
update xattr.h
...
Change-Id: Ibd91167ba56e2692359b92fe3108da271f0c2e38
2013-02-07 16:23:16 -08:00
Elliott Hughes
86e4e23408
am 964886af
: Merge "Remove dead code from gensyscalls.py."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '964886afa339959aedad1c09af738df4ffa4091d':
Remove dead code from gensyscalls.py.
2013-02-07 14:57:41 -08:00
Elliott Hughes
964886afa3
Merge "Remove dead code from gensyscalls.py."
2013-02-07 22:17:55 +00:00
Elliott Hughes
cd6780b167
Remove dead code from gensyscalls.py.
...
Change-Id: I0df69f8fd990f829ccbfcd5123c17b523d5a4d45
2013-02-07 14:07:00 -08:00
Elliott Hughes
5bb67760f0
am f6afd3b6
: Merge "Fix x86 build, remove void* arithmetic."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f6afd3b670e23f56bf341d12136416aee17ea249':
Fix x86 build, remove void* arithmetic.
2013-02-07 12:34:24 -08:00
Elliott Hughes
8ddef40dad
am 59e9a496
: Merge "__progname should be const char*, not char*."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '59e9a496b4341fd2b11d4a01544bf7edf3d00cc5':
__progname should be const char*, not char*.
2013-02-07 12:34:23 -08:00
Elliott Hughes
f6afd3b670
Merge "Fix x86 build, remove void* arithmetic."
2013-02-07 20:27:40 +00:00
Elliott Hughes
59e9a496b4
Merge "__progname should be const char*, not char*."
2013-02-07 20:16:32 +00:00
Elliott Hughes
646e058136
Fix x86 build, remove void* arithmetic.
...
Change-Id: Idc7f14af2e094ac33de315e808176237af063bb8
2013-02-07 12:16:10 -08:00
Elliott Hughes
e4ccf5a138
__progname should be const char*, not char*.
...
Change-Id: I8e846872c30a712fbc05c8da59ffa1cec1be31a4
2013-02-07 12:06:44 -08:00
Elliott Hughes
6f67cd224e
am 2f41531f
: Merge "Clean up the argc/argv/envp/auxv handling."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '2f41531ff9f48dbdaf2ba711e14c669031728e99':
Clean up the argc/argv/envp/auxv handling.
2013-02-07 11:56:57 -08:00
Elliott Hughes
2f41531ff9
Merge "Clean up the argc/argv/envp/auxv handling."
2013-02-07 19:48:17 +00:00
Elliott Hughes
42b2c6a5ee
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 11:44:21 -08:00