Elliott Hughes
50b79530c6
Merge "Fix unwinding through x86-64 __bionic_clone."
2014-06-05 23:38:19 +00:00
Elliott Hughes
aeb3016f81
Fix unwinding through x86-64 __bionic_clone.
...
x86-64 needs these CFI directives to stop unwinding here.
I've also cleaned up the assembler a little, and made x86 and x86-64
a little more alike.
Bug: 15195760
Change-Id: I40f92c007843c29c933bb6876fe2b4611e1b946b
2014-06-05 16:36:06 -07:00
Dan Albert
c99f9845fb
am 802d4cab
: am 9c101eb9
: Merge "Removes index() from bionic."
...
* commit '802d4cabf37fc0008db3d7d265e18a0b6112ddb6':
Removes index() from bionic.
2014-06-05 21:56:44 +00:00
Dan Albert
802d4cabf3
am 9c101eb9
: Merge "Removes index() from bionic."
...
* commit '9c101eb9d12a87c9b68fce9052751df75e36d172':
Removes index() from bionic.
2014-06-05 21:53:30 +00:00
Dan Albert
9c101eb9d1
Merge "Removes index() from bionic."
2014-06-05 21:34:49 +00:00
Christopher Ferris
72240e7b62
am 675a41f5
: am 8ac8278b
: Merge "Fix for slm-tuned memmove (both 32- and 64-bit)."
...
* commit '675a41f56eb65b91d8f3c39304869b6ae64fa983':
Fix for slm-tuned memmove (both 32- and 64-bit).
2014-06-05 18:33:26 +00:00
Dan Albert
48089efd92
am a66c43ea
: am 431aa4dc
: Merge "Remove bsd_signal and sysv_signal from bionic LP64."
...
* commit 'a66c43eab073aae5e1e5754c476a5c39ece6930b':
Remove bsd_signal and sysv_signal from bionic LP64.
2014-06-05 18:33:26 +00:00
Christopher Ferris
675a41f56e
am 8ac8278b
: Merge "Fix for slm-tuned memmove (both 32- and 64-bit)."
...
* commit '8ac8278b0a673e30698ba4d81f495165b66acbd5':
Fix for slm-tuned memmove (both 32- and 64-bit).
2014-06-05 18:29:19 +00:00
Dan Albert
a66c43eab0
am 431aa4dc
: Merge "Remove bsd_signal and sysv_signal from bionic LP64."
...
* commit '431aa4dc9282e23231ba9243f43fd3d49b5f88b3':
Remove bsd_signal and sysv_signal from bionic LP64.
2014-06-05 18:29:18 +00:00
Christopher Ferris
8ac8278b0a
Merge "Fix for slm-tuned memmove (both 32- and 64-bit)."
2014-06-05 18:10:59 +00:00
Varvara Rainchik
fce861498c
Fix for slm-tuned memmove (both 32- and 64-bit).
...
Introduce a test for memmove that catches a fault.
Fix both 32- and 64-bit versions of slm-tuned memmove.
Change-Id: Ib416def2610a0972e32c3b9b6055b54967643dc3
Signed-off-by: Varvara Rainchik <varvara.rainchik@intel.com>
2014-06-05 11:08:09 -07:00
Dan Albert
40fca0f08b
Removes index() from bionic.
...
This function has been removed from POSIX.
Unfortunately, we can't leave #define index(a, b) strchr((a), (b)) in its place
because defining a preprocessor macro for index() breaks a whole lot of code.
Bug: 13935372
Change-Id: Ifda348acde06da61c12e7ee2f8fe6950a3174dd1
2014-06-05 11:05:10 -07:00
Dan Albert
431aa4dc92
Merge "Remove bsd_signal and sysv_signal from bionic LP64."
2014-06-05 18:03:45 +00:00
Dan Albert
205dd7d9b3
Remove bsd_signal and sysv_signal from bionic LP64.
...
bsd_signal was removed in POSIX 2008, sysv_signal was never POSIX.
Bug: 13935372
Change-Id: I7688e5cc317247ff075dcf99b598f515fb4f15c4
2014-06-05 08:21:17 -07:00
Elliott Hughes
a6bd78a30a
am 3cd4b783
: am 8aabecf3
: Merge "Hide __libc_fini."
...
* commit '3cd4b783fb7b0c0172934faef21792356fdf3385':
Hide __libc_fini.
2014-06-05 09:47:59 +00:00
Elliott Hughes
3cd4b783fb
am 8aabecf3
: Merge "Hide __libc_fini."
...
* commit '8aabecf35c71a8255db259cba01005eea10485cf':
Hide __libc_fini.
2014-06-05 03:51:24 +00:00
Elliott Hughes
8aabecf35c
Merge "Hide __libc_fini."
2014-06-05 03:24:25 +00:00
Dan Albert
6d9b463b72
am 60d57baf
: am 76812041
: Merge "Revert "Remove ftime from bionic LP64""
...
* commit '60d57baf5718f5d18dff4059b2f59f9d9b63dc0a':
Revert "Remove ftime from bionic LP64"
2014-06-05 01:08:52 +00:00
Dan Albert
60d57baf57
am 76812041
: Merge "Revert "Remove ftime from bionic LP64""
...
* commit '768120416ba465b8dcac21737f7d4451df962406':
Revert "Remove ftime from bionic LP64"
2014-06-05 01:06:30 +00:00
Dan Albert
768120416b
Merge "Revert "Remove ftime from bionic LP64""
2014-06-05 00:50:56 +00:00
Dan Albert
0921204660
Revert "Remove ftime from bionic LP64"
...
Breaking some build... will look in to it later.
This reverts commit 26d6799bbe
.
Change-Id: I35fa770221be3a181bd37c6c3dce1bf37a69a4a1
2014-06-05 00:50:43 +00:00
Dan Albert
8e89ed2e87
am 3d7fd883
: am 428581fb
: Merge "Remove ftime from bionic LP64"
...
* commit '3d7fd8836474497e2745e98df30e0fea6f4d4723':
Remove ftime from bionic LP64
2014-06-05 00:01:53 +00:00
Dan Albert
3d7fd88364
am 428581fb
: Merge "Remove ftime from bionic LP64"
...
* commit '428581fb4532d4369aece3e42906e27e634af050':
Remove ftime from bionic LP64
2014-06-04 23:58:35 +00:00
Dan Albert
428581fb45
Merge "Remove ftime from bionic LP64"
2014-06-04 23:42:27 +00:00
Elliott Hughes
31fee71b43
am a4edb723
: am 37229f2a
: Merge "Temporarily expose dlmalloc_usable_size."
...
* commit 'a4edb7235084cdf62149310fcb1653596f680948':
Temporarily expose dlmalloc_usable_size.
2014-06-04 23:33:02 +00:00
Elliott Hughes
1f29665f15
Hide __libc_fini.
...
Bug: 11156955
Change-Id: Id5af3540c6ec4d9ef969d62a230144fe8bb76b0b
2014-06-04 16:29:37 -07:00
Elliott Hughes
a4edb72350
am 37229f2a
: Merge "Temporarily expose dlmalloc_usable_size."
...
* commit '37229f2a9271b6e0d0d1ec516421018b807f00e8':
Temporarily expose dlmalloc_usable_size.
2014-06-04 23:29:31 +00:00
Dan Albert
26d6799bbe
Remove ftime from bionic LP64
...
Bug: 13935372
Change-Id: I5dd31147143b23a090a3b75b846dc5354e599121
2014-06-04 16:25:24 -07:00
Elliott Hughes
67c437b231
Revert "Temporarily expose dlmalloc_usable_size."
...
This reverts commit 6403cc4870
.
Change-Id: Id1ce4088be1e6c83271c6317eb3e5f7fc11c7b95
2014-06-04 23:14:48 +00:00
Elliott Hughes
37229f2a92
Merge "Temporarily expose dlmalloc_usable_size."
2014-06-04 23:11:06 +00:00
Elliott Hughes
6403cc4870
Temporarily expose dlmalloc_usable_size.
...
Bug: 15425694
Change-Id: I47e1ca598817359260c372fec8072e76886054f0
2014-06-04 16:08:17 -07:00
Elliott Hughes
c5a17834c4
am 02255f26
: am 53e3bbab
: Merge "Temporary fix for asan_malloc_linux.cc build failure."
...
* commit '02255f267448f88f16f3ddeaf5c701ab01a17c4b':
Temporary fix for asan_malloc_linux.cc build failure.
2014-06-04 22:39:38 +00:00
Elliott Hughes
02255f2674
am 53e3bbab
: Merge "Temporary fix for asan_malloc_linux.cc build failure."
...
* commit '53e3bbab07f8d410418f87007177d5ad81e38bcf':
Temporary fix for asan_malloc_linux.cc build failure.
2014-06-04 22:35:28 +00:00
Elliott Hughes
53e3bbab07
Merge "Temporary fix for asan_malloc_linux.cc build failure."
2014-06-04 22:21:13 +00:00
Elliott Hughes
14442bb229
Temporary fix for asan_malloc_linux.cc build failure.
...
Bug: 15432753
Change-Id: I02a3a2c826e6d01e6809c51588a9670dcd179123
2014-06-04 15:20:46 -07:00
Elliott Hughes
aca22284fc
am b27cb268
: am 38732aa9
: Merge "Fix debug malloc."
...
* commit 'b27cb268c0c1424c71d64b8a713983257d4de7ee':
Fix debug malloc.
2014-06-04 21:49:25 +00:00
Elliott Hughes
b27cb268c0
am 38732aa9
: Merge "Fix debug malloc."
...
* commit '38732aa9ea28b54d55c46b6b1f9367cb8fa147f1':
Fix debug malloc.
2014-06-04 21:44:20 +00:00
Dan Albert
ab86296461
am ea5c19c4
: am 623dce3b
: Merge "Removes wcswcs from bionic for LP64."
...
* commit 'ea5c19c4cf82eb97a0ee90d6e9c7dfe0c709e2fb':
Removes wcswcs from bionic for LP64.
2014-06-04 21:33:35 +00:00
Dan Albert
ea5c19c4cf
am 623dce3b
: Merge "Removes wcswcs from bionic for LP64."
...
* commit '623dce3bd43975ca5b8698955a9fd8f18e9d5963':
Removes wcswcs from bionic for LP64.
2014-06-04 21:29:25 +00:00
Elliott Hughes
38732aa9ea
Merge "Fix debug malloc."
2014-06-04 21:10:55 +00:00
Elliott Hughes
8e52e8fe83
Fix debug malloc.
...
Previously the dynamically-loaded part of the debug malloc implementation
wanted to access hidden symbols in libc itself.
Bug: 15426546
Change-Id: I6a366ef626854d1af1d705ca24842817b1c02a19
2014-06-04 14:08:20 -07:00
Dan Albert
623dce3bd4
Merge "Removes wcswcs from bionic for LP64."
2014-06-04 20:59:10 +00:00
Dan Albert
001f8f041b
Removes wcswcs from bionic for LP64.
...
Bug: 13935372
Change-Id: I0deb15e769da4fa81bb65a87f3c86db5163a5796
2014-06-04 12:01:56 -07:00
Elliott Hughes
441216a28c
am 430cf1a6
: (-s ours) DO NOT MERGE fdprintf backward compatibility shim.
...
* commit '430cf1a6c32471ada4dad028acbfcc032da01fd3':
DO NOT MERGE fdprintf backward compatibility shim.
2014-06-04 18:43:41 +00:00
Elliott Hughes
9100b11973
am 4832a096
: (-s ours) DO NOT MERGE Fix lmp-preview-dev after bionic merge.
...
* commit '4832a0961dc891ef69177c9cf0c3e3ba5dd7b69d':
DO NOT MERGE Fix lmp-preview-dev after bionic merge.
2014-06-04 18:43:41 +00:00
Christopher Ferris
88848df902
am 81b20406
: Merge remote-tracking branch \'goog/master\' into merge
...
* commit '81b2040683415845efa2694671c3ed212137051d':
2014-06-04 18:43:40 +00:00
Elliott Hughes
5406127ca0
am 8c5d3170
: am e120cba3
: Merge "Cherrypick upstream OpenBSD\'s vfwprintf.c revision 1.11."
...
* commit '8c5d3170411e00c8f0cc126d84e4b08e6a1223d1':
Cherrypick upstream OpenBSD's vfwprintf.c revision 1.11.
2014-06-04 17:32:11 +00:00
Dan Albert
bb87e9a823
am 4855a97e
: am 452e0913
: Merge "Adds functionality specified by uchar.h"
...
* commit '4855a97ed06500de7515e2984d9f44cae7bf756a':
Adds functionality specified by uchar.h
2014-06-04 17:32:11 +00:00
Elliott Hughes
8c5d317041
am e120cba3
: Merge "Cherrypick upstream OpenBSD\'s vfwprintf.c revision 1.11."
...
* commit 'e120cba31df5249b720579312e799bd1c65f8e3d':
Cherrypick upstream OpenBSD's vfwprintf.c revision 1.11.
2014-06-04 17:28:48 +00:00
Dan Albert
4855a97ed0
am 452e0913
: Merge "Adds functionality specified by uchar.h"
...
* commit '452e09130010b641904e7411e0c539590a654022':
Adds functionality specified by uchar.h
2014-06-04 17:28:46 +00:00