OSDN Git Service
Dan Albert [Wed, 22 Oct 2014 13:18:33 +0000 (13:18 +0000)]
am
f2aacebf: am
ad136624: Merge "Never use ASAN."
* commit '
f2aacebf551da2b8d828f0618c84ac544e1398fb':
Never use ASAN.
Dan Albert [Tue, 21 Oct 2014 21:33:59 +0000 (21:33 +0000)]
am
ad136624: Merge "Never use ASAN."
* commit '
ad136624b2bed5b6971cd7ba372969b1b352c223':
Never use ASAN.
Dan Albert [Tue, 21 Oct 2014 18:28:18 +0000 (18:28 +0000)]
Merge "Never use ASAN."
Dan Albert [Fri, 17 Oct 2014 17:33:25 +0000 (10:33 -0700)]
Never use ASAN.
Unless we completely redo how we build bionic (so that the object
files for libc.so get built separately from libc.a), we can't enable
ASAN here, as libc.a gets linked into static executables.
Change-Id: I2ce4f51248bd51c4213a555ff481b6faabbf53f8
Hans Boehm [Mon, 20 Oct 2014 23:41:37 +0000 (23:41 +0000)]
am
361282af: am
c712ceee: Make memory_order_acquire visible in global namespace
* commit '
361282afd81e6259fa8a62ab46b83da8b50249fe':
Make memory_order_acquire visible in global namespace
Hans Boehm [Mon, 20 Oct 2014 23:36:11 +0000 (23:36 +0000)]
am
c712ceee: Make memory_order_acquire visible in global namespace
* commit '
c712ceeec4c15da8488c5ce143fcc6b0a02d74f3':
Make memory_order_acquire visible in global namespace
Christopher Ferris [Mon, 20 Oct 2014 18:44:47 +0000 (18:44 +0000)]
am
941ee802: am
8f41d3d3: Merge "Fix generic __memcpy_chk implementation."
* commit '
941ee80292cfdbf95a30da82f7be2e662d1f269e':
Fix generic __memcpy_chk implementation.
Hans Boehm [Wed, 1 Oct 2014 01:31:04 +0000 (18:31 -0700)]
Make memory_order_acquire visible in global namespace
We were missing that using directive when including <atomic>.
Bug:
17736764
Change-Id: Ie8ca92a952749415567bcd5fa21d56629a364660
(cherry picked from commit
76ac4d0853c3bba0c65edc98a9cdf932c452e252)
Christopher Ferris [Mon, 20 Oct 2014 18:38:43 +0000 (18:38 +0000)]
am
8f41d3d3: Merge "Fix generic __memcpy_chk implementation."
* commit '
8f41d3d3bc7cf2375e5dd9202da619fd67a5928f':
Fix generic __memcpy_chk implementation.
Christopher Ferris [Mon, 20 Oct 2014 18:21:21 +0000 (18:21 +0000)]
Merge "Fix generic __memcpy_chk implementation."
Chih-Hung Hsieh [Mon, 20 Oct 2014 17:04:30 +0000 (17:04 +0000)]
am
2c87eba8: am
9a740482: Merge "Add -no-integrated-as at local level."
* commit '
2c87eba8693c1c7cd03e9b90f686a1415fb2d9c0':
Add -no-integrated-as at local level.
Chih-Hung Hsieh [Mon, 20 Oct 2014 17:01:48 +0000 (17:01 +0000)]
am
9a740482: Merge "Add -no-integrated-as at local level."
* commit '
9a7404824b3dfaad6ba14a41aab5f14132392a92':
Add -no-integrated-as at local level.
Chih-Hung Hsieh [Mon, 20 Oct 2014 16:51:05 +0000 (16:51 +0000)]
Merge "Add -no-integrated-as at local level."
Chih-Hung Hsieh [Fri, 17 Oct 2014 23:27:03 +0000 (16:27 -0700)]
Add -no-integrated-as at local level.
Later we will enable integrated-as as default at the global level.
BUG:
17820427
BUG:
17302991
Change-Id: I233204ca04d7222b2cb1fbd0fa48a482f8b63f6f
Christopher Ferris [Fri, 17 Oct 2014 21:08:54 +0000 (14:08 -0700)]
Fix generic __memcpy_chk implementation.
- Clean up the labels (add .L to make them local).
- Change to using cfi directives.
- Fix unwinding of the __memcpy_chk fail path.
Bug:
18033671
Change-Id: I12845f10c7ce5e6699c15c558bda64c83f6a392a
Dmitriy Ivanov [Fri, 17 Oct 2014 21:28:44 +0000 (21:28 +0000)]
am
68c41a89: am
dec4de45: Merge "Correct way to specify additional dependencies"
* commit '
68c41a890dc2d0d95fc1569ffb2e4bcecd603432':
Correct way to specify additional dependencies
Dmitriy Ivanov [Fri, 17 Oct 2014 20:34:39 +0000 (20:34 +0000)]
am
dec4de45: Merge "Correct way to specify additional dependencies"
* commit '
dec4de456c046881fb1e8c7c7d0c27a11ef09eb7':
Correct way to specify additional dependencies
Dmitriy Ivanov [Fri, 17 Oct 2014 20:19:18 +0000 (20:19 +0000)]
Merge "Correct way to specify additional dependencies"
Dmitriy Ivanov [Fri, 17 Oct 2014 18:47:18 +0000 (11:47 -0700)]
Correct way to specify additional dependencies
Previous one was not covering all the targets
Bug:
17548097
Change-Id: I425e0f8d6e5a43feabd29dcb327049b82754d249
Dmitriy Ivanov [Thu, 16 Oct 2014 18:08:45 +0000 (18:08 +0000)]
am
d7407db0: am
5281e1fb: Merge "Fix misleading comment."
* commit '
d7407db08f528a5c0ccc96314eeced3e46a34f9d':
Fix misleading comment.
Dmitriy Ivanov [Thu, 16 Oct 2014 18:03:07 +0000 (18:03 +0000)]
am
5281e1fb: Merge "Fix misleading comment."
* commit '
5281e1fb15632c8dc714d10abc6cd1a22a061782':
Fix misleading comment.
Dmitriy Ivanov [Thu, 16 Oct 2014 17:54:02 +0000 (17:54 +0000)]
Merge "Fix misleading comment."
Dan Albert [Thu, 16 Oct 2014 16:32:21 +0000 (16:32 +0000)]
am
34de37e5: am
90aa7e37: Merge "Only use <atomic> for C++11 and newer."
* commit '
34de37e553d83fb4522c1458bf82d8e8aee4c2bb':
Only use <atomic> for C++11 and newer.
Dan Albert [Thu, 16 Oct 2014 16:27:27 +0000 (16:27 +0000)]
am
90aa7e37: Merge "Only use <atomic> for C++11 and newer."
* commit '
90aa7e374f9000577cde64c4fb88c5dab8dac62e':
Only use <atomic> for C++11 and newer.
Dan Albert [Thu, 16 Oct 2014 16:19:43 +0000 (16:19 +0000)]
Merge "Only use <atomic> for C++11 and newer."
Dan Albert [Thu, 16 Oct 2014 16:10:05 +0000 (16:10 +0000)]
am
574284db: am
8bb12127: Merge "Don\'t use an STL for libm."
* commit '
574284dbf27a58cb4c4be97a0a8a09f56fe65f52':
Don't use an STL for libm.
Dan Albert [Thu, 16 Oct 2014 16:06:10 +0000 (16:06 +0000)]
am
8bb12127: Merge "Don\'t use an STL for libm."
* commit '
8bb12127e62c1fc4d9dc99ce9272008023c7c08e':
Don't use an STL for libm.
Dan Albert [Thu, 16 Oct 2014 15:56:31 +0000 (15:56 +0000)]
Merge "Don't use an STL for libm."
Dan Albert [Thu, 16 Oct 2014 14:52:51 +0000 (07:52 -0700)]
Only use <atomic> for C++11 and newer.
Any pre-C++11 clients of stdatomic.h that use libc++ are being forced
over to <atomic>, which they don't have the language support to use.
Change-Id: I62445c1f2541410a1569498c09433c7196635537
Dan Albert [Thu, 16 Oct 2014 14:44:47 +0000 (07:44 -0700)]
Don't use an STL for libm.
The default is none right now, but this will be needed when the
default becomes libc++.
Change-Id: Ib022adac2b9dc08fbfae830908128043cfffb91e
Dmitriy Ivanov [Thu, 16 Oct 2014 00:07:20 +0000 (00:07 +0000)]
am
ab3f96cb: am
f5e02582: Merge "Ignore DT_BIND_NOW (0x18)"
* commit '
ab3f96cb20084cf5a9aa299a508be8c462dc9308':
Ignore DT_BIND_NOW (0x18)
Dmitriy Ivanov [Wed, 15 Oct 2014 23:57:28 +0000 (23:57 +0000)]
am
f5e02582: Merge "Ignore DT_BIND_NOW (0x18)"
* commit '
f5e0258268b45faa4d84de34047660061720abc7':
Ignore DT_BIND_NOW (0x18)
Dmitriy Ivanov [Wed, 15 Oct 2014 23:46:26 +0000 (23:46 +0000)]
Merge "Ignore DT_BIND_NOW (0x18)"
Dmitriy Ivanov [Wed, 15 Oct 2014 21:59:01 +0000 (14:59 -0700)]
Ignore DT_BIND_NOW (0x18)
Bug:
17552334
Change-Id: Ibe93fd3d6580f369f9a6ef8d235bf0df00fe7607
Robert Grosse [Wed, 15 Oct 2014 21:32:19 +0000 (14:32 -0700)]
Fix misleading comment.
Change-Id: I9e2aa6c2ba938c8f8d7c74eba32d313c866c77b2
Dan Albert [Wed, 15 Oct 2014 20:16:18 +0000 (20:16 +0000)]
am
21df7992: am
71cbcdcf: Merge "We don\'t actually need all of libc++ here."
* commit '
21df799218eb39dd66ccdf92045a885fff5eb14e':
We don't actually need all of libc++ here.
Dan Albert [Wed, 15 Oct 2014 20:10:08 +0000 (20:10 +0000)]
am
71cbcdcf: Merge "We don\'t actually need all of libc++ here."
* commit '
71cbcdcf947835076241b9dd72099f28997eb290':
We don't actually need all of libc++ here.
Dan Albert [Wed, 15 Oct 2014 19:59:08 +0000 (19:59 +0000)]
Merge "We don't actually need all of libc++ here."
Dan Albert [Tue, 14 Oct 2014 21:19:34 +0000 (14:19 -0700)]
We don't actually need all of libc++ here.
All we're actually interested in is the unwinder. Since that's now a
separate library, just use that.
Change-Id: If86071a0d850da961336a58147b70369ace7bd12
Elliott Hughes [Tue, 14 Oct 2014 03:58:49 +0000 (03:58 +0000)]
am
a7995f31: am
97df16ba: Merge "Add clock_settime and clock_nanosleep."
* commit '
a7995f31e2e584e4df8cbdb543e7e0c6535506cf':
Add clock_settime and clock_nanosleep.
Elliott Hughes [Tue, 14 Oct 2014 03:25:51 +0000 (03:25 +0000)]
am
97df16ba: Merge "Add clock_settime and clock_nanosleep."
* commit '
97df16ba5c2911e06d1211781a5724706abd227b':
Add clock_settime and clock_nanosleep.
Elliott Hughes [Tue, 14 Oct 2014 03:07:42 +0000 (03:07 +0000)]
Merge "Add clock_settime and clock_nanosleep."
Haruki Hasegawa [Sun, 12 Oct 2014 15:50:47 +0000 (00:50 +0900)]
Add clock_settime and clock_nanosleep.
Add the missing prototypes, fix the existing prototypes to use clockid_t
rather than int, fix clock_nanosleep's failure behavior, and add simple
tests.
Bug:
17644443
Bug: https://code.google.com/p/android/issues/detail?id=77372
Change-Id: I03fba369939403918abcabae9551a7123953d780
Signed-off-by: Haruki Hasegawa <h6a.h4i.0@gmail.com>
Dmitriy Ivanov [Mon, 13 Oct 2014 22:25:15 +0000 (22:25 +0000)]
am
a9223e74: am
c2297050: Merge "Add glibc alias for NT_PRFPREG"
* commit '
a9223e74d0ca22587e6a5535c9c2b1c8c044a0bb':
Add glibc alias for NT_PRFPREG
Christopher Ferris [Mon, 13 Oct 2014 22:25:13 +0000 (22:25 +0000)]
am
f7c3db67: am
083769a3: Merge "Return total footprint, not high water mark."
* commit '
f7c3db67a172a103ce9fa85733738c20770e551a':
Return total footprint, not high water mark.
Dan Albert [Mon, 13 Oct 2014 22:25:13 +0000 (22:25 +0000)]
am
a6ef2e28: am
94571f9a: Merge "Use LOCAL_CXX_STL to select libc++_static."
* commit '
a6ef2e2819bb930b212a492b4f2245d10fd4fc8f':
Use LOCAL_CXX_STL to select libc++_static.
Dmitriy Ivanov [Mon, 13 Oct 2014 22:19:46 +0000 (22:19 +0000)]
am
c2297050: Merge "Add glibc alias for NT_PRFPREG"
* commit '
c229705051c8b6a06ad81c221ca74ef9aa743e13':
Add glibc alias for NT_PRFPREG
Christopher Ferris [Mon, 13 Oct 2014 22:15:58 +0000 (22:15 +0000)]
am
083769a3: Merge "Return total footprint, not high water mark."
* commit '
083769a3dffabfb968a03a700b9f2fd7838bcf75':
Return total footprint, not high water mark.
Dan Albert [Mon, 13 Oct 2014 22:15:54 +0000 (22:15 +0000)]
am
94571f9a: Merge "Use LOCAL_CXX_STL to select libc++_static."
* commit '
94571f9ade03cfe24bff1bddc4d6c1a320b39b8e':
Use LOCAL_CXX_STL to select libc++_static.
Dmitriy Ivanov [Mon, 13 Oct 2014 22:08:51 +0000 (22:08 +0000)]
Merge "Add glibc alias for NT_PRFPREG"
Dmitriy Ivanov [Mon, 13 Oct 2014 19:23:55 +0000 (12:23 -0700)]
Add glibc alias for NT_PRFPREG
Also fix comment style for DF_1_ constants
Change-Id: I7c3ed1d834f0a2b85ee8cc8016c79020955084f8
Christopher Ferris [Mon, 13 Oct 2014 19:48:35 +0000 (19:48 +0000)]
Merge "Return total footprint, not high water mark."
Christopher Ferris [Mon, 13 Oct 2014 19:46:50 +0000 (19:46 +0000)]
am
93e474ef: am
59a02860: Merge "Return total footprint, not high water mark." into lmp-mr1-dev
* commit '
93e474ef5485c0628c358351d3cc6e4938294beb':
Return total footprint, not high water mark.
Christopher Ferris [Fri, 10 Oct 2014 15:40:21 +0000 (08:40 -0700)]
Return total footprint, not high water mark.
The mallinfo usmblks value returned by dlmalloc is a little misleading.
It's not the current max, it's the historical high water mark. This
leads to dumpsys meminfo producing native memory numbers that don't add up.
Change this to the real total footprint, not this high water mark.
Bug:
17265653
(cherry pick from commit
f4ada9c9ce31c7e56146a4cb703747385bc043a5)
Change-Id: I2fba10285859dccfe8331063c9be14cc169f2d91
Christopher Ferris [Mon, 13 Oct 2014 19:44:19 +0000 (19:44 +0000)]
am
59a02860: Merge "Return total footprint, not high water mark." into lmp-mr1-dev
* commit '
59a02860a455af68d501ee847889620343dcfb0d':
Return total footprint, not high water mark.
Christopher Ferris [Mon, 13 Oct 2014 19:36:56 +0000 (19:36 +0000)]
Merge "Return total footprint, not high water mark." into lmp-mr1-dev
Christopher Ferris [Fri, 10 Oct 2014 15:40:21 +0000 (08:40 -0700)]
Return total footprint, not high water mark.
The mallinfo usmblks value returned by dlmalloc is a little misleading.
It's not the current max, it's the historical high water mark. This
leads to dumpsys meminfo producing native memory numbers that don't add up.
Change this to the real total footprint, not this high water mark.
Bug:
17265653
Change-Id: Id0293a1b50c9b0be8795405049f537a51ab0e8b7
Dan Albert [Mon, 13 Oct 2014 19:08:59 +0000 (19:08 +0000)]
Merge "Use LOCAL_CXX_STL to select libc++_static."
Dan Albert [Mon, 13 Oct 2014 18:20:29 +0000 (11:20 -0700)]
Use LOCAL_CXX_STL to select libc++_static.
Directly adding the library to LOCAL_STATIC_LIBRARIES thwarts a few
build system checks.
Change-Id: Ib23c43badfa85de21c691f79ccdcc2cbe2a89b33
Dan Albert [Sat, 11 Oct 2014 01:04:07 +0000 (01:04 +0000)]
am
7bdab15e: am
4c086247: Merge "Fix some formatting so GitHub displays it nicely."
* commit '
7bdab15e7b3d67dd97b94097c8974b4b85bed7e9':
Fix some formatting so GitHub displays it nicely.
Dan Albert [Sat, 11 Oct 2014 00:58:12 +0000 (00:58 +0000)]
am
4c086247: Merge "Fix some formatting so GitHub displays it nicely."
* commit '
4c0862474e63b09c901d11de47a318ce73a0c686':
Fix some formatting so GitHub displays it nicely.
Dan Albert [Sat, 11 Oct 2014 00:48:32 +0000 (00:48 +0000)]
Merge "Fix some formatting so GitHub displays it nicely."
Dan Albert [Sat, 11 Oct 2014 00:14:37 +0000 (17:14 -0700)]
Fix some formatting so GitHub displays it nicely.
Change-Id: Id6ce9a61bebd98544c85e5780147715c73d0e78b
Dan Albert [Fri, 10 Oct 2014 23:07:31 +0000 (23:07 +0000)]
am
3a05a8b1: am
8c3901b2: Merge "Improve documentation for testing and coverage."
* commit '
3a05a8b150a1bae663831a5cee54b5c0c1130303':
Improve documentation for testing and coverage.
Dan Albert [Fri, 10 Oct 2014 23:02:57 +0000 (23:02 +0000)]
am
8c3901b2: Merge "Improve documentation for testing and coverage."
* commit '
8c3901b2999e6821b8ee984193352ba45b003492':
Improve documentation for testing and coverage.
Christopher Ferris [Fri, 10 Oct 2014 22:08:04 +0000 (22:08 +0000)]
am
50f76f37: am
e0fafb01: am
c891e240: Add back symbols to fix Greed for Glory franchise.
* commit '
50f76f375b67756f0c31afcc83ed9a98e1810b24':
Add back symbols to fix Greed for Glory franchise.
Elliott Hughes [Fri, 10 Oct 2014 22:07:56 +0000 (22:07 +0000)]
am
9a6d0fa1: am
2f25cf37: Fix pthread_attr_getstack under valgrind.
* commit '
9a6d0fa1c18bf66611c46942edf2a3e8a6acda8a':
Fix pthread_attr_getstack under valgrind.
Elliott Hughes [Fri, 10 Oct 2014 22:07:54 +0000 (22:07 +0000)]
am
227faaed: am
2698f9ef: Merge "Catch up on upstream\'s round/roundf/roundl."
* commit '
227faaedd575561b2a598de6d9d614420b0894b7':
Catch up on upstream's round/roundf/roundl.
Christopher Ferris [Fri, 10 Oct 2014 21:02:28 +0000 (21:02 +0000)]
am
e0fafb01: am
c891e240: Add back symbols to fix Greed for Glory franchise.
* commit '
e0fafb019e33374fae3fa5dc3473e921566b5991':
Add back symbols to fix Greed for Glory franchise.
Christopher Ferris [Fri, 10 Oct 2014 20:47:00 +0000 (20:47 +0000)]
am
c891e240: Add back symbols to fix Greed for Glory franchise.
* commit '
c891e24073830e07ba7373dee554ff2c70e1d313':
Add back symbols to fix Greed for Glory franchise.
Dan Albert [Fri, 10 Oct 2014 18:59:02 +0000 (18:59 +0000)]
Merge "Improve documentation for testing and coverage."
Dan Albert [Fri, 10 Oct 2014 05:57:49 +0000 (22:57 -0700)]
Improve documentation for testing and coverage.
Also rename HACKING.txt to README.md so it will display on the GitHub
mirror.
Change-Id: I70157a4ad262700212bf9afd87253d195c7013a9
Elliott Hughes [Fri, 10 Oct 2014 18:44:54 +0000 (18:44 +0000)]
am
2f25cf37: Fix pthread_attr_getstack under valgrind.
* commit '
2f25cf373ca7c875956a7c06483b30d381296817':
Fix pthread_attr_getstack under valgrind.
Christopher Ferris [Fri, 10 Oct 2014 18:42:29 +0000 (18:42 +0000)]
am
2df4673e: resolved conflicts for merge of
7f4618cb to lmp-mr1-dev-plus-aosp
* commit '
2df4673edd837e06fb8ae8ec7dd3fdb7a779cfc8':
Re-add dlmalloc for 32 bit.
Elliott Hughes [Thu, 9 Oct 2014 21:01:47 +0000 (14:01 -0700)]
Fix pthread_attr_getstack under valgrind.
valgrind seems to mess with the stack enough that the kernel will
report "[stack:pid]" rather than "[stack]" in /proc/self/maps, so
switch to the task-specific file instead to force "[stack]". (There
are two conditions in the kernel code that decides which form to
output.)
Bug:
17897476
(cherry picked from commit
9afb2f2106a5d659854c175c574c1c31e0e205a2)
Change-Id: I92c331ef6fb5868af49e75bc595710d290a95f5b
Elliott Hughes [Fri, 10 Oct 2014 17:41:11 +0000 (17:41 +0000)]
am
2698f9ef: Merge "Catch up on upstream\'s round/roundf/roundl."
* commit '
2698f9ef8412011295702cd6df4b66e01cf6c220':
Catch up on upstream's round/roundf/roundl.
Elliott Hughes [Fri, 10 Oct 2014 17:29:51 +0000 (17:29 +0000)]
Merge "Catch up on upstream's round/roundf/roundl."
Elliott Hughes [Fri, 10 Oct 2014 17:21:43 +0000 (10:21 -0700)]
Catch up on upstream's round/roundf/roundl.
Not sure how we missed these, but better late than never...
Change-Id: Ib08d1bb6e340a1907cbeb1cbe220e33f70642bdc
Christopher Ferris [Fri, 10 Oct 2014 17:05:38 +0000 (10:05 -0700)]
resolved conflicts for merge of
7f4618cb to lmp-mr1-dev-plus-aosp
Change-Id: I9b65f8287a4f155f26ae7e217e9553a3aaf22240
Christopher Ferris [Fri, 10 Oct 2014 06:43:22 +0000 (06:43 +0000)]
am
b767f632: am
62a665a6: Merge "Add back symbols to fix Greed for Glory franchise."
* commit '
b767f632f34c8efa73d9489fd0d4509bcbb8db71':
Add back symbols to fix Greed for Glory franchise.
Christopher Ferris [Fri, 10 Oct 2014 06:38:35 +0000 (06:38 +0000)]
am
62a665a6: Merge "Add back symbols to fix Greed for Glory franchise."
* commit '
62a665a605df64a6ea5ac680bb564ad7a5f03711':
Add back symbols to fix Greed for Glory franchise.
Christopher Ferris [Fri, 10 Oct 2014 05:25:25 +0000 (05:25 +0000)]
Merge "Add back symbols to fix Greed for Glory franchise."
Christopher Ferris [Fri, 10 Oct 2014 01:31:01 +0000 (18:31 -0700)]
Add back symbols to fix Greed for Glory franchise.
Bug:
17813018
(cherry picked from commit
c891e24073830e07ba7373dee554ff2c70e1d313)
Change-Id: I4e891c2dbad9ea00d2377c5175317d9ae3840153
Elliott Hughes [Fri, 10 Oct 2014 02:14:00 +0000 (02:14 +0000)]
am
404f2a0a: am
8dd3b65f: Merge "Sync libm with upstream."
* commit '
404f2a0a224d73a8d9c5d4f1d37d9d1a3ae5ea8d':
Sync libm with upstream.
Elliott Hughes [Fri, 10 Oct 2014 01:57:56 +0000 (01:57 +0000)]
am
8dd3b65f: Merge "Sync libm with upstream."
* commit '
8dd3b65f2dd63df1baa83285f607cf110f21c27c':
Sync libm with upstream.
Christopher Ferris [Fri, 10 Oct 2014 01:31:01 +0000 (18:31 -0700)]
Add back symbols to fix Greed for Glory franchise.
Bug:
17813018
Change-Id: Id939426ee5303117b9601e7915fcfec5024fc621
Elliott Hughes [Fri, 10 Oct 2014 01:26:18 +0000 (01:26 +0000)]
Merge "Sync libm with upstream."
Elliott Hughes [Thu, 9 Oct 2014 23:20:37 +0000 (16:20 -0700)]
Sync libm with upstream.
Change-Id: I3b4e2c9c6ce6c5934f270a51ce5eb9154c5805d5
Elliott Hughes [Thu, 9 Oct 2014 22:15:04 +0000 (22:15 +0000)]
am
b20a5c8d: am
e9c216fc: Merge "Fix pthread_attr_getstack under valgrind."
* commit '
b20a5c8df897b319351a596a97c095d79d9cacca':
Fix pthread_attr_getstack under valgrind.
Elliott Hughes [Thu, 9 Oct 2014 22:11:00 +0000 (22:11 +0000)]
am
e9c216fc: Merge "Fix pthread_attr_getstack under valgrind."
* commit '
e9c216fca56e84b0d0a96f7d5e3c99d3276ef071':
Fix pthread_attr_getstack under valgrind.
Christopher Ferris [Thu, 9 Oct 2014 22:02:00 +0000 (22:02 +0000)]
am
c9734d24: Re-add dlmalloc for 32 bit.
* commit '
c9734d24d92f4737f5ab3808c77d816a1b084582':
Re-add dlmalloc for 32 bit.
Elliott Hughes [Thu, 9 Oct 2014 21:17:40 +0000 (21:17 +0000)]
Merge "Fix pthread_attr_getstack under valgrind."
Elliott Hughes [Thu, 9 Oct 2014 21:01:47 +0000 (14:01 -0700)]
Fix pthread_attr_getstack under valgrind.
valgrind seems to mess with the stack enough that the kernel will
report "[stack:pid]" rather than "[stack]" in /proc/self/maps, so
switch to the task-specific file instead to force "[stack]". (There
are two conditions in the kernel code that decides which form to
output.)
Bug:
17897476
Change-Id: Iff85ceb6d52e8716251fab4e45d95a27184c5529
Christopher Ferris [Thu, 9 Oct 2014 19:05:10 +0000 (19:05 +0000)]
am
9d192aa0: am
d0944d9e: Merge "Re-add dlmalloc for 32 bit."
* commit '
9d192aa08e6dad091f5fa0aeb6cb0541eaca96a5':
Re-add dlmalloc for 32 bit.
Christopher Ferris [Thu, 9 Oct 2014 18:59:39 +0000 (18:59 +0000)]
am
d0944d9e: Merge "Re-add dlmalloc for 32 bit."
* commit '
d0944d9ed38be0d74c3d8876f0f36b9ddc0ce38c':
Re-add dlmalloc for 32 bit.
Christopher Ferris [Thu, 9 Oct 2014 18:50:32 +0000 (18:50 +0000)]
Merge "Re-add dlmalloc for 32 bit."
Christopher Ferris [Thu, 9 Oct 2014 05:48:20 +0000 (22:48 -0700)]
Re-add dlmalloc for 32 bit.
It turns out that appportable has a version that calls dlmalloc directly.
Re-add the dlmalloc symbol for 32 bit only as a compatibility shim that
calls malloc.
Bug:
17881362
(cherry pick commit from
c9734d24d92f4737f5ab3808c77d816a1b084582)
Change-Id: Iee9a777f66a1edb407d7563a60792b767ac4f83a
Christopher Ferris [Thu, 9 Oct 2014 05:48:20 +0000 (22:48 -0700)]
Re-add dlmalloc for 32 bit.
It turns out that appportable has a version that calls dlmalloc directly.
Re-add the dlmalloc symbol for 32 bit only as a compatibility shim that
calls malloc.
Bug:
17881362
Change-Id: I8f20963b0b8d323489dc083e4063779e0d1d7447
Dan Albert [Thu, 9 Oct 2014 12:44:54 +0000 (12:44 +0000)]
am
653f30b1: am
8a7f8387: Merge "Use snprintf(3) instead of sprintf(3)."
* commit '
653f30b15a9bff8567a4f2fa1ff444dba00281ab':
Use snprintf(3) instead of sprintf(3).
Dan Albert [Thu, 9 Oct 2014 12:44:43 +0000 (12:44 +0000)]
am
8b3b4fa0: am
72d72d91: Merge "Replace uses of sprintf(3) with snprintf(3)."
* commit '
8b3b4fa0ae9e08e64f508e4745ff46c492d84497':
Replace uses of sprintf(3) with snprintf(3).
OSDN Git Service
