Christopher Ferris
f694ed1cdb
am d30b9f09
: Merge "Remove unused arm defines."
...
* commit 'd30b9f0912b4763f0d98bdee23064015223ec03f':
Remove unused arm defines.
2013-03-14 16:32:21 -07:00
Christopher Ferris
d30b9f0912
Merge "Remove unused arm defines."
2013-03-14 23:23:42 +00:00
Elliott Hughes
2d48d0ea36
am c9358706
: am 2e7b8d63
: am f861bc5c
: Merge "Don\'t search off the end of the index for bad Olson ids."
...
* commit 'c9358706c6f48eb27f785f3bf15b2ab0d50ff7bc':
Don't search off the end of the index for bad Olson ids.
2013-03-14 22:33:35 +00:00
Christopher Ferris
306a353825
Remove unused arm defines.
...
The defines HAVE_32_BYTE_CACHE_LINES and ARCH_ARM_USE_NON_NEON_MEMCPY
are not used by any code. The previous memcpy code that used these
has been split into different architecture versions to avoid the need
for them.
Bug: 8005082
Merge from internal master.
(cherry-picked from commit 6e1a5cf31b
)
Change-Id: Ib18fc3f4131b21cdbd19b9dde7697ac25d066fcf
2013-03-14 15:32:18 -07:00
Elliott Hughes
c9358706c6
am 2e7b8d63
: am f861bc5c
: Merge "Don\'t search off the end of the index for bad Olson ids."
...
* commit '2e7b8d6399fdea6e43dd07f353346324d2bf4ec4':
Don't search off the end of the index for bad Olson ids.
2013-03-14 15:30:13 -07:00
Elliott Hughes
2e7b8d6399
am f861bc5c
: Merge "Don\'t search off the end of the index for bad Olson ids."
...
* commit 'f861bc5cc3e17322e49f89deea61f278aaefbe76':
Don't search off the end of the index for bad Olson ids.
2013-03-14 15:17:09 -07:00
Elliott Hughes
f861bc5cc3
Merge "Don't search off the end of the index for bad Olson ids."
2013-03-14 22:05:44 +00:00
Elliott Hughes
e0175ca7e4
Don't search off the end of the index for bad Olson ids.
...
In the old code, the index was a file to itself, so it made sense to
read until you hit the end of the file. In the new code, the index is
followed by hundreds of KiB of data, so we need to just search the
index.
Bug: 8368791
Change-Id: Icf5f8b5516cf3a93679fa849c9f6cd1cb100e0f1
2013-03-14 14:38:08 -07:00
The Android Automerger
45508566d1
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-13 05:55:08 -07:00
Elliott Hughes
76ade2ed60
am f557e90b
: am 2f44c05b
: am ec706c24
: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
...
* commit 'f557e90b348d9a3294391076bcd6604a13c803b6':
Use the kernel's MAX_ERRNO in the syscall stubs.
2013-03-13 00:58:27 +00:00
Elliott Hughes
f557e90b34
am 2f44c05b
: am ec706c24
: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
...
* commit '2f44c05bc54073aa6decfc5d933b7e77e7ce5768':
Use the kernel's MAX_ERRNO in the syscall stubs.
2013-03-12 17:55:54 -07:00
Elliott Hughes
2f44c05bc5
am ec706c24
: Merge "Use the kernel\'s MAX_ERRNO in the syscall stubs."
...
* commit 'ec706c24acb4d1db6a583a57b76adfb9250d39eb':
Use the kernel's MAX_ERRNO in the syscall stubs.
2013-03-12 17:54:00 -07:00
Elliott Hughes
ec706c24ac
Merge "Use the kernel's MAX_ERRNO in the syscall stubs."
2013-03-13 00:44:33 +00:00
Elliott Hughes
9aceab5015
Use the kernel's MAX_ERRNO in the syscall stubs.
...
Bug: http://code.google.com/p/android/issues/detail?id=53104
Change-Id: Iaabf7025b153e96dc5eca231a33a32d4cb7d8116
2013-03-12 17:43:58 -07:00
Christopher Ferris
8cca015403
am b0b974c1
: am 2a66ccf1
: am 980508b0
: Merge "Break bionic implementations into arch versions."
...
* commit 'b0b974c10ce3494fe58be1a3f419656f95c54331':
Break bionic implementations into arch versions.
2013-03-12 22:43:05 +00:00
Christopher Ferris
b0b974c10c
am 2a66ccf1
: am 980508b0
: Merge "Break bionic implementations into arch versions."
...
* commit '2a66ccf1bb4dd0183b65264cb8107ba70748f626':
Break bionic implementations into arch versions.
2013-03-12 15:40:22 -07:00
Christopher Ferris
2a66ccf1bb
am 980508b0
: Merge "Break bionic implementations into arch versions."
...
* commit '980508b0ead3ee01e99e93635c57eb76d1aba62d':
Break bionic implementations into arch versions.
2013-03-12 15:39:38 -07:00
Christopher Ferris
980508b0ea
Merge "Break bionic implementations into arch versions."
2013-03-12 22:24:09 +00:00
Christopher Ferris
04954a43b3
Break bionic implementations into arch versions.
...
Move arch specific code for arm, mips, x86 into separate
makefiles.
In addition, add different arm cpu versions of memcpy/memset.
Bug: 8005082
Merge from internal master (acdde8c1cf
).
Change-Id: I04f3d0715104fab618e1abf7cf8f7eec9bec79df
2013-03-12 14:06:08 -07:00
Elliott Hughes
0052a6188b
am b4d6f28c
: am a3214c65
: am 94a34010
: Merge "Support large errno values on ARM."
...
* commit 'b4d6f28cc33f438f9859d6ab5f91e7f2ee1d6d33':
Support large errno values on ARM.
2013-03-12 19:22:50 +00:00
Elliott Hughes
b4d6f28cc3
am a3214c65
: am 94a34010
: Merge "Support large errno values on ARM."
...
* commit 'a3214c65620827628a87849a5fbad5a4ef97eeb1':
Support large errno values on ARM.
2013-03-12 12:18:49 -07:00
Elliott Hughes
a3214c6562
am 94a34010
: Merge "Support large errno values on ARM."
...
* commit '94a34010c1f989032c0a4dc7a7a68d069ca23b1e':
Support large errno values on ARM.
2013-03-12 12:17:15 -07:00
Elliott Hughes
94a34010c1
Merge "Support large errno values on ARM."
2013-03-12 19:08:36 +00:00
Elliott Hughes
60414ba165
am 746f1286
: am 5d998b4a
: am f21aa3b6
: Merge "Use more types than just \'unsigned\' in the linker."
...
* commit '746f128602772997b57e24fc8546473d01d6f955':
Use more types than just 'unsigned' in the linker.
2013-03-12 19:05:53 +00:00
Elliott Hughes
746f128602
am 5d998b4a
: am f21aa3b6
: Merge "Use more types than just \'unsigned\' in the linker."
...
* commit '5d998b4a21aab09da750e8e43cb608f5ee6b1f3d':
Use more types than just 'unsigned' in the linker.
2013-03-12 12:03:06 -07:00
Elliott Hughes
5d998b4a21
am f21aa3b6
: Merge "Use more types than just \'unsigned\' in the linker."
...
* commit 'f21aa3b61ebc6b1a7c34265699f40bd9b5af7952':
Use more types than just 'unsigned' in the linker.
2013-03-12 12:00:55 -07:00
Elliott Hughes
cb2069bf69
Support large errno values on ARM.
...
Bug: http://code.google.com/p/android/issues/detail?id=53104
Change-Id: Ic6c40be2dc50f0644a3d8b09ceae59c38f2d5b53
2013-03-12 11:55:45 -07:00
Elliott Hughes
f21aa3b61e
Merge "Use more types than just 'unsigned' in the linker."
2013-03-12 18:54:27 +00:00
Elliott Hughes
ca0c11bd82
Use more types than just 'unsigned' in the linker.
...
Still chipping away at the situation where every variable in the
linker was of type 'unsigned'. This patch switches counts over to
being size_t and adds an explicit type for init/fini function pointers
and arrays of function pointers.
Also improve logging from CallArray.
Also remove trailing "\n"s from log messages.
Change-Id: Ie036d2622caac50f4d29f0570888bb527661d77e
2013-03-12 11:26:56 -07:00
Elliott Hughes
5487ecb52a
am e9cdce33
: am 3c9afb5e
: am 6b4c77f8
: Merge "Use Elf32_Addr instead of unsigned in linker"
...
* commit 'e9cdce33f398e43952d11ef38027e2d255f16531':
Use Elf32_Addr instead of unsigned in linker
2013-03-12 17:42:37 +00:00
Elliott Hughes
e9cdce33f3
am 3c9afb5e
: am 6b4c77f8
: Merge "Use Elf32_Addr instead of unsigned in linker"
...
* commit '3c9afb5e17eaa2ed5a12d71a1a09fe85f06fcb48':
Use Elf32_Addr instead of unsigned in linker
2013-03-12 10:40:56 -07:00
Elliott Hughes
3c9afb5e17
am 6b4c77f8
: Merge "Use Elf32_Addr instead of unsigned in linker"
...
* commit '6b4c77f854c079138d552608b9df5fa3035f0fcc':
Use Elf32_Addr instead of unsigned in linker
2013-03-12 10:38:46 -07:00
Elliott Hughes
6b4c77f854
Merge "Use Elf32_Addr instead of unsigned in linker"
2013-03-12 17:24:04 +00:00
Kito Cheng
fa8c05dc00
Use Elf32_Addr instead of unsigned in linker
...
Change-Id: I52dcbb4b0ff0a4052e0ad7a9bbeb2df65c9d2f66
2013-03-12 10:19:14 -07:00
The Android Open Source Project
7c8af2252a
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ia0c7d98294053c4dfab78608959f2f3f53c8e2a0
2013-03-12 07:14:11 -07:00
The Android Automerger
24ec903cd8
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-12 05:55:15 -07:00
Elliott Hughes
03e712357d
am 8c73f69c
: am 36cb88b7
: am 53630c0e
: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
...
* commit '8c73f69cf42d78f37b9b82bf0cc62d2cd1985fcc':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
2013-03-12 01:48:34 +00:00
Elliott Hughes
8c73f69cf4
am 36cb88b7
: am 53630c0e
: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
...
* commit '36cb88b70c39e507e9017f0bd7121da57e568744':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
2013-03-11 18:46:23 -07:00
Elliott Hughes
36cb88b70c
am 53630c0e
: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
...
* commit '53630c0e5bb6f845ba633e8dedc08b827f7b5d0c':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
2013-03-11 18:44:19 -07:00
Elliott Hughes
53630c0e5b
Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
2013-03-12 01:28:36 +00:00
Elliott Hughes
4a05bef4c0
Cache the most-recently used timezone for mktime_tz and localtime_tz.
...
Normally, the C library implicitly caches your timezone by virtue
of the fact that the prehistoric API assumes a single timezone for
the entire process.
The unfortunate mktime_tz and localtime_tz extensions work around
this, but represent timezones as strings to their callers, so code
that makes heavy use of these needs a cache to be able to perform
acceptably until it can hopefully one day be rewritten to use
java.util.Calendar or icu4c.
Bug: 8270865
Change-Id: I92e3964e86dc33ceac925f819cc5e26ff4203f50
2013-03-11 17:17:02 -07:00
Jean-Baptiste Queru
1467dfa5cd
am a60f3818
: am b2525ba8
: am 7915b22e
: am a4b20d71
: am b8e1033c
: (-s ours) am e5412a9a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'a60f38181465d5f5a37ea8f9ad34326ea2e21ef0':
2013-03-11 19:41:34 +00:00
Jean-Baptiste Queru
a60f381814
am b2525ba8
: am 7915b22e
: am a4b20d71
: am b8e1033c
: (-s ours) am e5412a9a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'b2525ba8a0f91594df17e893d036c416a109b012':
2013-03-11 12:35:36 -07:00
Elliott Hughes
9969b48d23
am 60ac09bd
: am 6d6f5e61
: am 4b032ee9
: Merge "Let bionic use the correct definition of ssize_t."
...
* commit '60ac09bdb2ddc4076f78a91f260cd5a1e179c82b':
Let bionic use the correct definition of ssize_t.
2013-03-11 19:34:11 +00:00
Jean-Baptiste Queru
b2525ba8a0
am 7915b22e
: am a4b20d71
: am b8e1033c
: (-s ours) am e5412a9a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '7915b22e8f70b80a9fc2c41f9734194c58b546fc':
2013-03-11 12:30:58 -07:00
Jean-Baptiste Queru
7915b22e8f
am a4b20d71
: am b8e1033c
: (-s ours) am e5412a9a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'a4b20d712b9c6cbc562529d3a41bf8ea1515562a':
2013-03-11 12:28:17 -07:00
Elliott Hughes
60ac09bdb2
am 6d6f5e61
: am 4b032ee9
: Merge "Let bionic use the correct definition of ssize_t."
...
* commit '6d6f5e618e054e79d80a02f2c3f76ce0fd73bb2a':
Let bionic use the correct definition of ssize_t.
2013-03-11 12:27:58 -07:00
Jean-Baptiste Queru
a4b20d712b
am b8e1033c
: (-s ours) am e5412a9a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'b8e1033c5b5813cb97d19645075591a357e9f04a':
2013-03-11 12:22:41 -07:00
Jean-Baptiste Queru
b8e1033c5b
am e5412a9a
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'e5412a9a9597433ae2540b390269c514c46402f1':
2013-03-11 12:19:03 -07:00
Jean-Baptiste Queru
e5412a9a95
Reconcile with jb-mr1-release - do not merge
2013-03-11 12:15:11 -07:00