OSDN Git Service
Elliott Hughes [Fri, 6 Jun 2014 18:33:03 +0000 (18:33 +0000)]
Merge "Use __libc_fatal() for failed malloc in new" into lmp-preview-dev
Dan Albert [Fri, 30 May 2014 23:00:53 +0000 (16:00 -0700)]
Use __libc_fatal() for failed malloc in new
This way we can print a useful message to the log isntead of just dying
mysteriously.
(cherry picked from commit
989725940e765f0065b2bc06b881cde864b62595)
Bug:
13564922
Change-Id: I704e1263ec1e7556808348b821a20bacc934eb4a
Elliott Hughes [Thu, 5 Jun 2014 19:28:14 +0000 (12:28 -0700)]
Fix unwinding through x86-64 __bionic_clone.
x86-64 needs these CFI directives to stop unwinding here.
I've also cleaned up the assembler a little, and made x86 and x86-64
a little more alike.
Bug:
15195760
(cherry picked from commit
aeb3016f8132689d1b49d30056005b667e3d2d0e)
Change-Id: I511fe238b1ef1a1c16aef735f93bbee9accb0689
Elliott Hughes [Tue, 3 Jun 2014 21:45:17 +0000 (14:45 -0700)]
DO NOT MERGE fdprintf backward compatibility shim.
Fixes LP64 build.
Change-Id: Ic76005cd1f5a55344ea8ee3d070d25631d011037
Elliott Hughes [Fri, 30 May 2014 04:03:15 +0000 (21:03 -0700)]
DO NOT MERGE Fix lmp-preview-dev after bionic merge.
Other projects in lmp-preview-dev are out of date, and it's easier to patch
bionic than to fix all of them.
(cherry picked from commit
a856c6f543c71f6778cdb9b39f6049ae8b2c4e53)
Change-Id: Id8fbdf35eb55150579f85b7bdddb5d68d3012218
Christopher Ferris [Mon, 2 Jun 2014 22:27:02 +0000 (15:27 -0700)]
Merge remote-tracking branch 'goog/master' into merge
Elliott Hughes [Mon, 2 Jun 2014 17:55:53 +0000 (17:55 +0000)]
am
016074f6: am
987bd5c6: am
2deef73f: Merge "Avoid a system call in \'gettid\'."
* commit '
016074f6beec46fa2140e2cabd11ade488776402':
Avoid a system call in 'gettid'.
Elliott Hughes [Mon, 2 Jun 2014 17:52:28 +0000 (17:52 +0000)]
am
987bd5c6: am
2deef73f: Merge "Avoid a system call in \'gettid\'."
* commit '
987bd5c64f1381185f27afb60ec46be5e9eaba36':
Avoid a system call in 'gettid'.
Elliott Hughes [Mon, 2 Jun 2014 17:48:53 +0000 (17:48 +0000)]
am
2deef73f: Merge "Avoid a system call in \'gettid\'."
* commit '
2deef73fe1e9dbf57b683a15fd1e0c2922e6ecc0':
Avoid a system call in 'gettid'.
Elliott Hughes [Mon, 2 Jun 2014 17:43:27 +0000 (17:43 +0000)]
Merge "Avoid a system call in 'gettid'."
Elliott Hughes [Sat, 31 May 2014 02:00:03 +0000 (19:00 -0700)]
Avoid a system call in 'gettid'.
System calls can be pretty slow. This is mako, which has one of our
lowest latencies:
iterations ns/op
BM_unistd_getpid
10000000 209
BM_unistd_gettid
200000000 8
Bug:
15297299 (kernel panic from too many gettid calls)
Bug:
15315766 (excessive gettid overhead in liblogd)
Change-Id: I49656c0fc5b5d092390264a59e4f2c0d8a8b1aeb
Dmitriy Ivanov [Sat, 31 May 2014 01:35:30 +0000 (01:35 +0000)]
am
109e3b16: am
5f29c328: am
831405b7: Merge "Make atexit.dlclose work for glibc"
* commit '
109e3b16137d17d68e2b1a02ce1df054d13c283a':
Make atexit.dlclose work for glibc
Dmitriy Ivanov [Sat, 31 May 2014 01:33:06 +0000 (01:33 +0000)]
am
5f29c328: am
831405b7: Merge "Make atexit.dlclose work for glibc"
* commit '
5f29c32844d8997d65a4ac8e8d9efa7903d6f83a':
Make atexit.dlclose work for glibc
Dmitriy Ivanov [Sat, 31 May 2014 01:31:26 +0000 (01:31 +0000)]
am
831405b7: Merge "Make atexit.dlclose work for glibc"
* commit '
831405b749d15a11fb947a40d61fd858e952d860':
Make atexit.dlclose work for glibc
Dmitriy Ivanov [Sat, 31 May 2014 01:28:32 +0000 (01:28 +0000)]
Merge "Make atexit.dlclose work for glibc"
Dmitriy Ivanov [Sat, 31 May 2014 01:03:26 +0000 (18:03 -0700)]
Make atexit.dlclose work for glibc
* build libtest_atexit.so
* remove atexit(NULL) - glibc segfaults on it
Bug:
15350494
Change-Id: I27d79130c32c5691b0e8790a57d92f9710f5bf4a
Christopher Ferris [Sat, 31 May 2014 00:50:18 +0000 (00:50 +0000)]
am
a59d22ef: am
bd1ec44c: am
66b5e6b6: Merge "Do not run dlclose test on glibc."
* commit '
a59d22efce6f1a2003d8c54be72853e18f6315a0':
Do not run dlclose test on glibc.
Christopher Ferris [Sat, 31 May 2014 00:46:00 +0000 (00:46 +0000)]
am
bd1ec44c: am
66b5e6b6: Merge "Do not run dlclose test on glibc."
* commit '
bd1ec44cc5ef01c125fe2b61871927561a43b444':
Do not run dlclose test on glibc.
Christopher Ferris [Sat, 31 May 2014 00:43:52 +0000 (00:43 +0000)]
am
66b5e6b6: Merge "Do not run dlclose test on glibc."
* commit '
66b5e6b609f16062262b777905bdd2305a941596':
Do not run dlclose test on glibc.
Christopher Ferris [Sat, 31 May 2014 00:41:37 +0000 (00:41 +0000)]
Merge "Do not run dlclose test on glibc."
Elliott Hughes [Fri, 30 May 2014 23:07:32 +0000 (23:07 +0000)]
am
df2e70f3: am
d3f2a204: am
7a5732bd: Merge "Add some missing __noreturn attributes."
* commit '
df2e70f39036cab8bcbf8c238f39b21f83b32d8d':
Add some missing __noreturn attributes.
Elliott Hughes [Fri, 30 May 2014 23:05:08 +0000 (23:05 +0000)]
am
d3f2a204: am
7a5732bd: Merge "Add some missing __noreturn attributes."
* commit '
d3f2a204b7faa52b086c85736aa2449d8a83c547':
Add some missing __noreturn attributes.
Elliott Hughes [Fri, 30 May 2014 23:01:01 +0000 (23:01 +0000)]
am
7a5732bd: Merge "Add some missing __noreturn attributes."
* commit '
7a5732bd83c64489b9bd953f49fb6ad3b420126c':
Add some missing __noreturn attributes.
Elliott Hughes [Fri, 30 May 2014 22:58:41 +0000 (22:58 +0000)]
Merge "Add some missing __noreturn attributes."
Elliott Hughes [Fri, 30 May 2014 21:49:00 +0000 (14:49 -0700)]
Add some missing __noreturn attributes.
This is more honest, and lets us remove a hack.
Change-Id: I309f064743ded5248573ccafc379f78d417db08d
Elliott Hughes [Fri, 30 May 2014 21:50:51 +0000 (21:50 +0000)]
am
8db7b4b5: am
f306c414: am
3a3b27e0: Merge "x86: stop unwinding past __bionic_clone."
* commit '
8db7b4b54ca28f6c80115c43a83323f562d275b7':
x86: stop unwinding past __bionic_clone.
Elliott Hughes [Fri, 30 May 2014 21:47:24 +0000 (21:47 +0000)]
am
f306c414: am
3a3b27e0: Merge "x86: stop unwinding past __bionic_clone."
* commit '
f306c414eb22cf5e80f61f1b26ceafbb3296c651':
x86: stop unwinding past __bionic_clone.
Elliott Hughes [Fri, 30 May 2014 21:43:47 +0000 (21:43 +0000)]
am
3a3b27e0: Merge "x86: stop unwinding past __bionic_clone."
* commit '
3a3b27e04df395b789b92af3d0ed05d2a0f3bf04':
x86: stop unwinding past __bionic_clone.
Elliott Hughes [Fri, 30 May 2014 21:40:28 +0000 (21:40 +0000)]
Merge "x86: stop unwinding past __bionic_clone."
Christopher Ferris [Fri, 30 May 2014 18:23:21 +0000 (11:23 -0700)]
Do not run dlclose test on glibc.
The support library for this test is not built for host by default.
Even if the support library is built, the test segfaults on glibc.
Change-Id: I9cb7a364c59b55d4bf5d8634293037cd9bae020b
Elliott Hughes [Fri, 30 May 2014 18:15:32 +0000 (11:15 -0700)]
x86: stop unwinding past __bionic_clone.
The apparent "previous" frame is on another thread's stack.
Bug:
14270816
Bug:
15195760
Change-Id: I884f370e116203c5fa3b05a75fb8f356537261c4
Elliott Hughes [Fri, 30 May 2014 11:24:05 +0000 (11:24 +0000)]
am
a856c6f5: (-s ours) DO NOT MERGE Fix lmp-preview-dev after bionic merge.
* commit '
a856c6f543c71f6778cdb9b39f6049ae8b2c4e53':
DO NOT MERGE Fix lmp-preview-dev after bionic merge.
Elliott Hughes [Fri, 30 May 2014 04:05:29 +0000 (04:05 +0000)]
am
79e7c0a9: Merge remote-tracking branch \'goog/master\' into merge-from-master
* commit '
79e7c0a98e0ffd5af09dac4d6ab7a7449b93b472':
Elliott Hughes [Fri, 30 May 2014 04:03:15 +0000 (21:03 -0700)]
DO NOT MERGE Fix lmp-preview-dev after bionic merge.
Other projects in lmp-preview-dev are out of date, and it's easier to patch
bionic than to fix all of them.
Change-Id: Id55c3da7259ba0bb5e62462d5eca721d3716c07f
Christopher Ferris [Fri, 30 May 2014 04:02:56 +0000 (04:02 +0000)]
am
bb385e6f: am
69371ef1: am
1672b056: Merge "Fix unwinding_through_signal_frame test."
* commit '
bb385e6f90d7f32735626117923b37e6d29bc21d':
Fix unwinding_through_signal_frame test.
Christopher Ferris [Fri, 30 May 2014 03:59:22 +0000 (03:59 +0000)]
am
69371ef1: am
1672b056: Merge "Fix unwinding_through_signal_frame test."
* commit '
69371ef1cc43c471cc4ff35435042a58720edda5':
Fix unwinding_through_signal_frame test.
Christopher Ferris [Fri, 30 May 2014 03:55:51 +0000 (03:55 +0000)]
am
1672b056: Merge "Fix unwinding_through_signal_frame test."
* commit '
1672b0563693eaaf92db4f304308d456a6102e64':
Fix unwinding_through_signal_frame test.
Christopher Ferris [Fri, 30 May 2014 03:53:00 +0000 (03:53 +0000)]
Merge "Fix unwinding_through_signal_frame test."
Christopher Ferris [Fri, 30 May 2014 03:00:12 +0000 (20:00 -0700)]
Fix unwinding_through_signal_frame test.
I accidentally removed the compilcation of the test implementation file
with special flags needed for the test to work. This change creates the
impl as a library with those flags back.
Bug:
14819262
Change-Id: Ib84fd26a7f4d40a0267d3ed686185b0abc5a3706
Christopher Ferris [Fri, 30 May 2014 02:29:08 +0000 (02:29 +0000)]
am
1a3a9d4d: am
e4068e33: am
94170742: Merge "Fix x86 cfi directives for syscalls."
* commit '
1a3a9d4d99557021a77d2d903775adabb24560f4':
Fix x86 cfi directives for syscalls.
Christopher Ferris [Fri, 30 May 2014 02:26:17 +0000 (02:26 +0000)]
am
e4068e33: am
94170742: Merge "Fix x86 cfi directives for syscalls."
* commit '
e4068e3399d6d572d2f9bd7f925f080a74122d60':
Fix x86 cfi directives for syscalls.
Christopher Ferris [Fri, 30 May 2014 02:22:34 +0000 (02:22 +0000)]
am
94170742: Merge "Fix x86 cfi directives for syscalls."
* commit '
941707429d8577e90580277c51ad8a354f664586':
Fix x86 cfi directives for syscalls.
Christopher Ferris [Fri, 30 May 2014 02:20:27 +0000 (02:20 +0000)]
Merge "Fix x86 cfi directives for syscalls."
Christopher Ferris [Fri, 30 May 2014 01:17:09 +0000 (18:17 -0700)]
Fix x86 cfi directives for syscalls.
The syscall generation always used 4 bytes for each push cfi directive.
However, the first push should always use an offset of 8 bytes, each
subsequent push after that is only 4 bytes though.
Change-Id: Ibaabd107f399ef67010b9a08213783957c2f74a9
Elliott Hughes [Fri, 30 May 2014 01:16:37 +0000 (18:16 -0700)]
Merge remote-tracking branch 'goog/master' into merge-from-master
Elliott Hughes [Fri, 30 May 2014 00:17:37 +0000 (00:17 +0000)]
am
2f97e423: am
e1df1eb2: am
264d1b83: Merge "Remove issetugid."
* commit '
2f97e423274793c1b47a5be2479f767fd26bbc54':
Remove issetugid.
Elliott Hughes [Fri, 30 May 2014 00:14:21 +0000 (00:14 +0000)]
am
e1df1eb2: am
264d1b83: Merge "Remove issetugid."
* commit '
e1df1eb2c451b541094550dfdbd550bc417ea398':
Remove issetugid.
Elliott Hughes [Fri, 30 May 2014 00:10:42 +0000 (00:10 +0000)]
am
264d1b83: Merge "Remove issetugid."
* commit '
264d1b832510b746c1d45b5efaa33c164d6f8b2b':
Remove issetugid.
Elliott Hughes [Fri, 30 May 2014 00:07:52 +0000 (00:07 +0000)]
Merge "Remove issetugid."
Christopher Ferris [Thu, 29 May 2014 23:50:09 +0000 (23:50 +0000)]
am
017cec03: am
d8532678: am
5800aab3: Merge "Fix wmemmove test."
* commit '
017cec033a20c97f3118df0432cec7fd3bf73865':
Fix wmemmove test.
Christopher Ferris [Thu, 29 May 2014 23:46:50 +0000 (23:46 +0000)]
am
d8532678: am
5800aab3: Merge "Fix wmemmove test."
* commit '
d853267899d6c2fb1eed428285c66b5c77a7c55f':
Fix wmemmove test.
Ben Cheng [Thu, 29 May 2014 23:45:31 +0000 (23:45 +0000)]
am
772d1d27: am
a5b0a62d: am
fd9f07a2: Merge "Workaround the GCC "(long)fn -> lfn" optimization bug."
* commit '
772d1d27853ad92a8e9e7c9d200689da37e68bf3':
Workaround the GCC "(long)fn -> lfn" optimization bug.
Christopher Ferris [Thu, 29 May 2014 23:43:06 +0000 (23:43 +0000)]
am
5800aab3: Merge "Fix wmemmove test."
* commit '
5800aab347a3764f5edb3db0da83b7400ed8426e':
Fix wmemmove test.
Elliott Hughes [Thu, 29 May 2014 23:04:53 +0000 (16:04 -0700)]
Remove issetugid.
Bug:
14569474
Change-Id: I752c77ed53c724f144f0b618443eb95e87f2929a
Ben Cheng [Thu, 29 May 2014 23:41:22 +0000 (23:41 +0000)]
am
a5b0a62d: am
fd9f07a2: Merge "Workaround the GCC "(long)fn -> lfn" optimization bug."
* commit '
a5b0a62dbb560796dc0cfc6947e6e980964e98c4':
Workaround the GCC "(long)fn -> lfn" optimization bug.
Christopher Ferris [Thu, 29 May 2014 23:40:39 +0000 (23:40 +0000)]
Merge "Fix wmemmove test."
Ben Cheng [Thu, 29 May 2014 23:38:27 +0000 (23:38 +0000)]
am
fd9f07a2: Merge "Workaround the GCC "(long)fn -> lfn" optimization bug."
* commit '
fd9f07a2a2aa6c17b99c4bf9815e380eeac6aa0f':
Workaround the GCC "(long)fn -> lfn" optimization bug.
Ben Cheng [Thu, 29 May 2014 23:33:04 +0000 (23:33 +0000)]
Merge "Workaround the GCC "(long)fn -> lfn" optimization bug."
Ben Cheng [Thu, 29 May 2014 23:02:09 +0000 (16:02 -0700)]
Workaround the GCC "(long)fn -> lfn" optimization bug.
Pass "-fno-builtin-rint -fno-builtin-rintl -fno-builtin-rintf" to avoid
generating self recursions in lrint, lrintl, and lrintf.
BUG:
14225968
Change-Id: Iffc4d8f0692580d636a529f4c8aa9a7a10d7acd8
Christopher Ferris [Thu, 29 May 2014 22:51:28 +0000 (22:51 +0000)]
am
dea5f4b1: am
9d73fa3f: am
d4fbb1a8: Merge "Fix dprintf test."
* commit '
dea5f4b157784a677820d43e595b1dfcf1d42430':
Fix dprintf test.
Christopher Ferris [Thu, 29 May 2014 22:49:10 +0000 (22:49 +0000)]
am
9d73fa3f: am
d4fbb1a8: Merge "Fix dprintf test."
* commit '
9d73fa3fad4b50851187214976934d2fa4012fe5':
Fix dprintf test.
Christopher Ferris [Thu, 29 May 2014 22:42:42 +0000 (15:42 -0700)]
Fix wmemmove test.
I accidentally copied over the nul terminator with the test.
Change-Id: I24a9aa05d4fba4f383fa38a3041bb6a6b179130c
Christopher Ferris [Thu, 29 May 2014 22:44:25 +0000 (22:44 +0000)]
am
d4fbb1a8: Merge "Fix dprintf test."
* commit '
d4fbb1a8617285ab1d29324308aa016377fc36f3':
Fix dprintf test.
Christopher Ferris [Thu, 29 May 2014 22:41:50 +0000 (22:41 +0000)]
Merge "Fix dprintf test."
Christopher Ferris [Thu, 29 May 2014 21:30:37 +0000 (21:30 +0000)]
am
4704238d: am
84d90bf5: am
aa5f32ea: Merge "Add Aarch64 optimized bzero based on memset"
* commit '
4704238dd27095886e273edc3902722e8f941310':
Add Aarch64 optimized bzero based on memset
Christopher Ferris [Thu, 29 May 2014 21:27:03 +0000 (21:27 +0000)]
am
84d90bf5: am
aa5f32ea: Merge "Add Aarch64 optimized bzero based on memset"
* commit '
84d90bf5114466bb62d0580ce524da98b6b45dd2':
Add Aarch64 optimized bzero based on memset
Christopher Ferris [Thu, 29 May 2014 21:23:16 +0000 (21:23 +0000)]
am
aa5f32ea: Merge "Add Aarch64 optimized bzero based on memset"
* commit '
aa5f32ea1c8af9776a1c26a027495954c835be55':
Add Aarch64 optimized bzero based on memset
Christopher Ferris [Thu, 29 May 2014 21:19:44 +0000 (21:19 +0000)]
Merge "Add Aarch64 optimized bzero based on memset"
Elliott Hughes [Thu, 29 May 2014 21:10:06 +0000 (21:10 +0000)]
am
8efc3054: am
dafa59b8: am
4dd0b72d: Merge "Return the actual success result from __futex."
* commit '
8efc30544f5ef32395d97f41139d1906a21ca06f':
Return the actual success result from __futex.
Christopher Ferris [Thu, 29 May 2014 21:09:29 +0000 (21:09 +0000)]
am
deb1ec4a: am
47150dca: am
1a57de71: Merge "Fix overflow testing in sbrk."
* commit '
deb1ec4aaa0e7f74746c97ccbc22a367640c301f':
Fix overflow testing in sbrk.
Elliott Hughes [Thu, 29 May 2014 21:06:29 +0000 (21:06 +0000)]
am
dafa59b8: am
4dd0b72d: Merge "Return the actual success result from __futex."
* commit '
dafa59b8fff9ecd562487f9a186ac567c0908c5b':
Return the actual success result from __futex.
Bernhard Rosenkraenzer [Mon, 19 May 2014 11:16:41 +0000 (13:16 +0200)]
Add Aarch64 optimized bzero based on memset
Change-Id: I62cf25bfe23b9d811e00af7307bbd19d89937792
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Christopher Ferris [Thu, 29 May 2014 19:49:35 +0000 (12:49 -0700)]
Fix dprintf test.
Change-Id: Ied783d545b6a35a70a158249f3957a9d00971627
Elliott Hughes [Thu, 29 May 2014 20:14:35 +0000 (20:14 +0000)]
am
4dd0b72d: Merge "Return the actual success result from __futex."
* commit '
4dd0b72dd36f3d9afd6bf0c184866f0d9242084f':
Return the actual success result from __futex.
Elliott Hughes [Thu, 29 May 2014 20:12:06 +0000 (20:12 +0000)]
Merge "Return the actual success result from __futex."
Christopher Ferris [Thu, 29 May 2014 18:10:10 +0000 (18:10 +0000)]
am
47150dca: am
1a57de71: Merge "Fix overflow testing in sbrk."
* commit '
47150dca59e63899843182237775628677ec4af3':
Fix overflow testing in sbrk.
Christopher Ferris [Thu, 29 May 2014 18:06:46 +0000 (18:06 +0000)]
am
1a57de71: Merge "Fix overflow testing in sbrk."
* commit '
1a57de713adfb81842cb2ebdfc051ecb9afa55f1':
Fix overflow testing in sbrk.
Christopher Ferris [Thu, 29 May 2014 18:03:27 +0000 (18:03 +0000)]
Merge "Fix overflow testing in sbrk."
Christopher Ferris [Thu, 22 May 2014 02:03:34 +0000 (19:03 -0700)]
Fix overflow testing in sbrk.
Modify the overflow testing for sbrk.
Bug:
15188366
Change-Id: Ia83f85f7c1789454d872279bd41f38f1ce6b8a34
Elliott Hughes [Thu, 29 May 2014 17:27:55 +0000 (10:27 -0700)]
Return the actual success result from __futex.
futex(2) can return non-zero successes.
Bug:
15195455
Change-Id: I7818bc922a5a2df31228ff72c169320b5e69a544
Elliott Hughes [Thu, 29 May 2014 16:23:08 +0000 (16:23 +0000)]
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.
Elliott Hughes [Thu, 29 May 2014 16:23:07 +0000 (16:23 +0000)]
am
8a00b45d: am
c3930812: am
0bdd668f: Merge "Upgrade to tzdata2014d."
* commit '
8a00b45d601d6e9a5a7ab63544f66267ed1a857b':
Upgrade to tzdata2014d.
Elliott Hughes [Thu, 29 May 2014 16:19:40 +0000 (16:19 +0000)]
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.
Elliott Hughes [Thu, 29 May 2014 16:19:39 +0000 (16:19 +0000)]
am
c3930812: am
0bdd668f: Merge "Upgrade to tzdata2014d."
* commit '
c3930812df525ab6b2e68272903e332d6ee7a7d1':
Upgrade to tzdata2014d.
Elliott Hughes [Thu, 29 May 2014 16:15:52 +0000 (16:15 +0000)]
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.
Elliott Hughes [Thu, 29 May 2014 16:15:51 +0000 (16:15 +0000)]
am
0bdd668f: Merge "Upgrade to tzdata2014d."
* commit '
0bdd668f05b22b44547a2b9f05e506166b22f02a':
Upgrade to tzdata2014d.
Elliott Hughes [Thu, 29 May 2014 16:12:01 +0000 (16:12 +0000)]
Merge "Minor style cleanup of some code I had to look at."
Elliott Hughes [Thu, 29 May 2014 16:09:39 +0000 (16:09 +0000)]
Merge "Upgrade to tzdata2014d."
Elliott Hughes [Thu, 29 May 2014 03:33:33 +0000 (20:33 -0700)]
Upgrade to tzdata2014d.
There are no substantive changes to the data in this release. I'm applying
this just for completeness.
Change-Id: Ibe953969cb16db4d8d1ddb7dd3c943316e6e46b4
Elliott Hughes [Thu, 29 May 2014 03:30:40 +0000 (20:30 -0700)]
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
Elliott Hughes [Thu, 29 May 2014 03:22:03 +0000 (03:22 +0000)]
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.""
Elliott Hughes [Thu, 29 May 2014 03:19:41 +0000 (03:19 +0000)]
am
3388c7be: am
fae42a83: Merge "Revert "Revert "Lose the hand-written futex assembler."""
* commit '
3388c7be52e087256862171a5abdc9ceacf54e9d':
Revert "Revert "Lose the hand-written futex assembler.""
Elliott Hughes [Thu, 29 May 2014 03:16:18 +0000 (03:16 +0000)]
am
fae42a83: Merge "Revert "Revert "Lose the hand-written futex assembler."""
* commit '
fae42a837ae7f880de9561c7b3c2b18e4a531e90':
Revert "Revert "Lose the hand-written futex assembler.""
Elliott Hughes [Thu, 29 May 2014 03:13:23 +0000 (03:13 +0000)]
Merge "Revert "Revert "Lose the hand-written futex assembler."""
Elliott Hughes [Wed, 28 May 2014 19:35:33 +0000 (19:35 +0000)]
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
75c55ff84ebfa686c7ae2cc8ee431c6a33bd46b4.
Bug:
15195455
Change-Id: I6ffb13e5cf6a35d8f59f692d94192aae9ab4593d
Dan Albert [Thu, 29 May 2014 00:59:25 +0000 (00:59 +0000)]
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
Dan Albert [Thu, 29 May 2014 00:55:47 +0000 (00:55 +0000)]
am
c8d59fae: am
32c8ae9d: Merge "Fixes stdatomic.h test to match C11 spec"
* commit '
c8d59fae72fb95fd7034ccf42664711849ed497f':
Fixes stdatomic.h test to match C11 spec
Dan Albert [Thu, 29 May 2014 00:52:18 +0000 (00:52 +0000)]
am
32c8ae9d: Merge "Fixes stdatomic.h test to match C11 spec"
* commit '
32c8ae9de0e51ac64efcfd2e5da34382deee959e':
Fixes stdatomic.h test to match C11 spec
Dan Albert [Thu, 29 May 2014 00:50:26 +0000 (00:50 +0000)]
Merge "Fixes stdatomic.h test to match C11 spec"
Dan Albert [Wed, 28 May 2014 23:27:32 +0000 (16:27 -0700)]
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