OSDN Git Service
Christopher Ferris [Sat, 9 Mar 2013 00:50:31 +0000 (16:50 -0800)]
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
The Android Open Source Project [Tue, 12 Mar 2013 14:16:36 +0000 (14:16 +0000)]
am
7c8af225: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
7c8af2252a5814a34f30922ac7d5d63bd891e525':
The Android Open Source Project [Tue, 12 Mar 2013 14:14:11 +0000 (07:14 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia0c7d98294053c4dfab78608959f2f3f53c8e2a0
The Android Automerger [Tue, 12 Mar 2013 12:55:15 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Tue, 12 Mar 2013 01:50:53 +0000 (01:50 +0000)]
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.
Elliott Hughes [Tue, 12 Mar 2013 01:48:34 +0000 (01:48 +0000)]
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.
Elliott Hughes [Tue, 12 Mar 2013 01:46:23 +0000 (18:46 -0700)]
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.
Elliott Hughes [Tue, 12 Mar 2013 01:44:19 +0000 (18:44 -0700)]
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.
Elliott Hughes [Tue, 12 Mar 2013 01:28:36 +0000 (01:28 +0000)]
Merge "Cache the most-recently used timezone for mktime_tz and localtime_tz."
Elliott Hughes [Tue, 12 Mar 2013 00:17:02 +0000 (17:17 -0700)]
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
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:51:51 +0000 (19:51 +0000)]
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':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:41:34 +0000 (19:41 +0000)]
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':
Elliott Hughes [Mon, 11 Mar 2013 19:41:19 +0000 (19:41 +0000)]
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.
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:35:36 +0000 (12:35 -0700)]
am
b2525ba8: am
7915b22e: am
a4b20d71: am
b8e1033c: (-s ours) am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
b2525ba8a0f91594df17e893d036c416a109b012':
Elliott Hughes [Mon, 11 Mar 2013 19:34:11 +0000 (19:34 +0000)]
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.
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:30:58 +0000 (12:30 -0700)]
am
7915b22e: am
a4b20d71: am
b8e1033c: (-s ours) am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
7915b22e8f70b80a9fc2c41f9734194c58b546fc':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:28:17 +0000 (12:28 -0700)]
am
a4b20d71: am
b8e1033c: (-s ours) am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a4b20d712b9c6cbc562529d3a41bf8ea1515562a':
Elliott Hughes [Mon, 11 Mar 2013 19:27:58 +0000 (12:27 -0700)]
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.
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:22:41 +0000 (12:22 -0700)]
am
b8e1033c: (-s ours) am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
b8e1033c5b5813cb97d19645075591a357e9f04a':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:19:03 +0000 (12:19 -0700)]
am
e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
e5412a9a9597433ae2540b390269c514c46402f1':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:15:11 +0000 (12:15 -0700)]
Reconcile with jb-mr1-release - do not merge
Elliott Hughes [Mon, 11 Mar 2013 18:39:13 +0000 (18:39 +0000)]
am
022d7c50: am
bf32ffcf: am
0b765862: am
62c5cd07: Merge "Upgrade to tzdata2013b."
* commit '
022d7c50db28fbf90e197f0c88b23b7e3a74a07b':
Upgrade to tzdata2013b.
Elliott Hughes [Mon, 11 Mar 2013 18:33:57 +0000 (18:33 +0000)]
am
bf32ffcf: am
0b765862: am
62c5cd07: Merge "Upgrade to tzdata2013b."
* commit '
bf32ffcf027d0089e84fafb0114f6b40825f84ac':
Upgrade to tzdata2013b.
Elliott Hughes [Mon, 11 Mar 2013 18:29:24 +0000 (11:29 -0700)]
am
0b765862: am
62c5cd07: Merge "Upgrade to tzdata2013b."
* commit '
0b765862e134e87174ddf9bdfa32528392f85e96':
Upgrade to tzdata2013b.
Elliott Hughes [Mon, 11 Mar 2013 18:07:29 +0000 (11:07 -0700)]
am
4b032ee9: Merge "Let bionic use the correct definition of ssize_t."
* commit '
4b032ee9b94137e41ee54e9bb3bcf0ba5ad43cbc':
Let bionic use the correct definition of ssize_t.
Elliott Hughes [Mon, 11 Mar 2013 17:55:27 +0000 (17:55 +0000)]
Merge "Let bionic use the correct definition of ssize_t."
Elliott Hughes [Mon, 11 Mar 2013 16:57:53 +0000 (09:57 -0700)]
am
62c5cd07: Merge "Upgrade to tzdata2013b."
* commit '
62c5cd0781e95c1c50b63c37a9a87bc158e64d38':
Upgrade to tzdata2013b.
Elliott Hughes [Mon, 11 Mar 2013 16:42:57 +0000 (16:42 +0000)]
Merge "Upgrade to tzdata2013b."
Elliott Hughes [Mon, 11 Mar 2013 16:41:45 +0000 (09:41 -0700)]
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
The Android Automerger [Mon, 11 Mar 2013 12:55:24 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Fri, 8 Mar 2013 23:28:52 +0000 (15:28 -0800)]
Let bionic use the correct definition of ssize_t.
Bug:
8253769
Change-Id: I50c7cc20828fc089b83580e039ce9153a6c5a8cc
Elliott Hughes [Thu, 7 Mar 2013 21:25:35 +0000 (21:25 +0000)]
am
7a9749ec: am
8a015722: resolved conflicts for merge of
4706606c to jb-mr2-dev
* commit '
7a9749eca06816ba3b63e55660bc1c2b7285dc52':
Regenerate NOTICE files.
Elliott Hughes [Thu, 7 Mar 2013 21:23:22 +0000 (21:23 +0000)]
am
8a015722: resolved conflicts for merge of
4706606c to jb-mr2-dev
* commit '
8a0157227242eeb7917f064e0d81014bcda6d8f7':
Regenerate NOTICE files.
Elliott Hughes [Thu, 7 Mar 2013 21:19:20 +0000 (13:19 -0800)]
resolved conflicts for merge of
4706606c to jb-mr2-dev
Change-Id: Ibf6340df901c870cd05a2ab56536ad23b6fd491c
Elliott Hughes [Thu, 7 Mar 2013 20:02:00 +0000 (12:02 -0800)]
am
809eed1d: Merge "Regenerate NOTICE files."
* commit '
809eed1dedb833af1aba56c6a1d059123b43049a':
Regenerate NOTICE files.
Elliott Hughes [Thu, 7 Mar 2013 19:57:17 +0000 (19:57 +0000)]
Merge "Regenerate NOTICE files."
Elliott Hughes [Thu, 7 Mar 2013 19:48:58 +0000 (11:48 -0800)]
Regenerate NOTICE files.
Also clean up some obsolete cruft.
Change-Id: Iec3b36f6607f7a08b72de99294ed5b6cd910dd5f
The Android Automerger [Thu, 7 Mar 2013 13:55:07 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Thu, 7 Mar 2013 01:09:36 +0000 (01:09 +0000)]
am
0f644ccf: am
0a2ee475: am
ad7c275e: am
c9f80814: Merge "Upgrade to current NetBSD popen/pclose."
* commit '
0f644ccf6dfb4f00473fc90f369d842e09ab13df':
Upgrade to current NetBSD popen/pclose.
Elliott Hughes [Thu, 7 Mar 2013 01:07:08 +0000 (01:07 +0000)]
am
0a2ee475: am
ad7c275e: am
c9f80814: Merge "Upgrade to current NetBSD popen/pclose."
* commit '
0a2ee4750ac4e9e5949dbf97fbad68065e83b632':
Upgrade to current NetBSD popen/pclose.
Elliott Hughes [Thu, 7 Mar 2013 01:04:52 +0000 (01:04 +0000)]
am
ad7c275e: am
c9f80814: Merge "Upgrade to current NetBSD popen/pclose."
* commit '
ad7c275e45088e1f13656b97dabbe911fff83664':
Upgrade to current NetBSD popen/pclose.
Elliott Hughes [Thu, 7 Mar 2013 01:03:28 +0000 (17:03 -0800)]
am
c9f80814: Merge "Upgrade to current NetBSD popen/pclose."
* commit '
c9f80814259a81dce12ba35d1750fa2b23fef48d':
Upgrade to current NetBSD popen/pclose.
Elliott Hughes [Thu, 7 Mar 2013 00:54:22 +0000 (00:54 +0000)]
Merge "Upgrade to current NetBSD popen/pclose."
Elliott Hughes [Thu, 7 Mar 2013 00:20:55 +0000 (16:20 -0800)]
Upgrade to current NetBSD popen/pclose.
This gets us back to using vfork now our ARM vfork assembler stub is
fixed, and adds the missing thread safety for the 'pidlist'.
Bug:
5335385
Change-Id: Ib08bfa65b2cb9fa695717aae629ea14816bf988d
Brian Carlstrom [Thu, 7 Mar 2013 00:18:45 +0000 (00:18 +0000)]
am
6b89c634: am
c7b9f954: am
91392116: am
33031fed: Merge "Fix typo of DT_NEEDED for DT_NULL"
* commit '
6b89c6341f2d805b7d9913d69ef6038b60b2af7b':
Fix typo of DT_NEEDED for DT_NULL
Brian Carlstrom [Thu, 7 Mar 2013 00:15:48 +0000 (00:15 +0000)]
am
c7b9f954: am
91392116: am
33031fed: Merge "Fix typo of DT_NEEDED for DT_NULL"
* commit '
c7b9f954a5278115333516a40c0d2839648a6877':
Fix typo of DT_NEEDED for DT_NULL
Brian Carlstrom [Thu, 7 Mar 2013 00:12:13 +0000 (00:12 +0000)]
am
91392116: am
33031fed: Merge "Fix typo of DT_NEEDED for DT_NULL"
* commit '
91392116ff859b2e7656ded729b8c758107241aa':
Fix typo of DT_NEEDED for DT_NULL
Brian Carlstrom [Thu, 7 Mar 2013 00:11:07 +0000 (16:11 -0800)]
am
33031fed: Merge "Fix typo of DT_NEEDED for DT_NULL"
* commit '
33031fed84e24fb7791f123df45abc1a3812ac59':
Fix typo of DT_NEEDED for DT_NULL
Brian Carlstrom [Wed, 6 Mar 2013 23:55:56 +0000 (23:55 +0000)]
Merge "Fix typo of DT_NEEDED for DT_NULL"
Brian Carlstrom [Wed, 6 Mar 2013 23:32:16 +0000 (15:32 -0800)]
Fix typo of DT_NEEDED for DT_NULL
(cherry-pick of
138b205ea9efc117fe522c2d7191378023a6e2cd)
Change-Id: Ia895cb3018df55554627f1f61dcdfdada4a961ce
Elliott Hughes [Wed, 6 Mar 2013 23:29:12 +0000 (23:29 +0000)]
am
165825e3: am
9c0c056b: am
6b1aa1b1: am
db794197: Merge "Fix debug malloc."
* commit '
165825e3e83fb2ae43b60b1b5ef44cbc55f7979f':
Fix debug malloc.
Elliott Hughes [Wed, 6 Mar 2013 23:27:40 +0000 (23:27 +0000)]
am
9c0c056b: am
6b1aa1b1: am
db794197: Merge "Fix debug malloc."
* commit '
9c0c056beddf8c4100769ad01404311a6d70efae':
Fix debug malloc.
Elliott Hughes [Wed, 6 Mar 2013 23:24:59 +0000 (23:24 +0000)]
am
6b1aa1b1: am
db794197: Merge "Fix debug malloc."
* commit '
6b1aa1b16bc2cf8ba17e33fca4ffc399368b356c':
Fix debug malloc.
Elliott Hughes [Wed, 6 Mar 2013 23:22:24 +0000 (15:22 -0800)]
am
db794197: Merge "Fix debug malloc."
* commit '
db794197cc880e3805bcefbea780476a359066c2':
Fix debug malloc.
Elliott Hughes [Wed, 6 Mar 2013 23:13:01 +0000 (23:13 +0000)]
Merge "Fix debug malloc."
Elliott Hughes [Wed, 6 Mar 2013 23:03:53 +0000 (15:03 -0800)]
Fix debug malloc.
This was broken by the change to use AT_RANDOM for the stack guards.
Bug:
7959813
Bug:
8330764
Change-Id: I791900092b72a9a900f16585237fa7ad82aaed9f
Elliott Hughes [Wed, 6 Mar 2013 17:52:39 +0000 (17:52 +0000)]
am
bbef1f57: am
bac72aba: am
50a2cd86: am
0b4a85bf: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
* commit '
bbef1f57509504ca11f26968beafd4aa0cfd4643':
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
Elliott Hughes [Wed, 6 Mar 2013 17:47:07 +0000 (17:47 +0000)]
am
bac72aba: am
50a2cd86: am
0b4a85bf: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
* commit '
bac72abae4578bf2df9227a9c3d2c7233c83a06b':
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
Elliott Hughes [Wed, 6 Mar 2013 17:44:43 +0000 (17:44 +0000)]
am
50a2cd86: am
0b4a85bf: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
* commit '
50a2cd865e7cc8c72d926548ed5d64e269003055':
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
Elliott Hughes [Wed, 6 Mar 2013 17:41:56 +0000 (09:41 -0800)]
am
0b4a85bf: Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
* commit '
0b4a85bf1e11e28f66d0f101f9e7d4c51a0bb31c':
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
Elliott Hughes [Wed, 6 Mar 2013 17:25:51 +0000 (17:25 +0000)]
Merge "Fix TIMING/STATS/COUNT_PAGES dynamic linker build"
Brian Carlstrom [Wed, 6 Mar 2013 16:53:22 +0000 (16:53 +0000)]
am
8f4880e2: am
2527a8b5: am
9043202b: am
20958207: Merge "Fix MIPS linker build"
* commit '
8f4880e2c66d60283d443f6c9b5ef4136d2c6621':
Fix MIPS linker build
Elliott Hughes [Wed, 6 Mar 2013 16:53:22 +0000 (16:53 +0000)]
am
5673f9f7: am
c1a5d20d: am
9a0b658c: am
c41dcad0: Merge "More linker cleanup."
* commit '
5673f9f73b545c8b4801c1494600ff2220bf8dca':
More linker cleanup.
Brian Carlstrom [Wed, 6 Mar 2013 16:48:18 +0000 (16:48 +0000)]
am
2527a8b5: am
9043202b: am
20958207: Merge "Fix MIPS linker build"
* commit '
2527a8b5a652d7f88b662fe3788e29b6bc2bbe78':
Fix MIPS linker build
Elliott Hughes [Wed, 6 Mar 2013 16:48:05 +0000 (16:48 +0000)]
am
c1a5d20d: am
9a0b658c: am
c41dcad0: Merge "More linker cleanup."
* commit '
c1a5d20d08118bb778f99b14ca74d6654e4f4eba':
More linker cleanup.
Kito Cheng [Wed, 6 Mar 2013 15:52:45 +0000 (23:52 +0800)]
Fix TIMING/STATS/COUNT_PAGES dynamic linker build
Change-Id: I6432ac378816da253b83d1c7fb1d3fb64647b89e
The Android Automerger [Wed, 6 Mar 2013 13:55:11 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Brian Carlstrom [Wed, 6 Mar 2013 09:18:59 +0000 (09:18 +0000)]
am
9043202b: am
20958207: Merge "Fix MIPS linker build"
* commit '
9043202b5bb8e0725b0302e9da9d3a57c837e798':
Fix MIPS linker build
Brian Carlstrom [Wed, 6 Mar 2013 09:17:27 +0000 (01:17 -0800)]
am
20958207: Merge "Fix MIPS linker build"
* commit '
20958207d5f9d36cc6f6b3edc4ff899c73b72b02':
Fix MIPS linker build
Brian Carlstrom [Wed, 6 Mar 2013 09:06:16 +0000 (09:06 +0000)]
Merge "Fix MIPS linker build"
Brian Carlstrom [Wed, 6 Mar 2013 09:03:25 +0000 (01:03 -0800)]
Fix MIPS linker build
(cherry-picked from
8c7d8c2057e303985f78eab96da747ddaa013c78)
Change-Id: Idcf62ab95f8fccbc2d7c3e771a4cfbe768a1555e
Elliott Hughes [Wed, 6 Mar 2013 06:44:06 +0000 (06:44 +0000)]
am
9a0b658c: am
c41dcad0: Merge "More linker cleanup."
* commit '
9a0b658c9c1f8f4492f61a75909e5ca2f05c3ac1':
More linker cleanup.
Elliott Hughes [Wed, 6 Mar 2013 06:42:33 +0000 (22:42 -0800)]
am
c41dcad0: Merge "More linker cleanup."
* commit '
c41dcad040ede2975ea63e383a8a3d36e3642d56':
More linker cleanup.
Elliott Hughes [Wed, 6 Mar 2013 06:26:55 +0000 (06:26 +0000)]
Merge "More linker cleanup."
Elliott Hughes [Wed, 6 Mar 2013 02:47:58 +0000 (18:47 -0800)]
More linker cleanup.
Change-Id: I9fb3c7c0d4b4ffef0eeaf092d4e30ffe63a08671
Brian Carlstrom [Wed, 6 Mar 2013 01:27:56 +0000 (01:27 +0000)]
am
a2cfd1a2: am
8c65a1e4: am
a2517de3: am
036f9097: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
* commit '
a2cfd1a27fe552a42d668c708d98ca3f8bee90b9':
Minor linker cleanup, primarily to use Elf32_Dyn
Brian Carlstrom [Wed, 6 Mar 2013 01:25:09 +0000 (01:25 +0000)]
am
8c65a1e4: am
a2517de3: am
036f9097: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
* commit '
8c65a1e466dae62217700065256921ba86290faa':
Minor linker cleanup, primarily to use Elf32_Dyn
Brian Carlstrom [Wed, 6 Mar 2013 01:22:25 +0000 (01:22 +0000)]
am
a2517de3: am
036f9097: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
* commit '
a2517de3844d95b5f00a4666b8dae00ef893ac24':
Minor linker cleanup, primarily to use Elf32_Dyn
Brian Carlstrom [Wed, 6 Mar 2013 01:20:35 +0000 (17:20 -0800)]
am
036f9097: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
* commit '
036f909720fd0d56dbd04b9a761fb1d0714980b0':
Minor linker cleanup, primarily to use Elf32_Dyn
Brian Carlstrom [Wed, 6 Mar 2013 01:01:23 +0000 (01:01 +0000)]
Merge "Minor linker cleanup, primarily to use Elf32_Dyn"
Brian Carlstrom [Thu, 28 Feb 2013 23:58:45 +0000 (15:58 -0800)]
Minor linker cleanup, primarily to use Elf32_Dyn
Change-Id: Ifa9408e9859c6f79444715bed4808b7c13fdced5
Elliott Hughes [Tue, 5 Mar 2013 22:29:17 +0000 (22:29 +0000)]
am
b3b00378: am
97a8217a: am
3f7b1cd3: am
be21fe7a: Merge "Upgrade to tzdata2013a."
* commit '
b3b0037884e9b0bcba787e84448815f2a4b4dccd':
Upgrade to tzdata2013a.
Elliott Hughes [Tue, 5 Mar 2013 22:25:39 +0000 (22:25 +0000)]
am
97a8217a: am
3f7b1cd3: am
be21fe7a: Merge "Upgrade to tzdata2013a."
* commit '
97a8217ae1a23a808f7bb3af2f492040e7080549':
Upgrade to tzdata2013a.
Elliott Hughes [Tue, 5 Mar 2013 22:23:45 +0000 (22:23 +0000)]
am
3f7b1cd3: am
be21fe7a: Merge "Upgrade to tzdata2013a."
* commit '
3f7b1cd3acf9990efea9f75559b2f873ab3838fe':
Upgrade to tzdata2013a.
Elliott Hughes [Tue, 5 Mar 2013 22:22:01 +0000 (14:22 -0800)]
am
be21fe7a: Merge "Upgrade to tzdata2013a."
* commit '
be21fe7a5947e24f9f0db90f8e16c54766d1237a':
Upgrade to tzdata2013a.
Elliott Hughes [Tue, 5 Mar 2013 22:19:14 +0000 (22:19 +0000)]
Merge "Upgrade to tzdata2013a."
Elliott Hughes [Tue, 5 Mar 2013 22:00:38 +0000 (14:00 -0800)]
Upgrade to tzdata2013a.
From the release notes:
Chile's 2013 rules, and we guess rules for 2014 and later, will be
the same as 2012, namely Apr Sun>=23 03:00 UTC to Sep Sun>=2 04:00 UTC.
(Thanks to Steffen Thorsen and Robert Elz.)
New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen.
(Thanks to Tobias Conradi and Arthur David Olson.)
Change-Id: I351e04b3348420ad7df7c648963c235b534033d2
Ben Cheng [Tue, 5 Mar 2013 21:24:43 +0000 (21:24 +0000)]
am
7eaed030: am
6ad68558: am
e5e6e17c: am
133d97e4: Merge "Add stack unwinding directives to memcpy."
* commit '
7eaed030deacb14a6fe628e229af6c9a3a620f3c':
Add stack unwinding directives to memcpy.
Ben Cheng [Tue, 5 Mar 2013 21:22:49 +0000 (21:22 +0000)]
am
6ad68558: am
e5e6e17c: am
133d97e4: Merge "Add stack unwinding directives to memcpy."
* commit '
6ad68558ed4429f7ab0dbad9a5bbf18aacde8362':
Add stack unwinding directives to memcpy.
Ben Cheng [Tue, 5 Mar 2013 21:20:42 +0000 (21:20 +0000)]
am
e5e6e17c: am
133d97e4: Merge "Add stack unwinding directives to memcpy."
* commit '
e5e6e17c5bd06e097c5bb4da9a23b5e293309ab9':
Add stack unwinding directives to memcpy.
Ben Cheng [Tue, 5 Mar 2013 21:17:23 +0000 (13:17 -0800)]
am
133d97e4: Merge "Add stack unwinding directives to memcpy."
* commit '
133d97e4b07a733787fb85692ad8427fdc3d1d22':
Add stack unwinding directives to memcpy.
Elliott Hughes [Tue, 5 Mar 2013 21:14:04 +0000 (21:14 +0000)]
am
136e00d6: am
c96ad9bc: am
7b69ac53: am
cf9a9604: Merge "Switch to upstream-freebsd for the unmolested wchar code."
* commit '
136e00d6e9bc19617e49a6b7bf81f749ff8a48e3':
Switch to upstream-freebsd for the unmolested wchar code.
Elliott Hughes [Tue, 5 Mar 2013 21:05:24 +0000 (21:05 +0000)]
am
c96ad9bc: am
7b69ac53: am
cf9a9604: Merge "Switch to upstream-freebsd for the unmolested wchar code."
* commit '
c96ad9bcd28fcd2b34040a2a696262057a11470b':
Switch to upstream-freebsd for the unmolested wchar code.
Ben Cheng [Tue, 5 Mar 2013 21:04:38 +0000 (21:04 +0000)]
Merge "Add stack unwinding directives to memcpy."
Elliott Hughes [Tue, 5 Mar 2013 20:28:28 +0000 (20:28 +0000)]
am
7b69ac53: am
cf9a9604: Merge "Switch to upstream-freebsd for the unmolested wchar code."
* commit '
7b69ac535abca0e7867524e68f5a3581cc367de8':
Switch to upstream-freebsd for the unmolested wchar code.
Elliott Hughes [Tue, 5 Mar 2013 20:27:09 +0000 (12:27 -0800)]
am
cf9a9604: Merge "Switch to upstream-freebsd for the unmolested wchar code."
* commit '
cf9a9604adb27600c79ca236578a8be89168202f':
Switch to upstream-freebsd for the unmolested wchar code.
Elliott Hughes [Tue, 5 Mar 2013 20:13:32 +0000 (20:13 +0000)]
Merge "Switch to upstream-freebsd for the unmolested wchar code."
The Android Open Source Project [Tue, 5 Mar 2013 15:58:51 +0000 (15:58 +0000)]
am
adff4e86: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
adff4e8630e8d468253255b521caecfbb161dbbe':
The Android Open Source Project [Tue, 5 Mar 2013 15:53:05 +0000 (07:53 -0800)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I2635d0c79d4adc135c7f0b6345547ed5e3114158
The Android Automerger [Tue, 5 Mar 2013 13:55:15 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev