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
Christopher Ferris
ed45970ac5
Add cfi directives to all arm assembly.
...
Since the ENTRY/END macros now have .cfi_startproc/.cfi_endproc, most of the
custom arm assembly has no unwind information. Adding the proper cfi directives
for these and removing the arm directives.
Update the gensyscalls.py script to add these cfi directives for the generated
assembly. Also fix the references to non-uapi headers to the proper uapi
header.
In addition, remove the kill.S, tkill.S, tgkill.S for arm since they are not
needed at all. The unwinder (libunwind) is able to properly unwind using the
normal abort.
After this change, I can unwind through the system calls again.
Bug: 11559337
Bug: 11825869
Bug: 11321283
Change-Id: I18b48089ef2d000a67913ce6febc6544bbe934a3
2013-12-02 19:13:12 -08:00
Elliott Hughes
d1214a7ec5
am c566f35a
: am ab0b0cdf
: Merge "Finish <sys/user.h>."
...
* commit 'c566f35af462de45d119fb3b024e3db56d76927a':
Finish <sys/user.h>.
2013-11-27 16:55:35 +00:00
Elliott Hughes
867e25105d
am 3b9aba55
: am 98c910fb
: Merge "Fix the order of arguments to sys_clone for x86."
...
* commit '3b9aba55490ad4bc97c17c4a4e9acd51de1d8958':
Fix the order of arguments to sys_clone for x86.
2013-11-27 16:55:34 +00:00
Elliott Hughes
bef09fac15
am cb88d966
: am 6ae2f22d
: Merge "Work around CLONE_SETTLS being weird on x86."
...
* commit 'cb88d966b0b4c643ddd8c108f75478db7aa4f5f9':
Work around CLONE_SETTLS being weird on x86.
2013-11-27 16:55:34 +00:00
Elliott Hughes
15a7a13ecf
am a1d1a46e
: am 1c057607
: Merge "Fix _exit_with_stack_teardown for x86."
...
* commit 'a1d1a46ef635e559bbc4a4548ae28c84102d6f0b':
Fix _exit_with_stack_teardown for x86.
2013-11-27 16:55:34 +00:00
Elliott Hughes
c566f35af4
am ab0b0cdf
: Merge "Finish <sys/user.h>."
...
* commit 'ab0b0cdf1b07eb25ad89e0de08d4b3fd453602fe':
Finish <sys/user.h>.
2013-11-27 08:12:24 -08:00
Elliott Hughes
3b9aba5549
am 98c910fb
: Merge "Fix the order of arguments to sys_clone for x86."
...
* commit '98c910fb217a5c094e3101e57c52a618beaa23db':
Fix the order of arguments to sys_clone for x86.
2013-11-27 08:12:24 -08:00
Elliott Hughes
ab0b0cdf1b
Merge "Finish <sys/user.h>."
2013-11-27 04:51:35 +00:00
Elliott Hughes
ab797cb4fd
Finish <sys/user.h>.
...
Change-Id: I1d97d7fa3d5be2ff4728571ed5376705a27091ec
2013-11-26 17:57:31 -08:00
Elliott Hughes
98c910fb21
Merge "Fix the order of arguments to sys_clone for x86."
2013-11-27 00:34:44 +00:00
Elliott Hughes
99c393dff3
Fix the order of arguments to sys_clone for x86.
...
Unlike x86-64, x86's arguments are just like every other
architecture's.
Change-Id: Ic6da23f2a70599683b68e7e12ab9ba061e0b349c
2013-11-26 16:20:50 -08:00
Elliott Hughes
cb88d966b0
am 6ae2f22d
: Merge "Work around CLONE_SETTLS being weird on x86."
...
* commit '6ae2f22dc091844f2cf4a1de65d3ff6b225c2635':
Work around CLONE_SETTLS being weird on x86.
2013-11-26 14:44:12 -08:00
Elliott Hughes
6ae2f22dc0
Merge "Work around CLONE_SETTLS being weird on x86."
2013-11-26 22:36:38 +00:00
Elliott Hughes
a1d1a46ef6
am 1c057607
: Merge "Fix _exit_with_stack_teardown for x86."
...
* commit '1c057607d89229f5effaf1acf2ecde24ece41389':
Fix _exit_with_stack_teardown for x86.
2013-11-26 14:01:08 -08:00
Elliott Hughes
80906141f7
Work around CLONE_SETTLS being weird on x86.
...
Unlike other architectures, on x86 (but not x86-64), CLONE_SETTLS
takes a pointer to a struct user_desc instead of a pointer to the
TLS itself. Rather than have to deal with this here, let's just use
the old __set_tls mechanism we used to use (and still use for the
main thread on all architectures, so it's not going away any time
soon).
Bug: 11826724
Change-Id: I02a27939a73ae6cea1134a3f4c1dd7eafea479da
2013-11-26 13:57:21 -08:00
Elliott Hughes
1c057607d8
Merge "Fix _exit_with_stack_teardown for x86."
2013-11-26 21:51:48 +00:00
Elliott Hughes
9dec707bd6
Fix _exit_with_stack_teardown for x86.
...
Change-Id: Ife8f9c538c86f7c0017143015d5ee849a99b625b
2013-11-26 13:48:24 -08:00
Elliott Hughes
ca80f099a2
Merge "Regenerate the bionic headers to match external/kernel-headers."
2013-11-25 22:19:23 +00:00
Elliott Hughes
1c9d30540e
am 6fcdba7a
: am a98fff25
: Merge "Make <sys/timerfd.h> standalone."
...
* commit '6fcdba7a12eb1fdca200d725d09d27a69ee7b78a':
Make <sys/timerfd.h> standalone.
2013-11-25 14:09:32 -08:00