Elliott Hughes
3f7b1cd3ac
am be21fe7a
: Merge "Upgrade to tzdata2013a."
...
* commit 'be21fe7a5947e24f9f0db90f8e16c54766d1237a':
Upgrade to tzdata2013a.
2013-03-05 14:22:01 -08:00
Elliott Hughes
be21fe7a59
Merge "Upgrade to tzdata2013a."
2013-03-05 22:19:14 +00:00
Elliott Hughes
69af6e61e1
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
2013-03-05 14:00:38 -08:00
Ben Cheng
fbb281b15d
am 7eaed030
: am 6ad68558
: am e5e6e17c
: am 133d97e4
: Merge "Add stack unwinding directives to memcpy."
...
* commit '7eaed030deacb14a6fe628e229af6c9a3a620f3c':
Add stack unwinding directives to memcpy.
2013-03-05 21:24:43 +00:00
Ben Cheng
7eaed030de
am 6ad68558
: am e5e6e17c
: am 133d97e4
: Merge "Add stack unwinding directives to memcpy."
...
* commit '6ad68558ed4429f7ab0dbad9a5bbf18aacde8362':
Add stack unwinding directives to memcpy.
2013-03-05 21:22:49 +00:00
Ben Cheng
6ad68558ed
am e5e6e17c
: am 133d97e4
: Merge "Add stack unwinding directives to memcpy."
...
* commit 'e5e6e17c5bd06e097c5bb4da9a23b5e293309ab9':
Add stack unwinding directives to memcpy.
2013-03-05 21:20:42 +00:00
Ben Cheng
e5e6e17c5b
am 133d97e4
: Merge "Add stack unwinding directives to memcpy."
...
* commit '133d97e4b07a733787fb85692ad8427fdc3d1d22':
Add stack unwinding directives to memcpy.
2013-03-05 13:17:23 -08:00
Elliott Hughes
c6ef78e83e
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.
2013-03-05 21:14:04 +00:00
Elliott Hughes
136e00d6e9
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.
2013-03-05 21:05:24 +00:00
Ben Cheng
133d97e4b0
Merge "Add stack unwinding directives to memcpy."
2013-03-05 21:04:38 +00:00
Elliott Hughes
c96ad9bcd2
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.
2013-03-05 20:28:28 +00:00
Elliott Hughes
7b69ac535a
am cf9a9604
: Merge "Switch to upstream-freebsd for the unmolested wchar code."
...
* commit 'cf9a9604adb27600c79ca236578a8be89168202f':
Switch to upstream-freebsd for the unmolested wchar code.
2013-03-05 12:27:09 -08:00
Elliott Hughes
cf9a9604ad
Merge "Switch to upstream-freebsd for the unmolested wchar code."
2013-03-05 20:13:33 +00:00
The Android Open Source Project
69a278f679
am adff4e86
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'adff4e8630e8d468253255b521caecfbb161dbbe':
2013-03-05 15:58:51 +00:00
The Android Open Source Project
adff4e8630
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I2635d0c79d4adc135c7f0b6345547ed5e3114158
2013-03-05 07:53:05 -08:00
The Android Automerger
ee84789761
merge in master-release history after reset to master
2013-03-05 07:49:15 -08:00
The Android Automerger
5b5aa0317c
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-05 05:55:15 -08:00
Elliott Hughes
3f794facd3
am 7ef3ccb7
: am 81e0f35a
: am 2125c155
: am d392e044
: Merge "Move realpath.c to upstream-freebsd."
...
* commit '7ef3ccb7bb5f334e4ca8911a5d0eca7dd0da6b92':
Move realpath.c to upstream-freebsd.
2013-03-04 23:59:47 +00:00
Elliott Hughes
7ef3ccb7bb
am 81e0f35a
: am 2125c155
: am d392e044
: Merge "Move realpath.c to upstream-freebsd."
...
* commit '81e0f35acc41cfafccc6d28a9122f115ca6e4a16':
Move realpath.c to upstream-freebsd.
2013-03-04 23:58:16 +00:00
Elliott Hughes
81e0f35acc
am 2125c155
: am d392e044
: Merge "Move realpath.c to upstream-freebsd."
...
* commit '2125c15506cbe9e4062d72ebb723d164e9c01c1f':
Move realpath.c to upstream-freebsd.
2013-03-04 23:56:56 +00:00
The Android Open Source Project
781c4b19f4
am 98650e04
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '98650e04e6d87e0b2c82151eacbe483ac15949d9':
Avoid changing the C++ ABI with ssize_t.
2013-03-04 19:10:07 +00:00
The Android Open Source Project
98650e04e6
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I92fd2ef799f358dd022234bc5fa7e6693f0619f0
2013-03-04 11:06:25 -08:00
Elliott Hughes
2125c15506
am d392e044
: Merge "Move realpath.c to upstream-freebsd."
...
* commit 'd392e044c7a03ff1c0903c3512d00955bc7de473':
Move realpath.c to upstream-freebsd.
2013-03-04 08:25:58 -08:00
The Android Automerger
e290a7e348
merge in master-release history after reset to master
2013-03-04 07:49:05 -08:00
The Android Automerger
2ec68f6833
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-04 05:55:08 -08:00
Elliott Hughes
eb93ebffba
Switch to upstream-freebsd for the unmolested wchar code.
...
Change-Id: I87b4d76ff8da04109ae53638eec4f11629798960
2013-03-01 18:35:56 -08:00
Elliott Hughes
d392e044c7
Merge "Move realpath.c to upstream-freebsd."
2013-03-02 01:22:04 +00:00
Christopher Ferris
0a1ab287ff
am 29cc4946
: (-s ours) Merge "Remove unused arm defines. DO NOT MERGE" into jb-mr2-dev
...
* commit '29cc4946ac8ac89fa0c49e5da8b5b328065d4b2c':
Remove unused arm defines. DO NOT MERGE
2013-03-02 01:19:47 +00:00
Christopher Ferris
29cc4946ac
Merge "Remove unused arm defines. DO NOT MERGE" into jb-mr2-dev
2013-03-02 01:16:00 +00:00
Elliott Hughes
f0777843c0
Move realpath.c to upstream-freebsd.
...
This is actually a slightly newer upstream version than the one I
originally pulled. Hopefully now it's in upstream-freebsd it will
be easier to track upstream, though I still need to sit down and
write the necessary scripts at some point.
Bug: 5110679
Change-Id: I87e563f0f95aa8e68b45578e2a8f448bbf827a33
2013-03-01 17:11:39 -08:00
Christopher Ferris
947b3ab02b
Remove unused arm defines. DO NOT MERGE
...
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
(cherry picked from commit 6e1a5cf31b
)
Change-Id: I69654d47db1458136782b5504290f620e924ee75
2013-03-01 16:54:56 -08:00
Ben Cheng
14283004f5
Add stack unwinding directives to memcpy.
...
Also include some Android specific header files.
Change-Id: Idbcbd43458ba945ca8c61bfbc04ea15fc0ae4e00
2013-03-01 14:56:04 -08:00
Ben Cheng
f85e173616
am b9ef7f4e
: am 52b3aed7
: am c5c6cb3f
: am 66273ac2
: Merge "Adding strcmp tuned for Cortex-A15."
...
* commit 'b9ef7f4e122bee55110ac703f391ab961484f3d8':
Adding strcmp tuned for Cortex-A15.
2013-03-01 18:34:45 +00:00
Ben Cheng
89d7f5e482
am ae280bcd
: am 55fc93a9
: am 8f149da0
: am b3b1ab62
: Merge "Adding memcpy tuned for Cortex-A15."
...
* commit 'ae280bcdbee8d31096c1b332b20fa32f941ef12f':
Adding memcpy tuned for Cortex-A15.
2013-03-01 18:34:45 +00:00
Nick Kralevich
1f415124ec
am 04190c53
: am cc646773
: am 305a9995
: am 8fa924e5
: Merge "unistd.h: don\'t include sys/capability.h"
...
* commit '04190c53e3ac2958322a603d7bfb9b07b92d595e':
unistd.h: don't include sys/capability.h
2013-03-01 18:34:44 +00:00
Ben Cheng
b9ef7f4e12
am 52b3aed7
: am c5c6cb3f
: am 66273ac2
: Merge "Adding strcmp tuned for Cortex-A15."
...
* commit '52b3aed7982e9d68aad0652f54d5ee180ddf1c5a':
Adding strcmp tuned for Cortex-A15.
2013-03-01 18:28:25 +00:00
Ben Cheng
ae280bcdbe
am 55fc93a9
: am 8f149da0
: am b3b1ab62
: Merge "Adding memcpy tuned for Cortex-A15."
...
* commit '55fc93a90961022e38ef0bb63bcb81d2b4e5aef6':
Adding memcpy tuned for Cortex-A15.
2013-03-01 18:28:25 +00:00
Nick Kralevich
04190c53e3
am cc646773
: am 305a9995
: am 8fa924e5
: Merge "unistd.h: don\'t include sys/capability.h"
...
* commit 'cc64677342209d38f88138c03d3ded0e1d61637c':
unistd.h: don't include sys/capability.h
2013-03-01 18:28:24 +00:00
Ben Cheng
52b3aed798
am c5c6cb3f
: am 66273ac2
: Merge "Adding strcmp tuned for Cortex-A15."
...
* commit 'c5c6cb3f13642386e08acf687b4bc39f568bad0c':
Adding strcmp tuned for Cortex-A15.
2013-03-01 10:26:52 -08:00
Ben Cheng
55fc93a909
am 8f149da0
: am b3b1ab62
: Merge "Adding memcpy tuned for Cortex-A15."
...
* commit '8f149da08dc3125824e168f8d29613be80b2085c':
Adding memcpy tuned for Cortex-A15.
2013-03-01 10:26:52 -08:00
Nick Kralevich
cc64677342
am 305a9995
: am 8fa924e5
: Merge "unistd.h: don\'t include sys/capability.h"
...
* commit '305a999589a8dfde077589106853522d483d24d2':
unistd.h: don't include sys/capability.h
2013-03-01 10:26:51 -08:00
Ben Cheng
c5c6cb3f13
am 66273ac2
: Merge "Adding strcmp tuned for Cortex-A15."
...
* commit '66273ac2b6b8c2042350204575bd290d96dea681':
Adding strcmp tuned for Cortex-A15.
2013-03-01 10:24:58 -08:00
Ben Cheng
8f149da08d
am b3b1ab62
: Merge "Adding memcpy tuned for Cortex-A15."
...
* commit 'b3b1ab6213df15f99c9af3088cfe733428816fd3':
Adding memcpy tuned for Cortex-A15.
2013-03-01 10:24:58 -08:00
Nick Kralevich
305a999589
am 8fa924e5
: Merge "unistd.h: don\'t include sys/capability.h"
...
* commit '8fa924e5dff4588cca8586e0e727b9a544db7083':
unistd.h: don't include sys/capability.h
2013-03-01 10:24:57 -08:00
Ben Cheng
66273ac2b6
Merge "Adding strcmp tuned for Cortex-A15."
2013-03-01 18:18:34 +00:00
Ben Cheng
b3b1ab6213
Merge "Adding memcpy tuned for Cortex-A15."
2013-03-01 18:18:05 +00:00
Nick Kralevich
8fa924e5df
Merge "unistd.h: don't include sys/capability.h"
2013-03-01 18:14:47 +00:00
Nick Kralevich
6524d3cad7
unistd.h: don't include sys/capability.h
...
Don't pull in unnecessary header files. AFAIK, I've fixed all
the code which didn't include the correct header files.
Change-Id: If0b7bba74e77cb24a0cf9ce8968aa07400855e58
2013-03-01 10:10:55 -08:00
The Android Automerger
424f21b6a7
merge in master-release history after reset to master
2013-03-01 07:49:10 -08:00
Greta Yorsh
eb149e954e
Adding strcmp tuned for Cortex-A15.
...
The attached patch provides a new implementation of strcmp for ARM,
using LDRD instead of LDR whenever possible.
For older architectures that do not support LDRD, this implementation
uses the same algorithm as before.
Testing and benchmarking:
* Validation: successfully passes a test that compares different strings
of length 1-128 and offsets 0-8 from a word boundary. Checked on
qemu/A15/A9, ARM/Thumb mode, Big/Little Endian.
* Integration with gcc: no regression on qemu for arm-none-eabi --with-cpu
a15/a9 --with-mode arm/thumb.
Change-Id: I9e230e1b99dbdc9119b69ee858a89038c516a4ea
Signed-off-by: Vassilis Laganakos <vasileios.laganakos@arm.com>
2013-03-01 10:41:01 +00:00