Elliott Hughes
7bd0815371
Merge "Remove harmful attempts to be helpful in pthread_mutex functions."
2013-12-11 23:46:05 +00:00
Elliott Hughes
1a6aea8a05
am fcee65c4
: am 200fcb26
: am 73ef27cd
: Merge "Clarify a comment."
...
* commit 'fcee65c4c46481eb953bb3b3502a85a369c29fb4':
Clarify a comment.
2013-12-11 23:05:01 +00:00
Elliott Hughes
dff7203ee9
Remove harmful attempts to be helpful in pthread_mutex functions.
...
Most callers won't check for EINVAL, so it's best to fail early.
GCC takes the nonnull attribute as a guarantee that an argument
won't be NULL, so these hacks were already ineffective, which is
how we found that at least one commercial game was using NULL
as if it's a mutex, but actually getting no-op behavior.
Bug: 11971278
Change-Id: I89646e043d931778805a8b692e07a34d076ee6bf
2013-12-11 14:54:00 -08:00
Robert Greenwalt
feb8dbf3c2
am 7c2ada7f
: am f2e4f8fd
: am 2e359155
: Merge "Fix dns search domain use in gethostbyname."
...
* commit '7c2ada7f98ef640e4adeb7e03062bb2de0a96dd9':
Fix dns search domain use in gethostbyname.
2013-12-11 22:21:07 +00:00
Colin Cross
e3b7e3e6f0
am cee98638
: am f9599f30
: am a84f88f0
: Merge "bionic: move benchmarks out of tests directory"
...
* commit 'cee986385ffbd76eb546899ea5ba219971e70340':
bionic: move benchmarks out of tests directory
2013-12-11 22:21:06 +00:00
Elliott Hughes
fcee65c4c4
am 200fcb26
: am 73ef27cd
: Merge "Clarify a comment."
...
* commit '200fcb26d21dfd72a1e74de380313462356414ce':
Clarify a comment.
2013-12-11 22:12:11 +00:00
Robert Greenwalt
7c2ada7f98
am f2e4f8fd
: am 2e359155
: Merge "Fix dns search domain use in gethostbyname."
...
* commit 'f2e4f8fd6f9a7de6c98210f754c82ca694d0ef55':
Fix dns search domain use in gethostbyname.
2013-12-11 22:02:50 +00:00
Colin Cross
cee986385f
am f9599f30
: am a84f88f0
: Merge "bionic: move benchmarks out of tests directory"
...
* commit 'f9599f306adabad5409bd03788de6c339dbc0b1c':
bionic: move benchmarks out of tests directory
2013-12-11 22:02:49 +00:00
Elliott Hughes
200fcb26d2
am 73ef27cd
: Merge "Clarify a comment."
...
* commit '73ef27cd0de0c6b7d4f6bc9c2250dbae3f0a88c3':
Clarify a comment.
2013-12-11 14:01:22 -08:00
Elliott Hughes
73ef27cd0d
Merge "Clarify a comment."
2013-12-11 21:56:39 +00:00
Elliott Hughes
960ee37f2a
Clarify a comment.
...
Change-Id: Iad2e33fb059170f808023ce3d17e9b8c13191f42
2013-12-11 12:41:54 -08:00
Robert Greenwalt
f2e4f8fd6f
am 2e359155
: Merge "Fix dns search domain use in gethostbyname."
...
* commit '2e3591557f4a382e441ee2d60614d616b5acb434':
Fix dns search domain use in gethostbyname.
2013-12-11 11:38:22 -08:00
Robert Greenwalt
2e3591557f
Merge "Fix dns search domain use in gethostbyname."
2013-12-11 19:32:37 +00:00
Robert Greenwalt
c11f6f0f39
Fix dns search domain use in gethostbyname.
...
Need to load search domain data before we attempt to use it.
bug:6799630
Change-Id: Ib228f4ca260339f71a2e28d5930c0a722bd43c92
2013-12-11 11:30:09 -08:00
Colin Cross
f9599f306a
am a84f88f0
: Merge "bionic: move benchmarks out of tests directory"
...
* commit 'a84f88f0989e9446686ae76a53dc087ff5788fe6':
bionic: move benchmarks out of tests directory
2013-12-11 11:09:55 -08:00
Colin Cross
a84f88f098
Merge "bionic: move benchmarks out of tests directory"
2013-12-11 19:05:25 +00:00
Colin Cross
bd3efbc9b5
bionic: move benchmarks out of tests directory
...
Change-Id: I4d054965198af22c9a9c821d1bc53f4e9ea01248
2013-12-10 18:24:30 -08:00
Qiwen Zhao
5273f557de
am 299d25e0
: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
...
* commit '299d25e07b1ff58a7e90f9b46cd916ce337ca4ee':
2013-12-10 01:58:25 +00:00
Qiwen Zhao
299d25e07b
DO NOT MERGE reset to goog/klp-volantis-dev
2013-12-09 14:09:59 -08:00
Christopher Ferris
a0a8bb060c
am 381bf3f0
: am b3959928
: Merge "Do not clear tids on detached threads."
...
* commit '381bf3f06acef22fd90ac6aced8f0a25ee51f78b':
Do not clear tids on detached threads.
2013-12-09 18:34:28 +00:00
Christopher Ferris
381bf3f06a
am b3959928
: Merge "Do not clear tids on detached threads."
...
* commit 'b39599286d03db13f51a79e4cfe6644da0079f1a':
Do not clear tids on detached threads.
2013-12-09 10:28:13 -08:00
Christopher Ferris
b39599286d
Merge "Do not clear tids on detached threads."
2013-12-07 16:38:09 +00:00
Christopher Ferris
101fb7d963
Do not clear tids on detached threads.
...
Make sure that the kernel isn't going to try and clear the tid of
freed memory.
Bug: 11963327
Change-Id: I95d02340bfbe92f56036d2cc58dbf0e3079eb7c3
2013-12-06 23:00:44 -08:00
Qiwen Zhao
e09cc8cd82
am 2c79b4f6
: snap to klp-dev-plus-aosp 3f69e99
with history
...
* commit '2c79b4f6cec4c8d5976bf4d07e6b03c1ab303e2d':
2013-12-06 21:57:22 +00:00
Qiwen Zhao
2c79b4f6ce
snap to klp-dev-plus-aosp 3f69e99
with history
2013-12-06 13:40:37 -08:00
The Android Open Source Project
5511f5caea
am 3f69e994
: am 33771653
: Merge commit \'04b4339ad5396690329877df10fbe568bd4dd600\' into HEAD
...
* commit '3f69e994e4bfab24223f0323ad301f76956cd1c1':
2013-12-06 01:20:55 +00:00
The Android Open Source Project
3f69e994e4
am 33771653
: Merge commit \'04b4339ad5396690329877df10fbe568bd4dd600\' into HEAD
...
* commit '3377165387d455d4cb56807a9c02cd2ece6cb24b':
2013-12-05 17:10:26 -08:00
Elliott Hughes
dec84609b5
am cb0b46e1
: (-s ours) am c1772397
: am ff8dcd4a
: am c933493a
: Merge "Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols."
...
* commit 'cb0b46e13ef65304577eab8f8a201b78894eeb78':
2013-12-05 22:51:27 +00:00
Elliott Hughes
043e4c4d8c
am ad9742f8
: (-s ours) am 2a5d2e98
: am 9e9d1e01
: resolved conflicts for merge of 86125aca
to klp-dev
...
* commit 'ad9742f8890c18c6b7f4723139bf135713740877':
2013-12-05 22:50:01 +00:00
Elliott Hughes
12b2431f7b
am 0ee109a4
: (-s ours) am 598f3e9c
: Merge "resolved conflicts for merge of dce94165
to klp-dev-plus-aosp" into klp-dev-plus-aosp
...
* commit '0ee109a488e667fa038b3550c2441d35b46b3b8d':
2013-12-05 22:50:01 +00:00
Elliott Hughes
a19860fa38
am 456e415b
: (-s ours) am 14ec1b58
: am ceb670cf
: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/bionic into klp-dev
...
* commit '456e415b93d75233c1948a6398521128c2d5afef':
2013-12-05 22:50:00 +00:00
Christopher Ferris
3e0bbc4df6
am 7f52a466
: (-s ours) am a07a9556
: (-s ours) am 1036cd79
: am 6beb3ea6
: (-s ours) am d7d5049d
: (-s ours) am 632fd518
: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
...
* commit '7f52a46619d31e8acf19c1f270256de06efe1cf6':
2013-12-05 22:49:59 +00:00
Christopher Ferris
718cc2e088
am f759860c
: (-s ours) am 0a7e61d4
: (-s ours) am 5ec2ab68
: am 21b4ffa7
: (-s ours) am 5427eb5c
: (-s ours) am e2066293
: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
...
* commit 'f759860cd33db4acf4734fd71a0e7d4e25dc756b':
2013-12-05 22:49:58 +00:00
Christopher Ferris
19e57445d3
am e2fef1a7
: (-s ours) am 2e0a707f
: (-s ours) am 5427eb5c
: (-s ours) am e2066293
: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
...
* commit 'e2fef1a79983ca8ba3ece0943649da30a2ce525d':
2013-12-05 22:49:57 +00:00
Elliott Hughes
cb0b46e13e
am c1772397
: am ff8dcd4a
: am c933493a
: Merge "Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols."
...
* commit 'c1772397f96e82e142dd082da4747824e7c8a839':
Fix our missing abs/labs/llabs/imaxabs (and imaxdiv) symbols.
2013-12-05 21:28:03 +00:00
The Android Open Source Project
3377165387
Merge commit '04b4339ad5396690329877df10fbe568bd4dd600' into HEAD
2013-12-05 12:37:57 -08:00
Elliott Hughes
ad9742f889
am 2a5d2e98
: am 9e9d1e01
: resolved conflicts for merge of 86125aca
to klp-dev
...
* commit '2a5d2e98f9ffbddf37d8d57ed3028c3c8349e351':
2013-12-05 19:37:50 +00:00
Elliott Hughes
0ee109a488
am 598f3e9c
: Merge "resolved conflicts for merge of dce94165
to klp-dev-plus-aosp" into klp-dev-plus-aosp
...
* commit '598f3e9c4a48a4f4cbae6fb163f378d9fd1e6321':
2013-12-05 19:37:47 +00:00
Elliott Hughes
456e415b93
am 14ec1b58
: am ceb670cf
: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/bionic into klp-dev
...
* commit '14ec1b58869362f07ffdf7495cbba2f746da7b77':
2013-12-05 19:37:29 +00:00
Christopher Ferris
7f52a46619
am a07a9556
: (-s ours) am 1036cd79
: am 6beb3ea6
: (-s ours) am d7d5049d
: (-s ours) am 632fd518
: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
...
* commit 'a07a9556663db4dcf7924dd50a91dd6d5f3e266c':
2013-12-05 19:37:29 +00:00
Christopher Ferris
f759860cd3
am 0a7e61d4
: (-s ours) am 5ec2ab68
: am 21b4ffa7
: (-s ours) am 5427eb5c
: (-s ours) am e2066293
: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
...
* commit '0a7e61d4a1a28a7c66c05e0ef0b69c7c5b14a2d9':
2013-12-05 19:37:28 +00:00
Christopher Ferris
1d0d290c05
am d41e52a2
: (-s ours) am d7d5049d
: (-s ours) am 632fd518
: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"
...
* commit 'd41e52a238bdb91df5dffb81f202b3d50949bb9a':
2013-12-05 19:37:14 +00:00
Christopher Ferris
e2fef1a799
am 2e0a707f
: (-s ours) am 5427eb5c
: (-s ours) am e2066293
: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"
...
* commit '2e0a707f793a6831452aca9ed0021e90014f3635':
2013-12-05 19:37:13 +00:00
Christopher Ferris
fe3f0ccc84
am b679f654
: am 6afe8ab7
: Merge "Add strcmp/memcmp testing."
...
* commit 'b679f65420702554ae00dffb0e150ca75aeea989':
Add strcmp/memcmp testing.
2013-12-04 21:14:34 +00:00
Christopher Ferris
b679f65420
am 6afe8ab7
: Merge "Add strcmp/memcmp testing."
...
* commit '6afe8ab7533937c7444756ae72dda547b9849fe2':
Add strcmp/memcmp testing.
2013-12-04 13:05:14 -08:00
Christopher Ferris
6afe8ab753
Merge "Add strcmp/memcmp testing."
2013-12-04 19:08:16 +00:00
Christopher Ferris
e5bbb6b6ab
Add strcmp/memcmp testing.
...
Bug: 9797008
Change-Id: I11b1da060d29f7dacbb53f20a3e2082395b5bd8a
2013-12-03 18:42:41 -08:00
Christopher Ferris
9d5f2d72c9
am df4e7ad8
: am 0b4246b5
: Merge "Add cfi directives to all arm assembly."
...
* commit 'df4e7ad88fd3578fc12016f44c754298f5fbd8e8':
Add cfi directives to all arm assembly.
2013-12-03 20:42:00 +00:00
Christopher Ferris
df4e7ad88f
am 0b4246b5
: Merge "Add cfi directives to all arm assembly."
...
* commit '0b4246b561550252f51800d822ce9e03d9b5b033':
Add cfi directives to all arm assembly.
2013-12-03 12:35:44 -08:00
Christopher Ferris
0b4246b561
Merge "Add cfi directives to all arm assembly."
2013-12-03 20:28:09 +00:00