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
Christopher Ferris
a9a5870d16
Create arch specific versions of strcmp.
...
This uses the new strcmp.a15.S code as the basis for new versions
of strcmp.S.
The cortex-a15 code is the performance optimized version of strcmp.a15.S
taken with only the addition of a few pld instructions.
The cortex-a9 code is the same as the cortex-a15 code except that the
unaligned strcmp code was taken from the original strcmp.S.
The krait code is the same as the cortex-a15 code except that one path
in the unaligned strcmp code was taken from the original strcmp.S code
(the 2 byte overlap case).
The generic code is the original unmodified strmp.S from the bionic
subdirectory.
All three new versions underwent these test cases:
Strings the same, all same size:
- Both pointers double word aligned.
- One pointer double word aligned, one pointer word aligned.
- Both pointers word aligned.
- One pointer double word aligned, one pointer 1 off a word alignment.
- One pointer double word aligned, one pointer 2 off a word alignment.
- One pointer double word aligned, one pointer 3 off a word alignment.
- One pointer word aligned, one pointer 1 off a word alignment.
- One pointer word aligned, one pointer 2 off a word alignment.
- One pointer word aligned, one pointer 3 off a word alignment.
For all cases where it made sense, the two pointers were also tested
swapped.
Different strings, all same size:
- Single difference at double word boundary.
- Single difference at word boudary.
- Single difference at 1 off a word alignment.
- Single difference at 2 off a word alignment.
- Single difference at 3 off a word alignment.
Different sized strings, strings the same until the end:
- Shorter string ends on a double word boundary.
- Shorter string ends on word boundary.
- Shorter string ends at 1 off a word boundary.
- Shorter string ends at 2 off a word boundary.
- Shorter string ends at 3 off a word boundary.
For all different cases, run them through the same pointer alignment
cases when the strings are the same size.
For all cases the two pointers were also tested swapped.
Bug: 8005082
Change-Id: I5f3dc02b48afba2cb9c13332ab45c828ff171a1c
2013-03-12 10:25:11 -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 Automerger
1a6e73d0ac
merge in master-release history after reset to master
2013-03-12 07:49:24 -07:00
The Android Open Source Project
70d97ae3d0
am 7c8af225
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '7c8af2252a5814a34f30922ac7d5d63bd891e525':
2013-03-12 14:16:36 +00: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
3284773891
am 03e71235
: am 8c73f69c
: am 36cb88b7
: am 53630c0e
: Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
...
* commit '03e712357d1f4de204ac9ad5cbef53acba48db9d':
Cache the most-recently used timezone for mktime_tz and localtime_tz.
2013-03-12 01:50:53 +00: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
23167e7556
am 1467dfa5
: (-s ours) 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 '1467dfa5cd28b8b4e07cfe86b020a07bd0d0da24':
2013-03-11 19:51:51 +00: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
Elliott Hughes
3d0bf2b30c
am 9969b48d
: am 60ac09bd
: am 6d6f5e61
: am 4b032ee9
: Merge "Let bionic use the correct definition of ssize_t."
...
* commit '9969b48d235e71f87be67549fdd274c8e82f3f6f':
Let bionic use the correct definition of ssize_t.
2013-03-11 19:41:19 +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
Elliott Hughes
cd9c4cfae3
am 022d7c50
: am bf32ffcf
: am 0b765862
: am 62c5cd07
: Merge "Upgrade to tzdata2013b."
...
* commit '022d7c50db28fbf90e197f0c88b23b7e3a74a07b':
Upgrade to tzdata2013b.
2013-03-11 18:39:13 +00:00
Elliott Hughes
022d7c50db
am bf32ffcf
: am 0b765862
: am 62c5cd07
: Merge "Upgrade to tzdata2013b."
...
* commit 'bf32ffcf027d0089e84fafb0114f6b40825f84ac':
Upgrade to tzdata2013b.
2013-03-11 18:33:57 +00:00
Elliott Hughes
bf32ffcf02
am 0b765862
: am 62c5cd07
: Merge "Upgrade to tzdata2013b."
...
* commit '0b765862e134e87174ddf9bdfa32528392f85e96':
Upgrade to tzdata2013b.
2013-03-11 11:29:24 -07:00
Elliott Hughes
6d6f5e618e
am 4b032ee9
: Merge "Let bionic use the correct definition of ssize_t."
...
* commit '4b032ee9b94137e41ee54e9bb3bcf0ba5ad43cbc':
Let bionic use the correct definition of ssize_t.
2013-03-11 11:07:29 -07:00
Elliott Hughes
4b032ee9b9
Merge "Let bionic use the correct definition of ssize_t."
2013-03-11 17:55:27 +00:00
Elliott Hughes
0b765862e1
am 62c5cd07
: Merge "Upgrade to tzdata2013b."
...
* commit '62c5cd0781e95c1c50b63c37a9a87bc158e64d38':
Upgrade to tzdata2013b.
2013-03-11 09:57:53 -07:00
Elliott Hughes
62c5cd0781
Merge "Upgrade to tzdata2013b."
2013-03-11 16:42:57 +00:00
Elliott Hughes
cdb27f239b
Upgrade to tzdata2013b.
...
From the release notes:
Changes affecting current and future time stamps:
Haiti uses US daylight-saving rules this year, and presumably future years.
This changes time stamps starting today. (Thanks to Steffen Thorsen.)
Paraguay will end DST on March 24 this year.
(Thanks to Steffen Thorsen.) For now, assume it's just this year.
Morocco does not observe DST during Ramadan;
try to predict Ramadan in Morocco as best we can.
(Thanks to Erik Homoet for the heads-up.)
Change-Id: I98d5290ea5a1d9fb1eeddab1c9e72135dc9e4bd1
2013-03-11 09:41:45 -07:00
The Android Automerger
e767b0f555
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-11 05:55:24 -07:00
Elliott Hughes
b6e22482d4
Let bionic use the correct definition of ssize_t.
...
Bug: 8253769
Change-Id: I50c7cc20828fc089b83580e039ce9153a6c5a8cc
2013-03-08 15:28:52 -08:00
The Android Automerger
568eb7bd76
merge in master-release history after reset to master
2013-03-08 07:49:16 -08:00
Elliott Hughes
5bb64976a0
am 7a9749ec
: am 8a015722
: resolved conflicts for merge of 4706606c
to jb-mr2-dev
...
* commit '7a9749eca06816ba3b63e55660bc1c2b7285dc52':
Regenerate NOTICE files.
2013-03-07 21:25:35 +00:00
Elliott Hughes
7a9749eca0
am 8a015722
: resolved conflicts for merge of 4706606c
to jb-mr2-dev
...
* commit '8a0157227242eeb7917f064e0d81014bcda6d8f7':
Regenerate NOTICE files.
2013-03-07 21:23:22 +00:00
Elliott Hughes
8a01572272
resolved conflicts for merge of 4706606c
to jb-mr2-dev
...
Change-Id: Ibf6340df901c870cd05a2ab56536ad23b6fd491c
2013-03-07 13:19:20 -08:00
Elliott Hughes
4706606c88
am 809eed1d
: Merge "Regenerate NOTICE files."
...
* commit '809eed1dedb833af1aba56c6a1d059123b43049a':
Regenerate NOTICE files.
2013-03-07 12:02:00 -08:00
Elliott Hughes
809eed1ded
Merge "Regenerate NOTICE files."
2013-03-07 19:57:17 +00:00
Elliott Hughes
0493a6f7be
Regenerate NOTICE files.
...
Also clean up some obsolete cruft.
Change-Id: Iec3b36f6607f7a08b72de99294ed5b6cd910dd5f
2013-03-07 11:51:10 -08:00
The Android Automerger
a7a3bcef75
merge in master-release history after reset to master
2013-03-07 07:49:10 -08:00
The Android Automerger
a312b02e85
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-07 05:55:07 -08:00
Elliott Hughes
30be06bc7a
am 0f644ccf
: am 0a2ee475
: am ad7c275e
: am c9f80814
: Merge "Upgrade to current NetBSD popen/pclose."
...
* commit '0f644ccf6dfb4f00473fc90f369d842e09ab13df':
Upgrade to current NetBSD popen/pclose.
2013-03-07 01:09:36 +00:00
Elliott Hughes
0f644ccf6d
am 0a2ee475
: am ad7c275e
: am c9f80814
: Merge "Upgrade to current NetBSD popen/pclose."
...
* commit '0a2ee4750ac4e9e5949dbf97fbad68065e83b632':
Upgrade to current NetBSD popen/pclose.
2013-03-07 01:07:08 +00:00
Elliott Hughes
0a2ee4750a
am ad7c275e
: am c9f80814
: Merge "Upgrade to current NetBSD popen/pclose."
...
* commit 'ad7c275e45088e1f13656b97dabbe911fff83664':
Upgrade to current NetBSD popen/pclose.
2013-03-07 01:04:52 +00:00
Elliott Hughes
ad7c275e45
am c9f80814
: Merge "Upgrade to current NetBSD popen/pclose."
...
* commit 'c9f80814259a81dce12ba35d1750fa2b23fef48d':
Upgrade to current NetBSD popen/pclose.
2013-03-06 17:03:28 -08:00