Christopher Ferris
9e01ea63a7
Fix dprintf test.
...
Change-Id: Ied783d545b6a35a70a158249f3957a9d00971627
2014-05-29 13:17:40 -07:00
Elliott Hughes
dafa59b8ff
am 4dd0b72d
: Merge "Return the actual success result from __futex."
...
* commit '4dd0b72dd36f3d9afd6bf0c184866f0d9242084f':
Return the actual success result from __futex.
2014-05-29 20:14:35 +00:00
Elliott Hughes
4dd0b72dd3
Merge "Return the actual success result from __futex."
2014-05-29 20:12:06 +00:00
Christopher Ferris
deb1ec4aaa
am 47150dca
: am 1a57de71
: Merge "Fix overflow testing in sbrk."
...
* commit '47150dca59e63899843182237775628677ec4af3':
Fix overflow testing in sbrk.
2014-05-29 18:10:10 +00:00
Christopher Ferris
47150dca59
am 1a57de71
: Merge "Fix overflow testing in sbrk."
...
* commit '1a57de713adfb81842cb2ebdfc051ecb9afa55f1':
Fix overflow testing in sbrk.
2014-05-29 18:06:46 +00:00
Christopher Ferris
1a57de713a
Merge "Fix overflow testing in sbrk."
2014-05-29 18:03:28 +00:00
Christopher Ferris
738b0cc5e9
Fix overflow testing in sbrk.
...
Modify the overflow testing for sbrk.
Bug: 15188366
Change-Id: Ia83f85f7c1789454d872279bd41f38f1ce6b8a34
2014-05-29 10:51:22 -07:00
Elliott Hughes
1ee46520ca
Return the actual success result from __futex.
...
futex(2) can return non-zero successes.
Bug: 15195455
Change-Id: I7818bc922a5a2df31228ff72c169320b5e69a544
2014-05-29 10:27:55 -07:00
Elliott Hughes
dd4489bfbe
am 4843fab2
: am ad73e2f5
: am ef023873
: Merge "Minor style cleanup of some code I had to look at."
...
* commit '4843fab2ee025fae5e04d84dd687e507fc4e99f0':
Minor style cleanup of some code I had to look at.
2014-05-29 16:23:08 +00:00
Elliott Hughes
864b926026
am 8a00b45d
: am c3930812
: am 0bdd668f
: Merge "Upgrade to tzdata2014d."
...
* commit '8a00b45d601d6e9a5a7ab63544f66267ed1a857b':
Upgrade to tzdata2014d.
2014-05-29 16:23:07 +00:00
Elliott Hughes
4843fab2ee
am ad73e2f5
: am ef023873
: Merge "Minor style cleanup of some code I had to look at."
...
* commit 'ad73e2f58ca672ee8b7c19a1c993b829a43dd89c':
Minor style cleanup of some code I had to look at.
2014-05-29 16:19:40 +00:00
Elliott Hughes
8a00b45d60
am c3930812
: am 0bdd668f
: Merge "Upgrade to tzdata2014d."
...
* commit 'c3930812df525ab6b2e68272903e332d6ee7a7d1':
Upgrade to tzdata2014d.
2014-05-29 16:19:39 +00:00
Elliott Hughes
ad73e2f58c
am ef023873
: Merge "Minor style cleanup of some code I had to look at."
...
* commit 'ef023873e2bbd83f4fde69fd427e04ef1eb6e769':
Minor style cleanup of some code I had to look at.
2014-05-29 16:15:52 +00:00
Elliott Hughes
c3930812df
am 0bdd668f
: Merge "Upgrade to tzdata2014d."
...
* commit '0bdd668f05b22b44547a2b9f05e506166b22f02a':
Upgrade to tzdata2014d.
2014-05-29 16:15:51 +00:00
Elliott Hughes
ef023873e2
Merge "Minor style cleanup of some code I had to look at."
2014-05-29 16:12:02 +00:00
Elliott Hughes
0bdd668f05
Merge "Upgrade to tzdata2014d."
2014-05-29 16:09:40 +00:00
Elliott Hughes
b7f136a01f
Upgrade to tzdata2014d.
...
There are no substantive changes to the data in this release. I'm applying
this just for completeness.
Change-Id: Ibe953969cb16db4d8d1ddb7dd3c943316e6e46b4
2014-05-28 20:33:33 -07:00
Elliott Hughes
624996026b
Minor style cleanup of some code I had to look at.
...
(It turns out that this is the only place we're saying __inline in C++.)
Change-Id: I8095e67a385087817c47caab9a621f82f8e0cfc8
2014-05-28 20:30:40 -07:00
Elliott Hughes
49d1ce63d9
am 275906e4
: am 3388c7be
: am fae42a83
: Merge "Revert "Revert "Lose the hand-written futex assembler."""
...
* commit '275906e4b08062e50dbd0b1938a9a1379f577649':
Revert "Revert "Lose the hand-written futex assembler.""
2014-05-29 03:22:03 +00:00
Elliott Hughes
275906e4b0
am 3388c7be
: am fae42a83
: Merge "Revert "Revert "Lose the hand-written futex assembler."""
...
* commit '3388c7be52e087256862171a5abdc9ceacf54e9d':
Revert "Revert "Lose the hand-written futex assembler.""
2014-05-29 03:19:41 +00:00
Elliott Hughes
3388c7be52
am fae42a83
: Merge "Revert "Revert "Lose the hand-written futex assembler."""
...
* commit 'fae42a837ae7f880de9561c7b3c2b18e4a531e90':
Revert "Revert "Lose the hand-written futex assembler.""
2014-05-29 03:16:18 +00:00
Elliott Hughes
fae42a837a
Merge "Revert "Revert "Lose the hand-written futex assembler."""
2014-05-29 03:13:23 +00:00
Elliott Hughes
b30aff405a
Revert "Revert "Lose the hand-written futex assembler.""
...
The problem with the original patch was that using syscall(3) means that
errno can be set, but pthread_create(3) was abusing the TLS errno slot as
a pthread_mutex_t for the thread startup handshake.
There was also a mistake in the check for syscall failures --- it should
have checked against -1 instead of 0 (not just because that's the default
idiom, but also here because futex(2) can legitimately return values > 0).
This patch stops abusing the TLS errno slot and adds a pthread_mutex_t to
pthread_internal_t instead. (Note that for LP64 sizeof(pthread_mutex_t) >
sizeof(uintptr_t), so we could potentially clobber other TLS slots too.)
I've also rewritten the LP32 compatibility stubs to directly reuse the
code from the .h file.
This reverts commit 75c55ff84e
.
Bug: 15195455
Change-Id: I6ffb13e5cf6a35d8f59f692d94192aae9ab4593d
2014-05-28 18:31:15 -07:00
Dan Albert
213524ad06
am 1875a51c
: am c8d59fae
: am 32c8ae9d
: Merge "Fixes stdatomic.h test to match C11 spec"
...
* commit '1875a51c51517c559dde901d61d5dd4f00e80c14':
Fixes stdatomic.h test to match C11 spec
2014-05-29 00:59:25 +00:00
Dan Albert
1875a51c51
am c8d59fae
: am 32c8ae9d
: Merge "Fixes stdatomic.h test to match C11 spec"
...
* commit 'c8d59fae72fb95fd7034ccf42664711849ed497f':
Fixes stdatomic.h test to match C11 spec
2014-05-29 00:55:47 +00:00
Dan Albert
c8d59fae72
am 32c8ae9d
: Merge "Fixes stdatomic.h test to match C11 spec"
...
* commit '32c8ae9de0e51ac64efcfd2e5da34382deee959e':
Fixes stdatomic.h test to match C11 spec
2014-05-29 00:52:18 +00:00
Dan Albert
32c8ae9de0
Merge "Fixes stdatomic.h test to match C11 spec"
2014-05-29 00:50:26 +00:00
Dan Albert
6b3beb23d6
Fixes stdatomic.h test to match C11 spec
...
C11 defines the expected value to atomic_compare_exchange_* as being non-atomic
types. Using an atomic type is a syntax error in clang.
http://en.cppreference.com/w/c/atomic/atomic_compare_exchange
Change-Id: I74de1061fa1fc50d835451792d902000f368200e
2014-05-28 16:53:08 -07:00
Dan Albert
cd4e99048a
am e4f5ae5d
: am c51e9208
: am dc3fb119
: Merge "Updated ambiguous comment in pthread_mutex_lock."
...
* commit 'e4f5ae5d54865d6f61a32eeba6af846550d2a254':
Updated ambiguous comment in pthread_mutex_lock.
2014-05-28 22:18:10 +00:00
Christopher Ferris
48c544f1c2
am 02d1cfb3
: am fa204cf0
: am 8a405b02
: Merge "Add optimized AArch64 versions of bcopy and wmemmove based on memmove"
...
* commit '02d1cfb366b461d4c64cc87fc0f48bc3eae5fd92':
Add optimized AArch64 versions of bcopy and wmemmove based on memmove
2014-05-28 22:17:56 +00:00
Dan Albert
e4f5ae5d54
am c51e9208
: am dc3fb119
: Merge "Updated ambiguous comment in pthread_mutex_lock."
...
* commit 'c51e92086a574c7209b8310925212f06eaa6ba20':
Updated ambiguous comment in pthread_mutex_lock.
2014-05-28 22:13:22 +00:00
Dan Albert
c51e92086a
am dc3fb119
: Merge "Updated ambiguous comment in pthread_mutex_lock."
...
* commit 'dc3fb119497382fc8d9c3b87c5ef8321141330dc':
Updated ambiguous comment in pthread_mutex_lock.
2014-05-28 22:10:22 +00:00
Dan Albert
dc3fb11949
Merge "Updated ambiguous comment in pthread_mutex_lock."
2014-05-28 22:00:50 +00:00
Christopher Ferris
02d1cfb366
am fa204cf0
: am 8a405b02
: Merge "Add optimized AArch64 versions of bcopy and wmemmove based on memmove"
...
* commit 'fa204cf030d79e65851cdd13ff5c073e5b5fd2ac':
Add optimized AArch64 versions of bcopy and wmemmove based on memmove
2014-05-28 21:41:40 +00:00
Christopher Ferris
fa204cf030
am 8a405b02
: Merge "Add optimized AArch64 versions of bcopy and wmemmove based on memmove"
...
* commit '8a405b027a9c8b3a614016f4824a03fa252e9e1e':
Add optimized AArch64 versions of bcopy and wmemmove based on memmove
2014-05-28 21:38:01 +00:00
Christopher Ferris
8a405b027a
Merge "Add optimized AArch64 versions of bcopy and wmemmove based on memmove"
2014-05-28 21:35:04 +00:00
Brigid Smith
ff03a7aaad
Updated ambiguous comment in pthread_mutex_lock.
...
The comment used the phrase "normal case" when it more specifically refers to the "recursive case," so I changed it to that.
Change-Id: I8335cce4dee933c6a463aee653b28bd986b5b5e4
2014-05-28 11:48:49 -07:00
Narayan Kamath
dc3178707d
am adb1ec50
: am 784254f2
: am 52f74322
: Merge "Revert "Lose the hand-written futex assembler.""
...
* commit 'adb1ec509e4866eab1f0a7fb8b99dd31e5d8e23f':
Revert "Lose the hand-written futex assembler."
2014-05-28 18:14:34 +00:00
Calin Juravle
15627c1016
am c3f22810
: am 7ca4d736
: am 53e70fe3
: Merge "Remove unnecessary padding in ucontext_t"
...
* commit 'c3f228103f0ff855214e0d15d51a26da7723d3b6':
Remove unnecessary padding in ucontext_t
2014-05-28 18:10:34 +00:00
Narayan Kamath
adb1ec509e
am 784254f2
: am 52f74322
: Merge "Revert "Lose the hand-written futex assembler.""
...
* commit '784254f28ed3e3b40889d060ccbc176361d70dc9':
Revert "Lose the hand-written futex assembler."
2014-05-28 18:08:39 +00:00
Narayan Kamath
784254f28e
am 52f74322
: Merge "Revert "Lose the hand-written futex assembler.""
...
* commit '52f74322b1d72d57146107f32ee2c76c421bf4b1':
Revert "Lose the hand-written futex assembler."
2014-05-28 18:06:05 +00:00
Narayan Kamath
52f74322b1
Merge "Revert "Lose the hand-written futex assembler.""
2014-05-28 18:04:26 +00:00
Narayan Kamath
75c55ff84e
Revert "Lose the hand-written futex assembler."
...
This reverts commit ced906c849
.
Causes issues on art / dalvik due to a broken return value
check and other undiagnosed issues.
bug: 15195455
Change-Id: I5d6bbb389ecefb0e33a5237421a9d56d32a9317c
2014-05-28 18:03:01 +00:00
Elliott Hughes
0ba998b3c3
am 44445f2d
: am ab4c4686
: am 7fdde4a5
: Merge "Expose __srefill for LP64 until we can fix the NDK."
...
* commit '44445f2d51e946f6ba14101058a1cc6157f2e185':
Expose __srefill for LP64 until we can fix the NDK.
2014-05-28 18:02:08 +00:00
Calin Juravle
c3f228103f
am 7ca4d736
: am 53e70fe3
: Merge "Remove unnecessary padding in ucontext_t"
...
* commit '7ca4d73644284a7ffce83ba62923e46c0a29ab64':
Remove unnecessary padding in ucontext_t
2014-05-28 17:54:08 +00:00
Calin Juravle
7ca4d73644
am 53e70fe3
: Merge "Remove unnecessary padding in ucontext_t"
...
* commit '53e70fe30646453a5deba0730337cb9674cd6fc8':
Remove unnecessary padding in ucontext_t
2014-05-28 17:50:43 +00:00
Calin Juravle
53e70fe306
Merge "Remove unnecessary padding in ucontext_t"
2014-05-28 17:48:06 +00:00
Calin Juravle
bdca3802c9
Remove unnecessary padding in ucontext_t
...
- removed extra padding from ucontex_t on x86, x86_64 and mips
- force ucontext_t struct to use 64 bits for the sigmask on all arches
(previsouly wrong since sigset_t on arm and x86 is only 32 bits)
- arm and arm64 continue to use padding to match glibc sigset_t
This brings Bionic on par with the kernel w.r.t ucontext padding.
Bug: 12828904
Change-Id: Ia8915ace694ecb4695603a334e697985f4c3e7aa
2014-05-28 17:24:28 +01:00
Elliott Hughes
44445f2d51
am ab4c4686
: am 7fdde4a5
: Merge "Expose __srefill for LP64 until we can fix the NDK."
...
* commit 'ab4c46863d32daf6ed5c98a101317c0108071c1d':
Expose __srefill for LP64 until we can fix the NDK.
2014-05-28 09:15:56 +00:00
Elliott Hughes
ab4c46863d
am 7fdde4a5
: Merge "Expose __srefill for LP64 until we can fix the NDK."
...
* commit '7fdde4a58b304a7c4f87987f3fde16bdded63a76':
Expose __srefill for LP64 until we can fix the NDK.
2014-05-28 05:22:38 +00:00