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
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
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
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
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
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
Elliott Hughes
eb93ebffba
Switch to upstream-freebsd for the unmolested wchar code.
...
Change-Id: I87b4d76ff8da04109ae53638eec4f11629798960
2013-03-01 18:35:56 -08: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
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
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
Greta Yorsh
5b349fc22e
Adding memcpy tuned for Cortex-A15.
...
The strategy for large block sizes is LDRD and STRD with offset addressing,
where the main loop copies 64 bytes in every iteration, (i.e., 8 calls to
LDRD and STRD pairs), interleaving load and stores (i.e., the pairs of LDRD
and STRD of the same data are consecutive instructions), and the writeback
of an updated address is a separate instruction, which allows us to write
back the accumulated update once per iteration.
This strategy is implemented in memcpy.S. In some configurations, a plain
version of memcpy (included from memcpy-stub.c) is used instead of the
optimized one.
Validation:
* Correctness: checked memcpy using a test harness for block sizes
ranging between 1 to 128, and source and destination buffers alignment
ranging in { 0,1,2,3,4,8,12 } bytes each.
* Performance: benchmarking on Cortex-A15 FPGA indicates that this strategy
is better for A15 than the strategy used by glibc and even slightly better
than using NEON. Benchmarking on Cortex-A9 bare metal and Linux shows
that the proposed strategy is reasonable: not as fast as the version of
memcpy from glibc (which is the best open source strategy for A9), but
comparable with csl and bionic.
* Integration with GCC: no regression for arm-none-eabi --with-cpu
cortex-a15 and cortex-a9.
Change-Id: Ied56354d8992c62ae3e02d582a2bd55585d814b9
Signed-off-by: Vassilis Laganakos <vasileios.laganakos@arm.com>
2013-03-01 10:40:50 +00:00
Christopher Ferris
7c83a1ed81
Break bionic implementations into arch versions. DO NOT MERGE
...
Move arch specific code for arm, mips, x86 into separate
makefiles.
In addition, add different arm cpu versions of memcpy/memset.
Bug: 8005082
(cherry picked from commit acdde8c1cf
)
Change-Id: I0108d432af9f6283ae99adfc92a3399e5ab3e31d
2013-02-28 17:45:16 -08:00
Elliott Hughes
bfc25aa33c
am 04766565
: am 9c102ccf
: am 7fe8229b
: am 9c1912c4
: Merge "Avoid changing the C++ ABI with ssize_t."
...
* commit '04766565d3743d70f679ca180d7fcc35321143b8':
Avoid changing the C++ ABI with ssize_t.
2013-02-28 22:38:45 +00:00
Elliott Hughes
04766565d3
am 9c102ccf
: am 7fe8229b
: am 9c1912c4
: Merge "Avoid changing the C++ ABI with ssize_t."
...
* commit '9c102ccf9517637f9d293b4e52f9a40573d8fc1d':
Avoid changing the C++ ABI with ssize_t.
2013-02-28 19:46:19 +00:00
Elliott Hughes
9c102ccf95
am 7fe8229b
: am 9c1912c4
: Merge "Avoid changing the C++ ABI with ssize_t."
...
* commit '7fe8229b49ea091d769b63052247ca12280975eb':
Avoid changing the C++ ABI with ssize_t.
2013-02-28 11:44:20 -08:00
Elliott Hughes
7fe8229b49
am 9c1912c4
: Merge "Avoid changing the C++ ABI with ssize_t."
...
* commit '9c1912c4bf5eb0edc07bfd333226c4e0b7a629eb':
Avoid changing the C++ ABI with ssize_t.
2013-02-28 11:43:11 -08:00
Elliott Hughes
e255642dc1
Avoid changing the C++ ABI with ssize_t.
...
Bug: 8253769
Change-Id: Ia325003ed6e59da553e2bdde7c43515bc191b8ba
2013-02-28 10:51:31 -08:00
Sasha Levitskiy
fbae9f3c30
Bionic: Libc: Resolv: Stricter function signatures, unitialized return bug fix.
...
Stricter input parameters help avoid ugly casting when passing
pointers to immutable protobuf data.
While at it: an int return was dropped from 2 functions whose users
never used the result; one of the return paths was returning an
uninitialized value.
Size_t for portablity and warning supression, misc warnings addressed.
Change-Id: I2d5cbdaf0c9b6c4621a7d397772da13da5dc0943
2013-02-28 18:46:54 +00:00
Christopher Ferris
6e1a5cf31b
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
Change-Id: I14e0368c5bb4c3a80e72520f7cfd97e359918cce
2013-02-27 16:26:41 -08:00
Christopher Ferris
acdde8c1cf
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
Change-Id: I04f3d0715104fab618e1abf7cf8f7eec9bec79df
2013-02-26 16:04:34 -08:00
Nick Kralevich
30f1622a34
am 82f4cc5d
: am 58b997c8
: am f5f906c1
: Merge "libc: create sys/capability.h"
...
* commit '82f4cc5de495c6cc3d3736ab075ccd05285beabc':
libc: create sys/capability.h
2013-02-26 21:55:28 +00:00
Nick Kralevich
82f4cc5de4
am 58b997c8
: am f5f906c1
: Merge "libc: create sys/capability.h"
...
* commit '58b997c8121455ecb9aa1b80d7c796115149ec2a':
libc: create sys/capability.h
2013-02-26 13:51:26 -08:00
Nick Kralevich
58b997c812
am f5f906c1
: Merge "libc: create sys/capability.h"
...
* commit 'f5f906c184677b8295523231cfeead9ed94661ad':
libc: create sys/capability.h
2013-02-26 13:50:03 -08:00
Nick Kralevich
7c0dd555c0
libc: create sys/capability.h
...
Per "man capset", sys/capability.h is the appropriate header file
for the capget / capset definition, not unistd.h. Fixed.
As a short term hack, continue to include sys/capability.h in
unistd.h, until we can fix all the code which uses capget / capset.
Change-Id: I6e7cf55955d761ca785a14c5e4b7a44125d8fc15
2013-02-26 13:27:15 -08:00
Elliott Hughes
aa13eaa934
am d9cb6988
: am 406968b2
: am c0e9ddd0
: Merge "Reimplement scandir(3)."
...
* commit 'd9cb69881a062c615a8009be0a70270c70eb35da':
Reimplement scandir(3).
2013-02-25 22:58:44 +00:00
Elliott Hughes
d9cb69881a
am 406968b2
: am c0e9ddd0
: Merge "Reimplement scandir(3)."
...
* commit '406968b2444bf29e449acebdfb7ff174abd1e0ad':
Reimplement scandir(3).
2013-02-25 14:56:51 -08:00
Elliott Hughes
406968b244
am c0e9ddd0
: Merge "Reimplement scandir(3)."
...
* commit 'c0e9ddd002f6084c29c26236d741d64d01713c15':
Reimplement scandir(3).
2013-02-25 14:54:54 -08:00
Elliott Hughes
701bec2af3
Reimplement scandir(3).
...
The old scandir implementation didn't take into account the varying
size of directory entries, and didn't correctly clean up on its
error exits.
Bug: 7339844
Change-Id: Ib40e3564709752241a3119a496cbb2192e3f9abe
2013-02-25 13:14:31 -08:00
Elliott Hughes
92ce5cc4bc
am ed1068c8
: am 7b8bf681
: am f6bb5bf4
: Merge "Add the glibc-compatible names to <sys/endian.h>."
...
* commit 'ed1068c86ea0380e4b4909252367ffacc812ad57':
Add the glibc-compatible names to <sys/endian.h>.
2013-02-22 14:09:30 -08:00
Elliott Hughes
ed1068c86e
am 7b8bf681
: am f6bb5bf4
: Merge "Add the glibc-compatible names to <sys/endian.h>."
...
* commit '7b8bf68133cda6c5ff9207248b563c2f6297e22a':
Add the glibc-compatible names to <sys/endian.h>.
2013-02-22 14:06:12 -08:00
Elliott Hughes
7b8bf68133
am f6bb5bf4
: Merge "Add the glibc-compatible names to <sys/endian.h>."
...
* commit 'f6bb5bf498810d0622f66020059c87b96738c35b':
Add the glibc-compatible names to <sys/endian.h>.
2013-02-22 14:02:44 -08:00
Elliott Hughes
f6bb5bf498
Merge "Add the glibc-compatible names to <sys/endian.h>."
2013-02-22 21:46:59 +00:00
Elliott Hughes
726642cfa5
am dd843914
: am 440bc83d
: am 7b2c6385
: Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."
...
* commit 'dd8439141aeac6dc3a64e25f313d08833e1d85f5':
Fix <memory.h> to be a synonym for <string.h> like in glibc.
2013-02-22 12:16:14 -08:00
Elliott Hughes
dd8439141a
am 440bc83d
: am 7b2c6385
: Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."
...
* commit '440bc83d924fa616614b4b426da66c2893048887':
Fix <memory.h> to be a synonym for <string.h> like in glibc.
2013-02-22 12:12:45 -08:00
Elliott Hughes
440bc83d92
am 7b2c6385
: Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."
...
* commit '7b2c6385effbb6d6e98bfe29cc6c144211128d9e':
Fix <memory.h> to be a synonym for <string.h> like in glibc.
2013-02-22 12:10:15 -08:00
Nick Kralevich
bcedca25d3
am 41fb968c
: am cadc8583
: am bc0e7ee1
: Merge "libc: add sys/signal.h for compatibility"
...
* commit '41fb968c4268d080b0be4493876672efc4a71e16':
libc: add sys/signal.h for compatibility
2013-02-22 11:59:38 -08:00
Nick Kralevich
41fb968c42
am cadc8583
: am bc0e7ee1
: Merge "libc: add sys/signal.h for compatibility"
...
* commit 'cadc858329a5929911eff5f9a208229112e36a93':
libc: add sys/signal.h for compatibility
2013-02-22 11:56:39 -08:00
Nick Kralevich
cadc858329
am bc0e7ee1
: Merge "libc: add sys/signal.h for compatibility"
...
* commit 'bc0e7ee18157c2ffe65644514555689f4259ccfe':
libc: add sys/signal.h for compatibility
2013-02-22 11:53:05 -08:00
Elliott Hughes
7b2c6385ef
Merge "Fix <memory.h> to be a synonym for <string.h> like in glibc."
2013-02-22 19:49:39 +00:00
Nick Kralevich
5d36baee95
Merge "gethostbyname: fix crash"
2013-02-22 19:32:37 +00:00
Elliott Hughes
6f1b7a6407
Fix <memory.h> to be a synonym for <string.h> like in glibc.
...
Change-Id: If23589c5d85dffd28788e04b010303620fa178ca
2013-02-22 11:11:48 -08:00
Elliott Hughes
cf820d7e96
Add the glibc-compatible names to <sys/endian.h>.
...
Also remove declarations for functions that don't exist; these
are all macros.
Bug: http://code.google.com/p/android/issues/detail?id=41769
Change-Id: Ia3774ab2ff7d3c535f83774eac61068f9b11e194
2013-02-22 11:04:27 -08:00
Nick Kralevich
b22a684990
libc: add sys/signal.h for compatibility
...
Some applications look for sys/signal.h instead of signal.h.
Work around those apps.
Change-Id: I76ac7744ebc56d196b5f0cb9ed381d32817436b9
2013-02-22 10:38:28 -08:00
Nick Kralevich
bfe0640e41
Don't pass pid to dnsproxyd
...
dnsproxyd can already determine our pid by looking at our
socket connection. It's dangerous (and unneeded) to pass it
ourselves.
Change-Id: I2596d02e361b302259ddb084be2fb75be59889c5
2013-02-21 21:34:11 -08:00
Nick Kralevich
a6b24b7afb
gethostbyname: fix crash
...
When an app doesn't have the internet permission, android_open_proxy
returns NULL, causing a segfault when calling fprintf. Fixed.
Change-Id: I598855350ed0db3cc88e5ae3b400145418a3a615
2013-02-21 20:12:42 -08:00
Elliott Hughes
7dfc6a3cd1
am e974e951
: am 2a5b57db
: am 580a7073
: Merge "Stop advertising rindex(3), which is both deprecated and unimplemented."
...
* commit 'e974e951606d2efbad4bafe5edbd09c13d875f6a':
Stop advertising rindex(3), which is both deprecated and unimplemented.
2013-02-21 18:01:17 -08:00
Elliott Hughes
e974e95160
am 2a5b57db
: am 580a7073
: Merge "Stop advertising rindex(3), which is both deprecated and unimplemented."
...
* commit '2a5b57db8c711b6f33581a68cfb7b82298ad988c':
Stop advertising rindex(3), which is both deprecated and unimplemented.
2013-02-21 17:57:53 -08:00
Elliott Hughes
2a5b57db8c
am 580a7073
: Merge "Stop advertising rindex(3), which is both deprecated and unimplemented."
...
* commit '580a707376d81bfcb39919f0a1203b39a39dbd8a':
Stop advertising rindex(3), which is both deprecated and unimplemented.
2013-02-21 17:55:28 -08:00
Nick Kralevich
d470955eb5
am 72e983d6
: am 398f46dd
: am a0259b42
: Merge "libc: remove bcmp prototype"
...
* commit '72e983d62828e1db5049800b7edef5a1b0cbbcbd':
libc: remove bcmp prototype
2013-02-21 17:45:27 -08:00
Nick Kralevich
72e983d628
am 398f46dd
: am a0259b42
: Merge "libc: remove bcmp prototype"
...
* commit '398f46dd92fbb72e2a275cddccffdfde384bb3b4':
libc: remove bcmp prototype
2013-02-21 17:42:07 -08:00
Elliott Hughes
538f6fc202
Stop advertising rindex(3), which is both deprecated and unimplemented.
...
Change-Id: I3c775d9974e49c3f76a53e46e022659657b89034
2013-02-21 17:39:06 -08:00
Nick Kralevich
398f46dd92
am a0259b42
: Merge "libc: remove bcmp prototype"
...
* commit 'a0259b42eba08e6d71a274fa3f770afccbb93107':
libc: remove bcmp prototype
2013-02-21 17:39:03 -08:00
Nick Kralevich
a0259b42eb
Merge "libc: remove bcmp prototype"
2013-02-22 01:22:35 +00:00
Nick Kralevich
11ebbc8437
libc: remove bcmp prototype
...
AFAIK, bionic only ever provided an implementation of bcmp
for x86, and even then, the code was never actually compiled.
Remove the prototype.
bcmp() has been obsoleted and replaced by memcmp()
Change-Id: I549d02ab6a9241a9acbbbfade0d98a9a02c2eaee
2013-02-21 17:17:09 -08:00
Elliott Hughes
448f1f08c2
am caeb0bf5
: am 719d46f8
: am a9ff09d1
: Merge "Fix raise(3) so it works in signal handlers."
...
* commit 'caeb0bf53c8299d53f246573392fd688cae8a625':
Fix raise(3) so it works in signal handlers.
2013-02-21 15:19:55 -08:00
Elliott Hughes
caeb0bf53c
am 719d46f8
: am a9ff09d1
: Merge "Fix raise(3) so it works in signal handlers."
...
* commit '719d46f8ac4f2af89f8e8927db8c460b91622417':
Fix raise(3) so it works in signal handlers.
2013-02-21 14:21:13 -08:00
Elliott Hughes
719d46f8ac
am a9ff09d1
: Merge "Fix raise(3) so it works in signal handlers."
...
* commit 'a9ff09d1fc22292adc12cf99d4d44448d619b3cf':
Fix raise(3) so it works in signal handlers.
2013-02-21 14:17:47 -08:00
Elliott Hughes
fae89fc404
Fix raise(3) so it works in signal handlers.
...
We could special-case raise(3) in non-threaded programs, but the more
conservative course is to make pthread_kill(3) work in signal handlers
at the cost of a race shared by other C libraries.
Change-Id: I59fb23d03bdabf403435e731704b33acdf3e0234
2013-02-21 11:22:23 -08:00
Jean-Baptiste Queru
818b1423d2
Fix mako builds. Do not merge.
...
Revert "Regenerate msm_ion.h."
This reverts commit 3fac8f7f49
.
2013-02-20 12:47:58 -08:00
Elliott Hughes
cae2173952
am ccd40316
: Merge "use architecture-specific ssize_t definition"
...
* commit 'ccd403161cdcc88a0ffcaecd1bc707e2d4c88a1c':
use architecture-specific ssize_t definition
2013-02-19 14:37:19 -08:00
Elliott Hughes
77272874f8
am 593abb7b
: Merge "stdlib: atexit: include <sys/cdefs.h>"
...
* commit '593abb7b593a34d501c90512953a7368add6d185':
stdlib: atexit: include <sys/cdefs.h>
2013-02-19 14:19:33 -08:00
Thorsten Glaser
c641cafbc3
use architecture-specific ssize_t definition
...
after change 32822 was rejected, this is the more light-weight
version of the fix: libc/include/sys/types.h already - via
libc/kernel/common/linux/posix_types.h - includes a definition
of __kernel_ssize_t from libc/kernel/arch-*/asm/posix_types.h
which is architecture-specific, toolchain-agnostic and also
gets rid of the gcc -Wformat warning (which it issues correctly,
since this i̲s̲ indeed a bug in bionic)
Change-Id: Ie4503ab16628bc25815a836d07556f665e9795c7
2013-02-19 14:12:55 -08:00
Elliott Hughes
593abb7b59
Merge "stdlib: atexit: include <sys/cdefs.h>"
2013-02-19 21:58:18 +00:00
Elliott Hughes
5593d50c72
am eeecff72
: Merge "Fix pthreads functions that should return ESRCH."
...
* commit 'eeecff7293efd6becf3b07b8d24cada3d820c894':
Fix pthreads functions that should return ESRCH.
2013-02-19 13:46:37 -08:00
Elliott Hughes
9d23e04c43
Fix pthreads functions that should return ESRCH.
...
imgtec pointed out that pthread_kill(3) was broken, but most of the
other functions that ought to return ESRCH for invalid/exited threads
were equally broken.
Change-Id: I96347f6195549aee0c72dc39063e6c5d06d2e01f
2013-02-19 12:21:41 -08:00
Chirayu Desai
61ba9b526b
stdlib: atexit: include <sys/cdefs.h>
...
Change-Id: Ib9eb167710a021e0a2b5c77a06a9338cdc748e6d
2013-02-16 21:23:27 +05:30
Elliott Hughes
4174337525
am 7f67f78a
: Merge "dalvik is big enough and ugly enough to handle System.arraycopy itself."
...
* commit '7f67f78ad5c3da689997edd8fbb5afb6e5fc6355':
dalvik is big enough and ugly enough to handle System.arraycopy itself.
2013-02-15 17:00:58 -08:00
Elliott Hughes
6af19237b7
am 39804dcd
: Merge "Fix the pthread_setname_np test."
...
* commit '39804dcde6c1c596285432b28cdb09382ce59663':
Fix the pthread_setname_np test.
2013-02-15 14:48:05 -08:00
Elliott Hughes
081318e355
dalvik is big enough and ugly enough to handle System.arraycopy itself.
...
Change-Id: I4b54a15ea101c0c6bab06cfb11e4178f5a57fc05
2013-02-15 14:27:52 -08:00
Elliott Hughes
40eabe24e4
Fix the pthread_setname_np test.
...
Fix the pthread_setname_np test to take into account that emulator kernels are
so old that they don't support setting the name of other threads.
The CLONE_DETACHED thread is obsolete since 2.5 kernels.
Rename kernel_id to tid.
Fix the signature of __pthread_clone.
Clean up the clone and pthread_setname_np implementations slightly.
Change-Id: I16c2ff8845b67530544bbda9aa6618058603066d
2013-02-15 12:08:59 -08:00
Elliott Hughes
56a007c157
am 0a2cb815
: Merge "Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '0a2cb815974ea96af664fa966079966a08916722':
Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces.
2013-02-14 15:59:15 -08:00
Elliott Hughes
0a2cb81597
Merge "Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces."
2013-02-14 23:50:13 +00:00
Nick Kralevich
f93de61e7b
am b128f49f
: Merge "bionic: Add securebits.h"
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'b128f49fd58beecc5287ddff6366a97e5aa2e468':
bionic: Add securebits.h
2013-02-14 15:05:22 -08:00
Elliott Hughes
fb7eb5e07f
Simplify __stack_chk_fail, and fix it so we get debuggerd stack traces.
...
Bug: 2487269
Change-Id: Iec5e470fc22cd9108404f634a9d4baa2c7b7f58f
2013-02-14 14:37:34 -08:00
Nick Kralevich
0276656daa
bionic: Add securebits.h
...
Change-Id: I2031796b9be117558b80246498b29736492cf269
2013-02-14 14:03:37 -08:00
Elliott Hughes
7331af73f2
am c2d26ce7
: Merge "Turn on -Werror for ssp.cpp."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'c2d26ce7452e69b9492cd28b7c0271866798658b':
Turn on -Werror for ssp.cpp.
2013-02-14 11:23:48 -08:00
Elliott Hughes
dc5ec07158
Turn on -Werror for ssp.cpp.
...
libc_bionic.a is already compiled -Werror, but this one file gets
compiled into its own library because it needs to be compiled with
-fno-stack-protector.
Change-Id: I273c535ab5c73ccaccbcf793fda1f788a2589abe
2013-02-14 11:15:58 -08:00
Nick Kralevich
dfa1e59b7d
am fe33fc79
: Merge "fix compiler warning."
...
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'fe33fc790a16d85ce4109a4575d6fdcd88d42023':
fix compiler warning.
2013-02-14 09:59:09 -08:00
Nick Kralevich
a261afb7c9
fix compiler warning.
...
bionic/libc/bionic/ssp.cpp:41:31: warning: converting to non-pointer type 'uintptr_t {aka unsigned int}' from NULL [-Wconversion-null]
Change-Id: Id154ed4a99520cca64ffd3dbe4d743db6e2da28a
2013-02-14 09:44:13 -08:00
Elliott Hughes
2346559cb4
am 6b97c7dc
: Merge "ffs was not being built for x86."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '6b97c7dc0376577276abbdacc52e5cc11cf8a7fd':
ffs was not being built for x86.
2013-02-13 17:08:07 -08:00
Elliott Hughes
d2547040a1
ffs was not being built for x86.
...
Change-Id: I53e92273664a4d0a13536c2fa1aeb87e1f3cf4e8
2013-02-13 16:31:52 -08:00
Elliott Hughes
5ca3e4a349
am 95b1ea1b
: Merge "Add a bunch more missing ENDs to assembler routines."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '95b1ea1bb3c93369d96045420b91b7617992d8bd':
Add a bunch more missing ENDs to assembler routines.
2013-02-13 15:27:11 -08:00
Elliott Hughes
a7603ff87a
am 2fee0340
: Merge "Everyone has CLZ."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '2fee0340a93637507de6a860914dc3e14d44ee94':
Everyone has CLZ.
2013-02-13 15:27:10 -08:00
Elliott Hughes
6719500dbd
Add a bunch more missing ENDs to assembler routines.
...
This isn't everything; I've missed out those x86 files that are
Change-Id: Idb7bb1a68796d6c0b70ea2b5c3300e49da6c62d2
2013-02-13 15:12:32 -08:00
Elliott Hughes
73964c592c
Everyone has CLZ.
...
Even armv5 had CLZ.
Change-Id: I51bc8d1166d09940fd0d3f4c7717edf26977082c
2013-02-13 14:40:48 -08:00
Elliott Hughes
8ca1da6e71
resolved conflicts for merge of 62727429
to master
...
Change-Id: I8a3d167f3ef279a7c46cb8fb90c9477beff84d8e
2013-02-13 13:51:54 -08:00
Elliott Hughes
d8213bb573
Update getnameinfo.c, remove dead code, and fix error reporting.
...
Also add a unit test for the salen size checking.
Bug: 1889275
Change-Id: I8ec4107df9e2e9a8571e8915525249c6e44b98ad
2013-02-13 13:11:11 -08:00
Elliott Hughes
2db16ea38e
am 3002d64b
: Merge "Everyone has a TLS register."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '3002d64bcd4644456803dd0547d20b39e14be02c':
Everyone has a TLS register.
2013-02-13 08:11:24 -08:00
Elliott Hughes
32a2340067
am 9cbe1e63
: Merge "Fix __pthread_clone and __bionic_clone error handling on x86."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '9cbe1e63ddf8b61b8ded3d357a30c3d6ed67906f':
Fix __pthread_clone and __bionic_clone error handling on x86.
2013-02-13 08:11:23 -08:00
Elliott Hughes
3002d64bcd
Merge "Everyone has a TLS register."
2013-02-13 16:03:32 +00:00
Elliott Hughes
b6032515a0
Fix __pthread_clone and __bionic_clone error handling on x86.
...
Bug: 3461078
Change-Id: I93c151e27411211dd32717f206745c62c08c21ee
2013-02-12 23:02:33 -08:00
Elliott Hughes
91a9925998
Everyone has a TLS register.
...
Change-Id: Id7cdf67087aa7d5074c9c59b7e595bc391d9f146
2013-02-12 21:56:42 -08:00
Elliott Hughes
761b344bff
am 59aeff94
: Merge "Use ENTRY/END in custom x86 assembler too."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '59aeff94178e03c908791695f6dd4c9bd8c7115b':
Use ENTRY/END in custom x86 assembler too.
2013-02-12 20:17:26 -08:00
Elliott Hughes
59aeff9417
Merge "Use ENTRY/END in custom x86 assembler too."
2013-02-13 04:01:01 +00:00
Elliott Hughes
bc35693e6b
am 07f7e62a
: Merge "Clean up pthread_create."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '07f7e62a259d13208d6186670d3748e339690127':
Clean up pthread_create.
2013-02-12 18:20:10 -08:00
Elliott Hughes
4b4a882428
Clean up pthread_create.
...
Bug: 3461078
Change-Id: I082122a86d7692cd58f4145539241be026258ee0
2013-02-12 17:15:59 -08:00
Elliott Hughes
dde1d876b1
am 991ee7d8
: Merge "Simplify pthread_create, using more public API."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '991ee7d89574e8d04c8863a2850613073a2f96b3':
Simplify pthread_create, using more public API.
2013-02-12 16:52:26 -08:00
Elliott Hughes
6d33918207
Simplify pthread_create, using more public API.
...
Change-Id: I08e65ba88ed01436223e4e528631c9e41ec0e7f4
2013-02-12 16:36:04 -08:00
Elliott Hughes
f4e258c22e
am 4912782c
: Merge "Really set errno if __pthread_clone fails."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '4912782c6af7169686acc9553fb0bb33251b0d0d':
Really set errno if __pthread_clone fails.
2013-02-12 16:23:25 -08:00
Elliott Hughes
78715fca0b
am 558a8b1d
: Merge "Revert "Revert "More pthreads cleanup."""
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '558a8b1d3b31300941af78232f2f7f4cb4e933b9':
Revert "Revert "More pthreads cleanup.""
2013-02-12 16:23:24 -08:00
Elliott Hughes
9f878c2fca
Really set errno if __pthread_clone fails.
...
If r0 == 0, we're the child. If r0 > 0, we're the parent.
Otherwise set errno.
The __bionic_clone code I copy & pasted was wrong. This patch
fixes both.
Bug: 3461078
Change-Id: Ibb7d6cc7e54e666841f2f0dc59a141a0b31982e4
2013-02-12 16:07:06 -08:00
Elliott Hughes
558a8b1d3b
Merge "Revert "Revert "More pthreads cleanup."""
2013-02-13 00:05:24 +00:00
Elliott Hughes
3e898476c7
Revert "Revert "More pthreads cleanup.""
...
This reverts commit 6f94de3ca4
(Doesn't try to increase the number of TLS slots; that leads to
an inability to boot. Adds more tests.)
Change-Id: Ia7d25ba3995219ed6e686463dbba80c95cc831ca
2013-02-12 15:27:18 -08:00
Dima Zavin
ac480b422a
am 3fa67465
: Merge "add factory property file definition"
...
# By Andrew Boie
# Via Andrew Boie (1) and Gerrit Code Review (1)
* commit '3fa67465365baf87f751bea09847e32f01005788':
add factory property file definition
2013-02-12 11:12:49 -08:00
Dima Zavin
3fa6746536
Merge "add factory property file definition"
2013-02-12 18:33:26 +00:00
Elliott Hughes
191f880bdf
am bfa199ab
: am fcaf4e9f
: Merge "Revert "More pthreads cleanup.""
...
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'bfa199ab4019a7de9b95cd3db86c4d7176438803':
Revert "More pthreads cleanup."
2013-02-11 22:20:39 -08:00
Elliott Hughes
bfa199ab40
am fcaf4e9f
: Merge "Revert "More pthreads cleanup.""
...
# Via Gerrit Code Review
* commit 'fcaf4e9f9b735e053469c7ecbf63584e10fd67a7':
Revert "More pthreads cleanup."
2013-02-11 22:16:56 -08:00
Elliott Hughes
fcaf4e9f9b
Merge "Revert "More pthreads cleanup.""
2013-02-12 06:07:32 +00:00
Elliott Hughes
6f94de3ca4
Revert "More pthreads cleanup."
...
This reverts commit 2a1bb4e646
Change-Id: Ia443d0748015c8e9fc3121e40e68258616767b51
2013-02-12 06:06:22 +00:00
Elliott Hughes
23731e841a
am a2a9817f
: am 85f491f9
: Merge "More pthreads cleanup."
...
# Via Android Git Automerger (1) and others
* commit 'a2a9817f4c08d1f56d90f02ed13f531e8093f8e8':
More pthreads cleanup.
2013-02-11 18:39:32 -08:00
Elliott Hughes
a2a9817f4c
am 85f491f9
: Merge "More pthreads cleanup."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '85f491f96da3b79d0d7cc5368bc1f649e1a82340':
More pthreads cleanup.
2013-02-11 18:35:56 -08:00
Elliott Hughes
85f491f96d
Merge "More pthreads cleanup."
2013-02-12 02:33:08 +00:00
Elliott Hughes
13478d856a
am 605cc293
: am 83bf28e6
: Merge "Fix MIPS build."
...
# Via Android Git Automerger (1) and others
* commit '605cc29358c9a6d575d097fd4b78a483c9dbf89e':
Fix MIPS build.
2013-02-11 18:23:17 -08:00
Elliott Hughes
605cc29358
am 83bf28e6
: Merge "Fix MIPS build."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '83bf28e6a38dbf28707147b50d29e81f4b555046':
Fix MIPS build.
2013-02-11 18:19:34 -08:00
Elliott Hughes
0f6882f43d
am 8e2b28cb
: am c56be54a
: Merge "Use ENTRY/END in ARM __get_sp."
...
# Via Android Git Automerger (1) and others
* commit '8e2b28cb6c16d8a5671ccb333965bb56b2990d7a':
Use ENTRY/END in ARM __get_sp.
2013-02-11 18:15:13 -08:00
Elliott Hughes
a2b8b833d2
am c440d244
: am cae7b2cf
: Merge "Fix __pthread_clone on ARM to set errno on failure."
...
# Via Android Git Automerger (1) and others
* commit 'c440d2442361b78196d2935469ecf78d5c3470e5':
Fix __pthread_clone on ARM to set errno on failure.
2013-02-11 18:15:07 -08:00
Elliott Hughes
b940711587
am 03798dd2
: am 1fea0f25
: Merge "Clean up ARM assembler files to use ENTRY/END."
...
# Via Android Git Automerger (1) and others
* commit '03798dd23cd3d1dc1ee4c4b0472c75369aa1e10f':
Clean up ARM assembler files to use ENTRY/END.
2013-02-11 18:15:04 -08:00
Elliott Hughes
83bf28e6a3
Merge "Fix MIPS build."
2013-02-12 02:08:05 +00:00
Elliott Hughes
ba342c11ad
Fix MIPS build.
...
Change-Id: I4863f21f3c2fd597ea36cb7096fc72db808643a3
2013-02-11 18:06:23 -08:00
Elliott Hughes
5bb4f54b4d
am 6b73d13f
: am 2d3e7233
: Merge "Revert "Revert "Pull the pthread_key_t functions out of pthread.c."""
...
# Via Android Git Automerger (1) and others
* commit '6b73d13fa414afeecba6718bf724e8ac922bac39':
Revert "Revert "Pull the pthread_key_t functions out of pthread.c.""
2013-02-11 17:34:32 -08:00
Elliott Hughes
1b21249d5a
am e4b08318
: am 8397cdba
: Merge "Revert "Pull the pthread_key_t functions out of pthread.c.""
...
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit 'e4b08318c13fac774b233a5459427563d2983f79':
Revert "Pull the pthread_key_t functions out of pthread.c."
2013-02-11 17:34:30 -08:00
Elliott Hughes
376bce0097
am 024246ec
: am 09e89c3c
: Merge "Pull the pthread_key_t functions out of pthread.c."
...
# Via Android Git Automerger (1) and others
* commit '024246ec274e30bb4a24468d8319620534e13b34':
Pull the pthread_key_t functions out of pthread.c.
2013-02-11 17:34:29 -08:00
Elliott Hughes
8e2b28cb6c
am c56be54a
: Merge "Use ENTRY/END in ARM __get_sp."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'c56be54a18eff7e1c35c9a19cfc8b84a80780b73':
Use ENTRY/END in ARM __get_sp.
2013-02-11 17:27:40 -08:00
Elliott Hughes
bdff26df27
Use ENTRY/END in custom x86 assembler too.
...
Change-Id: Ic2e482e5daff29c65d3b2ab0b2111c996bbc6226
2013-02-11 17:08:16 -08:00
Elliott Hughes
d7a3a403c1
Use ENTRY/END in ARM __get_sp.
...
Change-Id: If2f159b266f5fa4ad9d188a17d4cd318b605e446
2013-02-11 16:58:34 -08:00
Elliott Hughes
c440d24423
am cae7b2cf
: Merge "Fix __pthread_clone on ARM to set errno on failure."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'cae7b2cfb509e7d5d10a8085b1ec319daaef768f':
Fix __pthread_clone on ARM to set errno on failure.
2013-02-11 16:55:16 -08:00
Elliott Hughes
5e3fc43dde
Fix __pthread_clone on ARM to set errno on failure.
...
MIPS and x86 appear to have been correct already.
(Also fix unit tests that ASSERT_EQ with errno so that the
arguments are in the retarded junit order.)
Bug: 3461078
Change-Id: I2418ea98927b56e15b4ba9cfec97f5e7094c6291
2013-02-11 16:39:10 -08:00
Elliott Hughes
03798dd23c
am 1fea0f25
: Merge "Clean up ARM assembler files to use ENTRY/END."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '1fea0f258a45d918fe5ae8e9769f45c0348bd095':
Clean up ARM assembler files to use ENTRY/END.
2013-02-11 16:17:48 -08:00
Elliott Hughes
f94fd3ccc6
Clean up ARM assembler files to use ENTRY/END.
...
We also don't need legacy syscall support (non-"swi 0").
Change-Id: Id1012e8ca18bf13f3f4e42200f39ba0e2e632cbf
2013-02-11 15:36:59 -08:00