Elliott Hughes
8ca1da6e71
resolved conflicts for merge of 62727429
to master
...
Change-Id: I8a3d167f3ef279a7c46cb8fb90c9477beff84d8e
2013-02-13 13:51:54 -08:00
Elliott Hughes
627274292e
Merge "Update getnameinfo.c, remove dead code, and fix error reporting."
2013-02-13 21:15:05 +00:00
Elliott Hughes
d8213bb573
Update getnameinfo.c, remove dead code, and fix error reporting.
...
Also add a unit test for the salen size checking.
Bug: 1889275
Change-Id: I8ec4107df9e2e9a8571e8915525249c6e44b98ad
2013-02-13 13:11:11 -08:00
Elliott Hughes
6aca0ce367
am f659b3c9
: Merge "Add a test that getaddrinfo works when hints are NULL."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f659b3c90d8b55a44945af807364a5df0475bd0e':
Add a test that getaddrinfo works when hints are NULL.
2013-02-13 09:18:45 -08:00
Elliott Hughes
f659b3c90d
Merge "Add a test that getaddrinfo works when hints are NULL."
2013-02-13 17:04:01 +00:00
Elliott Hughes
d3b9d11369
Add a test that getaddrinfo works when hints are NULL.
...
Bug: 1827911
Change-Id: I9e1b774c44c10a8c5391bcf3baf1607f50eaf214
2013-02-13 08:22:07 -08:00
Elliott Hughes
2db16ea38e
am 3002d64b
: Merge "Everyone has a TLS register."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '3002d64bcd4644456803dd0547d20b39e14be02c':
Everyone has a TLS register.
2013-02-13 08:11:24 -08:00
Elliott Hughes
32a2340067
am 9cbe1e63
: Merge "Fix __pthread_clone and __bionic_clone error handling on x86."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '9cbe1e63ddf8b61b8ded3d357a30c3d6ed67906f':
Fix __pthread_clone and __bionic_clone error handling on x86.
2013-02-13 08:11:23 -08:00
Elliott Hughes
3002d64bcd
Merge "Everyone has a TLS register."
2013-02-13 16:03:32 +00:00
Elliott Hughes
9cbe1e63dd
Merge "Fix __pthread_clone and __bionic_clone error handling on x86."
2013-02-13 16:02:10 +00:00
The Android Automerger
d41c26e2d8
merge in jb-mr2-release history after reset to master
2013-02-13 05:55:21 -08:00
Elliott Hughes
b6032515a0
Fix __pthread_clone and __bionic_clone error handling on x86.
...
Bug: 3461078
Change-Id: I93c151e27411211dd32717f206745c62c08c21ee
2013-02-12 23:02:33 -08:00
Elliott Hughes
91a9925998
Everyone has a TLS register.
...
Change-Id: Id7cdf67087aa7d5074c9c59b7e595bc391d9f146
2013-02-12 21:56:42 -08:00
Elliott Hughes
a244e4eb61
am baf2c09f
: Merge "Put the right number of Ls after 64-bit constants."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'baf2c09f3f47a35b195eb83cc7acffeaf4b6d4e9':
Put the right number of Ls after 64-bit constants.
2013-02-12 20:38:05 -08:00
Elliott Hughes
baf2c09f3f
Merge "Put the right number of Ls after 64-bit constants."
2013-02-13 04:20:43 +00:00
Elliott Hughes
5227663d2f
Put the right number of Ls after 64-bit constants.
...
Change-Id: I9f96259f21e42a84b9ebe20655fe0edb31f41892
2013-02-12 20:18:49 -08:00
Elliott Hughes
761b344bff
am 59aeff94
: Merge "Use ENTRY/END in custom x86 assembler too."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '59aeff94178e03c908791695f6dd4c9bd8c7115b':
Use ENTRY/END in custom x86 assembler too.
2013-02-12 20:17:26 -08:00
Elliott Hughes
59aeff9417
Merge "Use ENTRY/END in custom x86 assembler too."
2013-02-13 04:01:01 +00:00
Elliott Hughes
bc35693e6b
am 07f7e62a
: Merge "Clean up pthread_create."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '07f7e62a259d13208d6186670d3748e339690127':
Clean up pthread_create.
2013-02-12 18:20:10 -08:00
Elliott Hughes
d8ceaf5afa
am 899d6528
: Merge "Give up trying to build the pthread_setname_np tests for glibc."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '899d65283db0c78537ed27aa3a6c019000ec05da':
Give up trying to build the pthread_setname_np tests for glibc.
2013-02-12 18:20:09 -08:00
Elliott Hughes
07f7e62a25
Merge "Clean up pthread_create."
2013-02-13 01:56:46 +00:00
Elliott Hughes
899d65283d
Merge "Give up trying to build the pthread_setname_np tests for glibc."
2013-02-13 01:56:07 +00:00
Elliott Hughes
9701d4b701
Give up trying to build the pthread_setname_np tests for glibc.
...
Looks like using /usr/bin/g++ isn't enough on some of our older
build servers.
Change-Id: Id7681fb164eb6324b10050f6bb237393e95b41e9
2013-02-12 17:55:22 -08:00
Elliott Hughes
4b4a882428
Clean up pthread_create.
...
Bug: 3461078
Change-Id: I082122a86d7692cd58f4145539241be026258ee0
2013-02-12 17:15:59 -08:00
Elliott Hughes
dde1d876b1
am 991ee7d8
: Merge "Simplify pthread_create, using more public API."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '991ee7d89574e8d04c8863a2850613073a2f96b3':
Simplify pthread_create, using more public API.
2013-02-12 16:52:26 -08:00
Elliott Hughes
991ee7d895
Merge "Simplify pthread_create, using more public API."
2013-02-13 00:39:41 +00:00
Elliott Hughes
6d33918207
Simplify pthread_create, using more public API.
...
Change-Id: I08e65ba88ed01436223e4e528631c9e41ec0e7f4
2013-02-12 16:36:04 -08:00
Elliott Hughes
f4e258c22e
am 4912782c
: Merge "Really set errno if __pthread_clone fails."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '4912782c6af7169686acc9553fb0bb33251b0d0d':
Really set errno if __pthread_clone fails.
2013-02-12 16:23:25 -08:00
Elliott Hughes
78715fca0b
am 558a8b1d
: Merge "Revert "Revert "More pthreads cleanup."""
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '558a8b1d3b31300941af78232f2f7f4cb4e933b9':
Revert "Revert "More pthreads cleanup.""
2013-02-12 16:23:24 -08:00
Elliott Hughes
4912782c6a
Merge "Really set errno if __pthread_clone fails."
2013-02-13 00:12:42 +00:00
Elliott Hughes
9f878c2fca
Really set errno if __pthread_clone fails.
...
If r0 == 0, we're the child. If r0 > 0, we're the parent.
Otherwise set errno.
The __bionic_clone code I copy & pasted was wrong. This patch
fixes both.
Bug: 3461078
Change-Id: Ibb7d6cc7e54e666841f2f0dc59a141a0b31982e4
2013-02-12 16:07:06 -08:00
Elliott Hughes
558a8b1d3b
Merge "Revert "Revert "More pthreads cleanup."""
2013-02-13 00:05:24 +00:00
Elliott Hughes
3e898476c7
Revert "Revert "More pthreads cleanup.""
...
This reverts commit 6f94de3ca4
(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 15:27:18 -08:00
Dima Zavin
ac480b422a
am 3fa67465
: Merge "add factory property file definition"
...
# By Andrew Boie
# Via Andrew Boie (1) and Gerrit Code Review (1)
* commit '3fa67465365baf87f751bea09847e32f01005788':
add factory property file definition
2013-02-12 11:12:49 -08:00
Dima Zavin
3fa6746536
Merge "add factory property file definition"
2013-02-12 18:33:26 +00:00
The Android Automerger
1bb43b02ad
merge in jb-mr2-release history after reset to master
2013-02-12 07:10:11 -08:00
Elliott Hughes
191f880bdf
am bfa199ab
: am fcaf4e9f
: Merge "Revert "More pthreads cleanup.""
...
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'bfa199ab4019a7de9b95cd3db86c4d7176438803':
Revert "More pthreads cleanup."
2013-02-11 22:20:39 -08: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
23731e841a
am a2a9817f
: am 85f491f9
: Merge "More pthreads cleanup."
...
# Via Android Git Automerger (1) and others
* commit 'a2a9817f4c08d1f56d90f02ed13f531e8093f8e8':
More pthreads cleanup.
2013-02-11 18:39:32 -08: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
13478d856a
am 605cc293
: am 83bf28e6
: Merge "Fix MIPS build."
...
# Via Android Git Automerger (1) and others
* commit '605cc29358c9a6d575d097fd4b78a483c9dbf89e':
Fix MIPS build.
2013-02-11 18:23:17 -08: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
0f6882f43d
am 8e2b28cb
: am c56be54a
: Merge "Use ENTRY/END in ARM __get_sp."
...
# Via Android Git Automerger (1) and others
* commit '8e2b28cb6c16d8a5671ccb333965bb56b2990d7a':
Use ENTRY/END in ARM __get_sp.
2013-02-11 18:15:13 -08:00
Elliott Hughes
a2b8b833d2
am c440d244
: am cae7b2cf
: Merge "Fix __pthread_clone on ARM to set errno on failure."
...
# Via Android Git Automerger (1) and others
* commit 'c440d2442361b78196d2935469ecf78d5c3470e5':
Fix __pthread_clone on ARM to set errno on failure.
2013-02-11 18:15:07 -08:00
Elliott Hughes
b940711587
am 03798dd2
: am 1fea0f25
: Merge "Clean up ARM assembler files to use ENTRY/END."
...
# Via Android Git Automerger (1) and others
* commit '03798dd23cd3d1dc1ee4c4b0472c75369aa1e10f':
Clean up ARM assembler files to use ENTRY/END.
2013-02-11 18:15:04 -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