Christopher Ferris
472c21b437
am 62a665a6: Merge "Add back symbols to fix Greed for Glory franchise."
...
* commit '62a665a605df64a6ea5ac680bb564ad7a5f03711':
Add back symbols to fix Greed for Glory franchise.
2014-10-10 06:38:26 +00:00
Christopher Ferris
62a665a605
Merge "Add back symbols to fix Greed for Glory franchise."
2014-10-10 05:25:26 +00:00
Christopher Ferris
78ba823033
Add back symbols to fix Greed for Glory franchise.
...
Bug: 17813018
(cherry picked from commit c891e24073830e07ba7373dee554ff2c70e1d313)
Change-Id: I4e891c2dbad9ea00d2377c5175317d9ae3840153
2014-10-09 22:23:50 -07:00
Elliott Hughes
dc4dc99268
am 8dd3b65f: Merge "Sync libm with upstream."
...
* commit '8dd3b65f2dd63df1baa83285f607cf110f21c27c':
Sync libm with upstream.
2014-10-10 01:59:21 +00:00
Elliott Hughes
8dd3b65f2d
Merge "Sync libm with upstream."
2014-10-10 01:26:18 +00:00
Elliott Hughes
488268b134
Sync libm with upstream.
...
Change-Id: I3b4e2c9c6ce6c5934f270a51ce5eb9154c5805d5
2014-10-09 16:20:37 -07:00
Elliott Hughes
a852bb56e8
am e9c216fc: Merge "Fix pthread_attr_getstack under valgrind."
...
* commit 'e9c216fca56e84b0d0a96f7d5e3c99d3276ef071':
Fix pthread_attr_getstack under valgrind.
2014-10-09 22:10:37 +00:00
Elliott Hughes
e9c216fca5
Merge "Fix pthread_attr_getstack under valgrind."
2014-10-09 21:17:41 +00:00
Elliott Hughes
9afb2f2106
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
2014-10-09 14:01:47 -07:00
Christopher Ferris
42e0817b45
resolved conflicts for merge of c9734d24 to lmp-dev-plus-aosp
...
Change-Id: I2ced64fed071f126725a8cdbd12d7c1f45ab7947
2014-10-09 12:12:49 -07:00
Christopher Ferris
95296d4129
am d0944d9e: Merge "Re-add dlmalloc for 32 bit."
...
* commit 'd0944d9ed38be0d74c3d8876f0f36b9ddc0ce38c':
Re-add dlmalloc for 32 bit.
2014-10-09 18:59:43 +00:00
Christopher Ferris
d0944d9ed3
Merge "Re-add dlmalloc for 32 bit."
2014-10-09 18:50:32 +00:00
Christopher Ferris
f183f95946
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
2014-10-09 11:47:01 -07:00
Christopher Ferris
c9734d24d9
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
2014-10-09 11:10:23 -07:00
Dan Albert
b9122b73bf
am 8a7f8387: Merge "Use snprintf(3) instead of sprintf(3)."
...
* commit '8a7f8387b3b95de2ee0c42e34a226a1fcc066896':
Use snprintf(3) instead of sprintf(3).
2014-10-09 00:40:24 +00:00
Dan Albert
8a7f8387b3
Merge "Use snprintf(3) instead of sprintf(3)."
2014-10-09 00:32:11 +00:00
Dan Albert
a2220ffb74
am 72d72d91: Merge "Replace uses of sprintf(3) with snprintf(3)."
...
* commit '72d72d91262fabe6bc169618ef3acb0721441cf0':
Replace uses of sprintf(3) with snprintf(3).
2014-10-09 00:13:06 +00:00
Ying Wang
196f4eee9f
am 0c0e728b: Merge "Build dlext_testzip as custom module."
...
* commit '0c0e728bd8cdeb0e73fd9c491d05993dfc77b622':
Build dlext_testzip as custom module.
2014-10-09 00:13:05 +00:00
Dan Albert
ca75f9cdeb
Use snprintf(3) instead of sprintf(3).
...
This change should probably be made upstream as well, but they have a
note about not using it because it isn't available on all systems.
Change-Id: I6d8404c031bd2f486532ced55d94bbb4a4cd2e71
2014-10-08 17:10:26 -07:00
Dan Albert
72d72d9126
Merge "Replace uses of sprintf(3) with snprintf(3)."
2014-10-08 23:44:48 +00:00
Ying Wang
0c0e728bd8
Merge "Build dlext_testzip as custom module."
2014-10-08 23:43:50 +00:00
Ying Wang
667853d477
Build dlext_testzip as custom module.
...
Use $(BUILD_SYSTEM)/base_rules to build it as custom module, so that
it's exposed to utilities like mm/mmma etc.
Bug: 17887283
Change-Id: Idd7b62d08e4d56331a3ff15da6aa46eae8c41898
2014-10-08 16:38:58 -07:00
Dan Albert
cfd8c45725
Replace uses of sprintf(3) with snprintf(3).
...
At -00, the compiler warns about sprintf(3), and it is promoted to an
error by -Werror.
Change-Id: Ibb380d27d7eb09dda8ac785be2478d656b379190
2014-10-08 16:12:27 -07:00
Dmitriy Ivanov
86c20f6a52
am ac3c94d0: Merge "Fix mma build: \'cd bionic && mma\' case"
...
* commit 'ac3c94d031c16a0299471a593cdc6248494e539d':
Fix mma build: 'cd bionic && mma' case
2014-10-08 22:49:22 +00:00
Elliott Hughes
9a96ca3ec4
am 0511534d: Merge "Don\'t silently return EINVAL for a NULL sem_t*."
...
* commit '0511534dcbb00f26b2fd6209b1b60a3263bf042c':
Don't silently return EINVAL for a NULL sem_t*.
2014-10-08 22:49:21 +00:00
Elliott Hughes
294d7d1215
am bfeef2d3: Merge "Use ln(1) rather than cp(1) to set up host /system for testing."
...
* commit 'bfeef2d3a903f161531ce5e45b2dd7d280e7f154':
Use ln(1) rather than cp(1) to set up host /system for testing.
2014-10-08 22:49:20 +00:00
Dmitriy Ivanov
ac3c94d031
Merge "Fix mma build: 'cd bionic && mma' case"
2014-10-08 22:39:21 +00:00
Dmitriy Ivanov
51166d3aa2
Fix mma build: 'cd bionic && mma' case
...
Bug: 17887283
Change-Id: If2015f2361348eac8c53aed3f8715077b79ce2f5
2014-10-08 15:36:56 -07:00
Elliott Hughes
0511534dcb
Merge "Don't silently return EINVAL for a NULL sem_t*."
2014-10-08 22:21:13 +00:00
Elliott Hughes
bfeef2d3a9
Merge "Use ln(1) rather than cp(1) to set up host /system for testing."
2014-10-08 22:17:19 +00:00
Elliott Hughes
75129ae9f3
Don't silently return EINVAL for a NULL sem_t*.
...
Bug: 17571197
Change-Id: Ied31d8de87fc10d20dc338be0457e9a4ddb9a0a5
2014-10-08 15:11:44 -07:00
Elliott Hughes
3ea4d56ed4
Use ln(1) rather than cp(1) to set up host /system for testing.
...
The trouble with cp is that if you're running a command directly (because
you're using gdb, say), you need to make sure you've copied the linker
and shell again if you've done a rebuild that caused a change there.
Change-Id: I312da30c0f92b515967e854e0faba272c961ecc7
2014-10-08 14:56:27 -07:00
Elliott Hughes
7083b23b1c
am 13641010: Merge "Fix compile-time tests for LP64."
...
* commit '1364101067072c2ce6fa395cdef2534f338f30b1':
Fix compile-time tests for LP64.
2014-10-08 20:39:57 +00:00
Elliott Hughes
1364101067
Merge "Fix compile-time tests for LP64."
2014-10-08 20:31:10 +00:00
Elliott Hughes
b4b15c63a1
Fix compile-time tests for LP64.
...
Change-Id: Ib9bec5c6c77c55679d64c2bc15ab70979c40e66c
2014-10-08 13:21:29 -07:00
Dan Albert
1b06736d96
am 5cc5c5ea: Merge "Add basic compile time tests for sn?printf."
...
* commit '5cc5c5ea0b7a5a2d523ea35c645a42b222929276':
Add basic compile time tests for sn?printf.
2014-10-08 20:13:24 +00:00
Dan Albert
5cc5c5ea0b
Merge "Add basic compile time tests for sn?printf."
2014-10-08 20:04:27 +00:00
Dan Albert
2fbb1b653e
Add basic compile time tests for sn?printf.
...
Bug: 17782583
Change-Id: I6443537c643d1cc6b4a8f2dab5c364f2fbc1faa3
2014-10-08 13:02:53 -07:00
Elliott Hughes
b559513e08
am 5a3ca374: Merge "Revert "Work around a bug in Immersion\'s libImmEmulatorJ.so.""
...
* commit '5a3ca374583f7605672d9e8f9098011de240f7c4':
Revert "Work around a bug in Immersion's libImmEmulatorJ.so."
2014-10-08 16:49:35 +00:00
Elliott Hughes
5a3ca37458
Merge "Revert "Work around a bug in Immersion's libImmEmulatorJ.so.""
2014-10-08 16:40:58 +00:00
Dan Albert
6c4a64e3e2
am c9e4f2de: Merge "Inline helpers need to be exported unmangled."
...
* commit 'c9e4f2de0a92ebf6dec336f383ba172efe1bb366':
Inline helpers need to be exported unmangled.
2014-10-08 00:12:32 +00:00
Dan Albert
c9e4f2de0a
Merge "Inline helpers need to be exported unmangled."
2014-10-08 00:01:08 +00:00
Dan Albert
658727e111
Inline helpers need to be exported unmangled.
...
__open_2() is used by the fortify implementation of open(2) in
fcntl.h, and as such needs an unmangled C name. For some reason
(inlining?), this doesn't cause problems at the default optimization
level, but does for -O0.
The rest of these didn't cause build failures, but they look suspect
and probably will, we just haven't caught them yet.
Bug: 17784968
Change-Id: I7391a7a8999ee204eaf6abd14a3d5373ea419d5b
2014-10-07 16:46:47 -07:00
Elliott Hughes
3d773274ad
Revert "Work around a bug in Immersion's libImmEmulatorJ.so."
...
This reverts commit 7d3f553f989f830976efa92ddc3c84661d4d42aa.
Change-Id: I8909b6aa1d97e9a61dbe95a2d91b9fbe336b58f0
2014-10-07 23:31:06 +00:00
Elliott Hughes
5eebae46cb
am 1543fdf6: Work around a bug in Immersion\'s libImmEmulatorJ.so.
...
* commit '1543fdf616ddebee7819214437527f380e5c743b':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-07 23:30:35 +00:00
Elliott Hughes
e698a7b5cf
am e8d9057e: Merge "Work around a bug in Immersion\'s libImmEmulatorJ.so."
...
* commit 'e8d9057e3005f6f53f8ef2e876b43aea7a892292':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-07 23:20:57 +00:00
Elliott Hughes
1543fdf616
Work around a bug in Immersion's libImmEmulatorJ.so.
...
This library calls pthread_mutex_lock and pthread_mutex_unlock with a NULL
pthread_mutex_t*. This gives them (and their users) one release to fix things.
Bug: 17443936
(cherry picked from commit 7d3f553f989f830976efa92ddc3c84661d4d42aa)
Change-Id: Ie26bbecd3a74d61113b51c18832872499b97ee86
(cherry picked from commit b5e7eba6d1b97e471996fcfe7dbde7cbba7512ef)
2014-10-07 23:17:14 +00:00
Elliott Hughes
e8d9057e30
Merge "Work around a bug in Immersion's libImmEmulatorJ.so."
2014-10-07 23:08:12 +00:00
Elliott Hughes
7d3f553f98
Work around a bug in Immersion's libImmEmulatorJ.so.
...
This library calls pthread_mutex_lock and pthread_mutex_unlock with a NULL
pthread_mutex_t*. This gives them (and their users) one release to fix things.
Bug: 17443936
Change-Id: I3b63c9a3dd63db0833f21073e323b3236a13b47a
2014-10-07 16:02:11 -07:00
Dan Albert
7c955d7797
am eeb9aa02: Merge "Use snprintf instead of sprintf."
...
* commit 'eeb9aa02b7f307a1d9b80731dd69ef9dd2f47e47':
Use snprintf instead of sprintf.
2014-10-07 18:46:32 +00:00