6837 Commits

Author SHA1 Message Date
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
299d25e07b DO NOT MERGE reset to goog/klp-volantis-dev 2013-12-09 14:09:59 -08: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
2c79b4f6ce snap to klp-dev-plus-aosp 3f69e99 with history 2013-12-06 13:40:37 -08: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
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
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
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
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
6fcdba7a12 am a98fff25: Merge "Make <sys/timerfd.h> standalone."
* commit 'a98fff25c33b2cb697c6bf75b3d17612427b6db3':
  Make <sys/timerfd.h> standalone.
2013-11-25 14:07:26 -08:00
Elliott Hughes
aee38bc05f am 5a52bd34: Merge "Regenerate the bionic kernel headers to match external/kernel-headers."
* commit '5a52bd34f1b7e49e28b31dd2c186de8bdef47451':
  Regenerate the bionic kernel headers to match external/kernel-headers.
2013-11-25 14:01:39 -08:00
Elliott Hughes
a98fff25c3 Merge "Make <sys/timerfd.h> standalone." 2013-11-25 22:00:10 +00:00
Elliott Hughes
e96d4bffe5 Make <sys/timerfd.h> standalone.
There's no uapi timerfd.h.

Bug: 11559337
Change-Id: I77a4b1365fdcf2c9f18673b11341a165e54b4bbd
2013-11-25 13:58:38 -08:00
Elliott Hughes
5a52bd34f1 Merge "Regenerate the bionic kernel headers to match external/kernel-headers." 2013-11-25 21:56:10 +00:00