The Android Automerger
c689ed1ef7
merge in master-release history after reset to master
2013-04-16 07:49:11 -07:00
Elliott Hughes
9a41d425ea
am d23a87d3
: am 8c181aa8
: Merge "Use hidden visibility for internal-use-only functions"
...
* commit 'd23a87d3b1c7269a4b55f082555790a3003ba228':
Use hidden visibility for internal-use-only functions
2013-04-15 11:26:47 -07:00
Elliott Hughes
d23a87d3b1
am 8c181aa8
: Merge "Use hidden visibility for internal-use-only functions"
...
* commit '8c181aa8fe421c62a8e30f4c10e322aca968c27c':
Use hidden visibility for internal-use-only functions
2013-04-15 11:24:14 -07:00
Elliott Hughes
8c181aa8fe
Merge "Use hidden visibility for internal-use-only functions"
2013-04-15 17:51:24 +00:00
The Android Automerger
94dcdb0352
merge in master-release history after reset to master
2013-04-15 07:49:20 -07:00
Christopher Ferris
5274339979
am 39e4ed96
: am 516a8970
: Merge "Rewrite memset for cortexa15 to use strd."
...
* commit '39e4ed969948fd738d7b670b099c0b2c25351d95':
Rewrite memset for cortexa15 to use strd.
2013-04-12 12:33:57 -07:00
Elliott Hughes
35a2a61d49
am cf4a5302
: am b3c8c4d8
: Merge "Switch to current FreeBSD qsort."
...
* commit 'cf4a53020d85b0017799c31dc41823f9e775a1c5':
Switch to current FreeBSD qsort.
2013-04-12 12:33:56 -07:00
Christopher Ferris
39e4ed9699
am 516a8970
: Merge "Rewrite memset for cortexa15 to use strd."
...
* commit '516a89705378f43646678e75924529404e52b613':
Rewrite memset for cortexa15 to use strd.
2013-04-12 12:30:22 -07:00
Elliott Hughes
cf4a53020d
am b3c8c4d8
: Merge "Switch to current FreeBSD qsort."
...
* commit 'b3c8c4d8654894cdc72d32bde84a520ccda4d8f3':
Switch to current FreeBSD qsort.
2013-04-12 12:30:22 -07:00
Christopher Ferris
516a897053
Merge "Rewrite memset for cortexa15 to use strd."
2013-04-12 19:16:44 +00:00
Elliott Hughes
b3c8c4d865
Merge "Switch to current FreeBSD qsort."
2013-04-12 19:12:29 +00:00
Christopher Ferris
796cbe249b
Rewrite memset for cortexa15 to use strd.
...
Merge from internal master.
(cherry-picked from commit 7ffad9c120
)
Change-Id: Ia67f2a545399f4fa37b63d5634a3565e4f5482f9
2013-04-12 10:58:25 -07:00
The Android Automerger
5703eb8007
merge in master-release history after reset to master
2013-04-12 07:49:26 -07:00
Kito Cheng
ea489745dc
Use hidden visibility for internal-use-only functions
...
- malloc_debug_init and malloc_debug_fini
Change-Id: I4261ff428a50d8f0371415cda71bcc0a9487ce67
2013-04-12 16:34:38 +08:00
Elliott Hughes
0b25f633a2
Switch to current FreeBSD qsort.
...
Change-Id: Ic46cd0b663dc5fa78c99dd38db0bfe849a25e789
2013-04-11 18:08:34 -07:00
Elliott Hughes
a1826f6e59
am 5fe62e50
: am ed36d95f
: Merge "Start moving to current FreeBSD stdio."
...
* commit '5fe62e50f61b353657e1cd9cc6b1b1fc02870c9b':
Start moving to current FreeBSD stdio.
2013-04-11 14:58:37 -07:00
Elliott Hughes
5fe62e50f6
am ed36d95f
: Merge "Start moving to current FreeBSD stdio."
...
* commit 'ed36d95fac5881f78a601e2932f51edfd27c6ba6':
Start moving to current FreeBSD stdio.
2013-04-11 14:24:37 -07:00
Elliott Hughes
ed36d95fac
Merge "Start moving to current FreeBSD stdio."
2013-04-11 21:18:14 +00:00
Elliott Hughes
6b05c8e280
Start moving to current FreeBSD stdio.
...
This only touches the easy stuff.
Change-Id: Iecee57f1681dba5c56bff59f0e9a89811a71f0ca
2013-04-11 13:55:01 -07:00
The Android Automerger
651b3e1f9e
merge in master-release history after reset to master
2013-04-11 09:22:10 -07:00
The Android Open Source Project
6c48aca345
am ab911a02
: Reconcile with jb-mr2-release - do not merge
...
* commit 'ab911a02af2a5c3977b55cb0994f74635edc7c3a':
2013-04-11 07:47:08 -07:00
The Android Open Source Project
ab911a02af
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I15e9944781325d7a44f0d40ab078aec7723ce9ac
2013-04-11 07:44:55 -07:00
The Android Automerger
637d50e6c0
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-11 05:55:13 -07:00
Elliott Hughes
980d21745c
am 76db50dd
: am b632857a
: Merge "Add missing include and function prototype for sched_getaffinity."
...
* commit '76db50ddc948541d39bfc351666ba910bd8e6bab':
Add missing include and function prototype for sched_getaffinity.
2013-04-10 18:22:50 -07:00
Christopher Ferris
b9cfe21c6e
am 101dadf6
: am fc76c7d3
: Merge "Add missing branch in memcpy.S dst aligned case."
...
* commit '101dadf6a6a689b53f6db809578627448a14bff8':
Add missing branch in memcpy.S dst aligned case.
2013-04-10 18:22:48 -07:00
Elliott Hughes
76db50ddc9
am b632857a
: Merge "Add missing include and function prototype for sched_getaffinity."
...
* commit 'b632857a50a1fd2b759316d07ace6c36f6f418cf':
Add missing include and function prototype for sched_getaffinity.
2013-04-10 17:56:22 -07:00
Christopher Ferris
dbc23ea51c
resolved conflicts for merge of 3fe5b109
to master
...
Change-Id: Ifeecc0f8b0935ee1df057e944fc135d5047e248d
2013-04-10 17:54:53 -07:00
Elliott Hughes
b632857a50
Merge "Add missing include and function prototype for sched_getaffinity."
2013-04-11 00:45:33 +00:00
Kito Cheng
4ca685e36e
Add missing include and function prototype for sched_getaffinity.
...
Change-Id: I649633c8d074def5d05bd0c8b92fb680d9d11d51
2013-04-10 17:44:29 -07:00
Christopher Ferris
101dadf6a6
am fc76c7d3
: Merge "Add missing branch in memcpy.S dst aligned case."
...
* commit 'fc76c7d394ebe0e585777955efadf7cc8ed86636':
Add missing branch in memcpy.S dst aligned case.
2013-04-10 17:37:49 -07:00
Christopher Ferris
3fe5b10948
am 68fd78ef
: Merge "Update to latest cortexa15 memcpy code."
...
* commit '68fd78efa05fc61adfbdeadeb757caa45663570c':
Update to latest cortexa15 memcpy code.
2013-04-10 17:37:49 -07:00
Christopher Ferris
fc76c7d394
Merge "Add missing branch in memcpy.S dst aligned case."
2013-04-11 00:23:46 +00:00
Christopher Ferris
bf0d1ad72b
Add missing branch in memcpy.S dst aligned case.
...
Merge from internal master.
(cherry-picked from commit 6ffaa931c3
)
Change-Id: Ifdcf01fd122866cf0d4c5b5f7a997803561d7889
2013-04-10 17:21:29 -07:00
Christopher Ferris
68fd78efa0
Merge "Update to latest cortexa15 memcpy code."
2013-04-11 00:18:04 +00:00
Eric Laurent
61735a9069
am 55c015cd
: am ccaa0fa6
: sound: Add ALSA compressed API headers
...
* commit '55c015cddd4d8d14e58e7134ae077d637ff5388e':
sound: Add ALSA compressed API headers
2013-04-10 11:34:31 -07:00
Eric Laurent
55c015cddd
am ccaa0fa6
: sound: Add ALSA compressed API headers
...
* commit 'ccaa0fa6e90421831fa589e60f4e7ef6df39bd04':
sound: Add ALSA compressed API headers
2013-04-10 11:31:08 -07:00
The Android Automerger
7b1d164a4e
merge in master-release history after reset to master
2013-04-10 07:49:16 -07:00
Christopher Ferris
e27483c788
Merge "Rewrite memset for cortexa15 to use strd."
2013-04-09 22:58:26 +00:00
Eric Laurent
ccaa0fa6e9
sound: Add ALSA compressed API headers
...
Added the following headers for ALSA compressed
user space API:
- sound/compress_offload.h
- sound/compress_params.h
Change-Id: I9584c12acdadf31546d2921393b93d491e54a8d3
2013-04-09 09:37:44 -07:00
Christopher Ferris
7ffad9c120
Rewrite memset for cortexa15 to use strd.
...
Change-Id: Iac3af55f7813bd2b40a41bd19403f2b4dca5224b
2013-04-08 18:48:46 -07:00
Christopher Ferris
185ce72d00
Update to latest cortexa15 memcpy code.
...
This uses the new code original submitted as memcpy.a15.S as
the base. However, the old code handled unaligned src/dst better
so that was spliced in. I optimized the original unaligned code by
removing a few unnecessary instructions. I optimized the a15 code by
rewriting the pre and post code. I also modified the main loop to add
a pld so that larger copies would not stall waiting for memory.
Test cases for the new memcpy:
- Copy all sized values from 0 to 1024 bytes, using whatever alignment
is returned by malloc.
For each alignment case described below, the test copied from 0 to 128
bytes.
- Src and dst pointers are both aligned to the same value, starting
at one going through every power of two up to and including 128.
- Src aligned to double word boundary, dst aligned to word boundary.
- Src aligned to word boundary, dst aligned to double word boundary.
- Src aligned to 16 bit boundary, dst aligned to word boundary.
- Src aligned to word boundary, dst aligned to 16 byte boundary.
- Src aligned to word boundary, dst aligned to 1 byte from a word
boundary.
- Src aligned to word boundary, dst aligned to 2 bytes from a word
boundary.
- Src aligned to word boundary, dst aligned to 3 bytes from a word
boundary.
- Src aligned to 1 byte from a word boundary, dst aligned to a word
boundary.
- Src aligned to 2 bytes from a word boundary, dst aligned to a word
boundary.
- Src aligned to 3 bytes from a word boundary, dst aligned to a word
boundary.
Cases to verify the unaligned source code properly aligns to a 16 bit
boundary.
- Src aligned to 1 byte from a 128 bit boundary, dst aligned to
4 + 128 bit boundary.
- Src aligned to 1 byte from a 128 bit boundary, dst aligned to
8 + 128 bit boundary.
- Src aligned to 1 byte from a 128 bit boundary, dst aligned to
12 + 128 bit boundary.
- Src aligned to 1 byte from a 128 bit boundary, dst aligned to
16 + 128 bit boundary.
In all cases, a two byte fencepost was placed at the end of the
destination to verify that only the requested number of bytes were copied.
Bug: 8005082
Merge from internal master.
(cherry-picked from commit 21ede92d79
)
Change-Id: Ief70c9e6dc8c6473ae245b6570b2c266fed9618c
2013-04-08 18:13:35 -07:00
The Android Open Source Project
bc37bf00f8
am bb9842b6
: Reconcile with jb-mr2-release - do not merge
...
* commit 'bb9842b61e188ed70cf9bfb0415f2ba8fb406937':
2013-04-08 13:40:28 -07:00
The Android Open Source Project
bb9842b61e
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I562a47cb4eb8222c26aff7652826752825b9a091
2013-04-08 13:35:31 -07:00
The Android Automerger
cad988dafb
merge in master-release history after reset to master
2013-04-08 07:49:30 -07:00
The Android Automerger
d4cc0b8a61
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:55:25 -07:00
Elliott Hughes
8bed98c3ce
am fe7f46c0
: am 7b4d77e4
: Make abort messages available to debuggerd.
...
* commit 'fe7f46c088f303ea2cb9f6b218cc0f46f5385d43':
Make abort messages available to debuggerd.
2013-04-05 16:07:15 -07:00
Elliott Hughes
fe7f46c088
am 7b4d77e4
: Make abort messages available to debuggerd.
...
* commit '7b4d77e400d321ccc7cdadd1cd225ebb1a69d358':
Make abort messages available to debuggerd.
2013-04-05 16:04:13 -07:00
Elliott Hughes
7b4d77e400
Make abort messages available to debuggerd.
...
This adds __libc_fatal, cleans up the internal logging code a bit more,
and switches suitable callers over to __libc_fatal. In addition to logging,
__libc_fatal stashes the message somewhere that the debuggerd signal handler
can find it before calling abort.
In the debuggerd signal handler, we pass this address to debuggerd so that
it can come back with ptrace to read the message and present it to the user.
Bug: 8531731
(cherry picked from commit 0d787c1fa1
)
Change-Id: I5daeeaa36c1fc23f7f437d73a19808d9d558dd4d
2013-04-05 15:57:53 -07:00
Elliott Hughes
f89ce5b518
am 9c7b510a
: am 240fb862
: Merge "Make abort messages available to debuggerd."
...
* commit '9c7b510a408740b5b53f8d14b8f43bf2f2d36ae6':
Make abort messages available to debuggerd.
2013-04-05 11:47:00 -07:00
Elliott Hughes
9c7b510a40
am 240fb862
: Merge "Make abort messages available to debuggerd."
...
* commit '240fb8623b1fe027d0d33a9d4c41d99ceb385b58':
Make abort messages available to debuggerd.
2013-04-05 11:43:37 -07:00