Elliott Hughes
b0cd876974
am 5065eef8
: am 6a44d227
: Merge "Take some fixed upstream copyright headers and regenerate NOTICE."
...
* commit '5065eef801aa78a8a64a016fcf644a6ca91a8133':
Take some fixed upstream copyright headers and regenerate NOTICE.
2013-06-12 16:23:33 -07:00
Elliott Hughes
5065eef801
am 6a44d227
: Merge "Take some fixed upstream copyright headers and regenerate NOTICE."
...
* commit '6a44d2271f372d0c65b05a5d3377bd00ce92824e':
Take some fixed upstream copyright headers and regenerate NOTICE.
2013-06-12 16:16:09 -07:00
Elliott Hughes
6a44d2271f
Merge "Take some fixed upstream copyright headers and regenerate NOTICE."
2013-06-12 23:13:34 +00:00
Elliott Hughes
3267163200
am 5f4d2df2
: am 55189a0f
: Merge "Switch to current upstream stdio makebuf.c and setvbuf.c."
...
* commit '5f4d2df2fcddfe62f9e08d1607a8c4e029f01b3d':
Switch to current upstream stdio makebuf.c and setvbuf.c.
2013-06-12 16:03:49 -07:00
Elliott Hughes
2815b1dd45
Take some fixed upstream copyright headers and regenerate NOTICE.
...
Change-Id: Ifff41d69c13322dbc6f928ce7d4c65f76fe36772
2013-06-12 16:00:41 -07:00
Elliott Hughes
5f4d2df2fc
am 55189a0f
: Merge "Switch to current upstream stdio makebuf.c and setvbuf.c."
...
* commit '55189a0fbd26cfd84939d9d3a42a1800a63bd2c5':
Switch to current upstream stdio makebuf.c and setvbuf.c.
2013-06-12 15:58:41 -07:00
Elliott Hughes
55189a0fbd
Merge "Switch to current upstream stdio makebuf.c and setvbuf.c."
2013-06-12 22:56:20 +00:00
Elliott Hughes
460b70d063
am dc5f5f85
: am f1867d47
: Merge "Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work.""
...
* commit 'dc5f5f857c7bf218d33212044539eb73b3fab5f1':
Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work."
2013-06-12 15:26:46 -07:00
Elliott Hughes
677ee56477
Switch to current upstream stdio makebuf.c and setvbuf.c.
...
Change-Id: I4761b5e94459815520f01062eef39abf62af621f
2013-06-12 15:24:15 -07:00
Elliott Hughes
dc5f5f857c
am f1867d47
: Merge "Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work.""
...
* commit 'f1867d47cbce4225d712a2684da67031f7350909':
Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work."
2013-06-12 15:22:04 -07:00
Elliott Hughes
f1867d47cb
Merge "Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work.""
2013-06-12 22:19:03 +00:00
Elliott Hughes
9248d3a58c
Revert "Add SIZE_MAX to <stdint.h> in a way that might actually work."
...
This reverts commit d8627af159
which caused build breakage:
In file included from bionic/libc/include/limits.h:86:0,
from bionic/libc/include/stdint.h:33,
from bionic/libc/arch-arm/bionic/crtbegin.c:31:
bionic/libc/include/sys/limits.h:30:26: fatal error: linux/limits.h: No such file or directory
compilation terminated.
make: *** [out/target/product/generic/obj/lib/crtbegin_dynamic1.o] Error 1
Change-Id: I128095ecb99df92626e1f57e34c61e08c98a4078
2013-06-12 22:18:47 +00:00
Elliott Hughes
7e06ab5655
am b0a2262c
: am 55c5ec64
: Merge "Add SIZE_MAX to <stdint.h> in a way that might actually work."
...
* commit 'b0a2262c3f91085e79c3fd491379e45821254427':
Add SIZE_MAX to <stdint.h> in a way that might actually work.
2013-06-12 15:11:12 -07:00
Elliott Hughes
b0a2262c3f
am 55c5ec64
: Merge "Add SIZE_MAX to <stdint.h> in a way that might actually work."
...
* commit '55c5ec64bd26d92bd1882a9a4c91445de73ebfa2':
Add SIZE_MAX to <stdint.h> in a way that might actually work.
2013-06-12 15:06:51 -07:00
Elliott Hughes
55c5ec64bd
Merge "Add SIZE_MAX to <stdint.h> in a way that might actually work."
2013-06-12 22:05:10 +00:00
Elliott Hughes
7ac852fb05
am 3da47942
: am 944ea1a3
: Merge "Clean up abort."
...
* commit '3da47942d3fdeb6f39cf84b03c75cfeb69f91449':
Clean up abort.
2013-06-12 15:02:34 -07:00
Elliott Hughes
3da47942d3
am 944ea1a3
: Merge "Clean up abort."
...
* commit '944ea1a32018c44d6cb55c9454e670b0e152da6d':
Clean up abort.
2013-06-12 14:58:32 -07:00
Elliott Hughes
d8627af159
Add SIZE_MAX to <stdint.h> in a way that might actually work.
...
Take two.
Change-Id: I7d08b6d14c82a171312a7f5898270b4441d5cfa2
2013-06-12 14:54:16 -07:00
Elliott Hughes
944ea1a320
Merge "Clean up abort."
2013-06-12 21:53:58 +00:00
Elliott Hughes
61e699a133
Clean up abort.
...
* A dlmalloc usage error shouldn't call abort(3) because we want to
cause a SIGSEGV by writing the address dlmalloc didn't like to an
address the kernel won't like, so that debuggerd will dump the
memory around the address that upset dlmalloc.
* Switch to the simpler FreeBSD/NetBSD style of registering stdio
cleanup. Hopefully this will let us simplify more of the stdio
implementation.
* Clear the stdio cleanup handler before we abort because of a dlmalloc
corruption error. This fixes the reported bug, where we'd hang inside
dlmalloc because the stdio cleanup reentered dlmalloc.
Bug: 9301265
Change-Id: Ief31b389455d6876e5a68f0f5429567d37277dbc
2013-06-12 14:14:53 -07:00
Elliott Hughes
1e88a7abca
am 834f83de
: am 5cde15eb
: Merge "<stdint.h> should expose SIZE_MAX."
...
* commit '834f83de3f3363090385963eef1cd9a053a51a71':
<stdint.h> should expose SIZE_MAX.
2013-06-12 11:05:18 -07:00
Elliott Hughes
834f83de3f
am 5cde15eb
: Merge "<stdint.h> should expose SIZE_MAX."
...
* commit '5cde15eb17f4ddc0949c0cbd38a46e6c0bad7019':
<stdint.h> should expose SIZE_MAX.
2013-06-12 10:58:23 -07:00
Elliott Hughes
5cde15eb17
Merge "<stdint.h> should expose SIZE_MAX."
2013-06-12 17:56:24 +00:00
Elliott Hughes
2c157aec9b
<stdint.h> should expose SIZE_MAX.
...
Change-Id: Id27222c24955c83f29ad953933cbdc48b6f1e900
2013-06-12 10:28:26 -07:00
The Android Automerger
2df16acc42
merge in master-release history after reset to master
2013-06-12 07:49:39 -07:00
Nick Kralevich
6d88e4e96b
am 26cc1d68
: am b6e88020
: Merge "fix unittests."
...
* commit '26cc1d6838c0c4fd18abbf6ea5a38d24aea93893':
fix unittests.
2013-06-11 16:03:32 -07:00
Nick Kralevich
26cc1d6838
am b6e88020
: Merge "fix unittests."
...
* commit 'b6e880200d1690c00cb843e59c6849a275dbfbb7':
fix unittests.
2013-06-11 15:56:42 -07:00
Nick Kralevich
b6e880200d
Merge "fix unittests."
2013-06-11 22:52:54 +00:00
Nick Kralevich
fd0325bd98
fix unittests.
...
7e6ce1a3c5
fixed abort() to raise
SIGABRT rather than causing SIGSEGV. However, the unittests were
not updated.
Fix unittests.
Change-Id: I73db194127b9b9e9440358aa94273863765a736b
2013-06-11 15:45:23 -07:00
The Android Automerger
4a0c222bb1
merge in master-release history after reset to master
2013-06-11 07:49:16 -07:00
Ben Cheng
d20a04c5cf
am 77f90de7
: am fc104f89
: Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
...
* commit '77f90de728b9fa60b83b7f12a45c1113f3189cb2':
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
2013-06-10 17:28:46 -07:00
Ben Cheng
77f90de728
am fc104f89
: Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
...
* commit 'fc104f899d47916f76c91127caf9aeaf7b69d4ef':
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
2013-06-10 17:25:31 -07:00
Ben Cheng
fc104f899d
Merge "Fix abort(3) to raise SIGABRT rather than causing SIGSEGV."
2013-06-11 00:22:14 +00:00
Ben Cheng
7e6ce1a3c5
Fix abort(3) to raise SIGABRT rather than causing SIGSEGV.
...
tgkill() needs the .save stack unwinding directive to get the complete
stack trace.
BUG: https://code.google.com/p/android/issues/detail?id=16672
Change-Id: Ifb447dca2147a592c48baf32769dfc175d8aea72
2013-06-10 17:17:46 -07:00
Brian Carlstrom
b181747aa1
am d978d21d
: am 8252b8e4
: Merge "Honor p_vaddr if set"
...
* commit 'd978d21d195976fa3f257b8d17ec2fe18fb436a7':
Honor p_vaddr if set
2013-06-10 15:44:13 -07:00
Brian Carlstrom
d978d21d19
am 8252b8e4
: Merge "Honor p_vaddr if set"
...
* commit '8252b8e4b730b13623f31dc66396e000586d1c58':
Honor p_vaddr if set
2013-06-10 15:41:19 -07:00
Brian Carlstrom
8252b8e4b7
Merge "Honor p_vaddr if set"
2013-06-10 22:39:07 +00:00
Geremy Condra
72254952e1
Merge "Add clearing of resolv uid and pid interface maps"
2013-06-10 18:45:01 +00:00
The Android Automerger
5074892e0a
merge in master-release history after reset to master
2013-06-10 09:52:26 -07:00
Elliott Hughes
efc78bbb9f
am 6bcf71c9
: am 2fbc9dda
: Merge "bionic/x86: Optimization for string routines"
...
* commit '6bcf71c9ac8395038ca243160d4367759be8dd80':
bionic/x86: Optimization for string routines
2013-06-07 17:52:16 -07:00
Elliott Hughes
1b14c72420
am fc6f5a08
: am 157c4299
: Merge "Revert "libc x86: Remove strcat.S""
...
* commit 'fc6f5a086557f81fce2542b7015268bff697d10c':
Revert "libc x86: Remove strcat.S"
2013-06-07 17:48:53 -07:00
Elliott Hughes
6bcf71c9ac
am 2fbc9dda
: Merge "bionic/x86: Optimization for string routines"
...
* commit '2fbc9dda345486005569be4ec586c6aae9d51650':
bionic/x86: Optimization for string routines
2013-06-07 17:47:33 -07:00
Elliott Hughes
2fbc9dda34
Merge "bionic/x86: Optimization for string routines"
2013-06-08 00:45:07 +00:00
Elliott Hughes
fc6f5a0865
am 157c4299
: Merge "Revert "libc x86: Remove strcat.S""
...
* commit '157c42997b7aa31b36cca63ad03dbb5a601ce347':
Revert "libc x86: Remove strcat.S"
2013-06-07 17:44:20 -07:00
Elliott Hughes
157c42997b
Merge "Revert "libc x86: Remove strcat.S""
2013-06-08 00:42:44 +00:00
Elliott Hughes
06708df6fb
Revert "libc x86: Remove strcat.S"
...
This reverts commit 4fe461b3a6
Change-Id: Ibeb76e24f054abd7c96ad6899366c2f9bfc2a5ad
2013-06-08 00:42:35 +00:00
Christopher Ferris
b3a7db2dc2
am 83245ba4
: am 9647f797
: Merge "Implement malloc_usable_size for debug impls."
...
* commit '83245ba45facf0caff3beb18a27e6604df9094ba':
Implement malloc_usable_size for debug impls.
2013-06-07 17:36:50 -07:00
Christopher Ferris
83245ba45f
am 9647f797
: Merge "Implement malloc_usable_size for debug impls."
...
* commit '9647f797d59222cd91507d4554bf62166ba88e0a':
Implement malloc_usable_size for debug impls.
2013-06-07 15:16:30 -07:00
Christopher Ferris
9647f797d5
Merge "Implement malloc_usable_size for debug impls."
2013-06-07 22:15:33 +00:00
Christopher Ferris
885f3b9cad
Implement malloc_usable_size for debug impls.
...
- Implemented chk_memalign.
- Fixed a few bugs in leak_memalign.
- Implemented {leak,fill,check,qemu}_malloc_usable_size.
- Make malloc_usable_size update at run time.
- Add malloc_test.cpp as a small set of tests for the
malloc debug routines.
- Fix the qemu routines since it's been broken since it moved to C++.
- Add support for the %u format to the out_vformat in libc_logging.cpp.
This is used by the emulator code.
Tested using the bionic-unit-tests with setprop libc.debug.malloc
set to 1, 5, and 10.
I tested as much as possible on the emulator, but tracing doesn't appear
to be working properly.
Bug: 6143477
Merge change from internal master.
(cherry-picked from commit 3d594c2580
)
Change-Id: I4ae00fffba82315a8c283f35893fd554460722fb
2013-06-07 14:55:32 -07:00