OSDN Git Service
Dan Albert [Thu, 14 Aug 2014 21:35:56 +0000 (21:35 +0000)]
am
72de5013: am
104a4729: Merge "Add more functionality to glibc symbol checker."
* commit '
72de50139dd7bccebb57b2764eae0f534b6ecdca':
Add more functionality to glibc symbol checker.
Dan Albert [Thu, 14 Aug 2014 21:31:20 +0000 (21:31 +0000)]
am
104a4729: Merge "Add more functionality to glibc symbol checker."
* commit '
104a472958f86eafafe0c1d9e2c58ba6403f99e7':
Add more functionality to glibc symbol checker.
Dan Albert [Thu, 14 Aug 2014 21:18:49 +0000 (21:18 +0000)]
Merge "Add more functionality to glibc symbol checker."
Dan Albert [Wed, 13 Aug 2014 20:04:28 +0000 (13:04 -0700)]
Add more functionality to glibc symbol checker.
Also scan NDK's unwanted symbols list (to show the things that we're
exporting but the NDK isn't. Symbols hidden in the NDK will be marked
with a *.
Add a -u (--unwanted) flag to disable the first two printed groups
(all symbols in bionic, all symbols in glibc). This is helpful when
wanting to grep in the list of unwanted symbols.
Finally, update the list of known differences between us and glibc.
Change-Id: I6fdb4126823098430454763c391bd8cd369a75bb
Hans Boehm [Thu, 14 Aug 2014 03:38:37 +0000 (03:38 +0000)]
am
faa0a7b7: am
4f85c6ff: Merge "Add memory ordering constraint, convert to C11 atomics"
* commit '
faa0a7b7886e98c63078b4874224c7ea66a70036':
Add memory ordering constraint, convert to C11 atomics
Hans Boehm [Thu, 14 Aug 2014 01:21:44 +0000 (01:21 +0000)]
am
4f85c6ff: Merge "Add memory ordering constraint, convert to C11 atomics"
* commit '
4f85c6ffd31d1f8cc000ab326edd8edb7ecd55a9':
Add memory ordering constraint, convert to C11 atomics
Dmitriy Ivanov [Thu, 14 Aug 2014 00:38:50 +0000 (00:38 +0000)]
am
63ea43de: am
e942b3ed: Merge "Added test for ifunc support in dynamic linker."
* commit '
63ea43de8f2f5aa5c260165a1d4415f642656d75':
Added test for ifunc support in dynamic linker.
Dmitriy Ivanov [Thu, 14 Aug 2014 00:36:41 +0000 (00:36 +0000)]
am
e942b3ed: Merge "Added test for ifunc support in dynamic linker."
* commit '
e942b3ed81ad4e0161f3ffa4f8d0017bfbb750e2':
Added test for ifunc support in dynamic linker.
Dan Albert [Wed, 13 Aug 2014 23:11:48 +0000 (23:11 +0000)]
am
07337271: am
9a74e4c1: Merge "Hide __libc_init_vdso()."
* commit '
0733727194593db83aa10ecce74028745a75460a':
Hide __libc_init_vdso().
Dan Albert [Wed, 13 Aug 2014 23:05:11 +0000 (23:05 +0000)]
am
9a74e4c1: Merge "Hide __libc_init_vdso()."
* commit '
9a74e4c15c17b9126ad348d865002880fc36bd12':
Hide __libc_init_vdso().
Dan Albert [Wed, 13 Aug 2014 20:21:59 +0000 (20:21 +0000)]
am
9b4410b9: am
1f4c536f: (-s ours) Merge "Hide ScopedTrace."
* commit '
9b4410b9123b32ecb3b48eb17ef67e029660a821':
Hide ScopedTrace.
Dan Albert [Wed, 13 Aug 2014 20:16:54 +0000 (20:16 +0000)]
am
1f4c536f: (-s ours) Merge "Hide ScopedTrace."
* commit '
1f4c536fd53c69ba8122528435251b894e877e2a':
Hide ScopedTrace.
Dmitriy Ivanov [Wed, 13 Aug 2014 16:52:47 +0000 (16:52 +0000)]
am
af2ee506: am
8a84d383: Optimize symbol lookup
* commit '
af2ee5068d8516919f38b2785de1ccac996d7d64':
Optimize symbol lookup
Dmitriy Ivanov [Wed, 13 Aug 2014 16:47:03 +0000 (16:47 +0000)]
am
8a84d383: Optimize symbol lookup
* commit '
8a84d383fb74135e928d341baa180c55854f2f42':
Optimize symbol lookup
Dmitriy Ivanov [Wed, 13 Aug 2014 16:36:08 +0000 (16:36 +0000)]
am
15921382: am
db0785cb: Merge "Optimize symbol lookup"
* commit '
15921382fb94bbbfa559f76eb2aaca9f54fb98d0':
Optimize symbol lookup
Dmitriy Ivanov [Wed, 13 Aug 2014 16:33:27 +0000 (16:33 +0000)]
am
db0785cb: Merge "Optimize symbol lookup"
* commit '
db0785cbf9ee6cc0ace5c89496d7e9f12c288a83':
Optimize symbol lookup
Dmitriy Ivanov [Wed, 13 Aug 2014 04:02:13 +0000 (21:02 -0700)]
Optimize symbol lookup
Do not run symbol lookup on already visited soinfos
Not taking into account already visited libraries
dramatically slows down dlsym in cases when there
are multiple occurrences of a large library in
dependency tree.
Bug:
16977077
(cherry picked from commit
042426ba6375f5c145379e598486ec6d675533c9)
Change-Id: I69d59e395e8112f119343e8a4d72fe31cd449f31
Dan Albert [Wed, 13 Aug 2014 15:54:50 +0000 (15:54 +0000)]
am
4b100dd7: am
d332bc68: Hide __libc_malloc_dispatch.
* commit '
4b100dd72fe368296882e91ad76d2dedf89e1fa2':
Hide __libc_malloc_dispatch.
Dan Albert [Wed, 13 Aug 2014 15:51:06 +0000 (15:51 +0000)]
am
d332bc68: Hide __libc_malloc_dispatch.
* commit '
d332bc68783b9bdef4ecb38bec4e45765a5e9a94':
Hide __libc_malloc_dispatch.
Dmitriy Ivanov [Wed, 13 Aug 2014 16:28:06 +0000 (16:28 +0000)]
Merge "Optimize symbol lookup"
Dmitriy Ivanov [Wed, 13 Aug 2014 04:02:13 +0000 (21:02 -0700)]
Optimize symbol lookup
Do not run symbol lookup on already visited soinfos
Not taking into account already visited libraries
dramatically slows down dlsym in cases when there
are multiple occurrences of a large library in
dependency tree.
Bug:
16977077
Change-Id: I1379f30ed8b06758dd1cc76b80833ac8589afa50
Dan Albert [Wed, 13 Aug 2014 00:06:04 +0000 (00:06 +0000)]
am
25b55a09: am
6e3823d3: Merge "Hide __libc_malloc_dispatch."
* commit '
25b55a09f661e07e920a8e68951517e1be22349d':
Hide __libc_malloc_dispatch.
Dan Albert [Wed, 13 Aug 2014 00:02:04 +0000 (00:02 +0000)]
am
6e3823d3: Merge "Hide __libc_malloc_dispatch."
* commit '
6e3823d37e54929558990d7c475bc30d381098fe':
Hide __libc_malloc_dispatch.
Dan Albert [Tue, 12 Aug 2014 23:21:26 +0000 (16:21 -0700)]
Hide __libc_malloc_dispatch.
Now that -Bsymbolic is fixed, we can hide __libc_malloc_dispatch without
breaking ASAN.
Bug:
11156955
Change-Id: Ia2fc9b046a74e666b33aa6c6c5435f70a63b8021
Dan Albert [Wed, 13 Aug 2014 21:07:11 +0000 (21:07 +0000)]
Merge "Hide __libc_init_vdso()."
Dan Albert [Wed, 13 Aug 2014 20:11:58 +0000 (13:11 -0700)]
Hide __libc_init_vdso().
Bug:
11156955
Change-Id: I7ee31e1ee2ce479c5746b374a239637d582815fe
Hans Boehm [Thu, 14 Aug 2014 01:03:09 +0000 (01:03 +0000)]
Merge "Add memory ordering constraint, convert to C11 atomics"
Dmitriy Ivanov [Thu, 14 Aug 2014 00:29:28 +0000 (00:29 +0000)]
Merge "Added test for ifunc support in dynamic linker."
Dan Albert [Wed, 13 Aug 2014 20:07:44 +0000 (20:07 +0000)]
Merge "Hide ScopedTrace."
Dan Albert [Wed, 13 Aug 2014 18:25:01 +0000 (11:25 -0700)]
Hide ScopedTrace.
Bug:
11156955
Change-Id: I6cddc868d1c6503e30f1ffcf460f45670631d64a
Dan Albert [Tue, 12 Aug 2014 23:55:17 +0000 (23:55 +0000)]
Merge "Hide __libc_malloc_dispatch."
Dan Albert [Tue, 12 Aug 2014 23:21:26 +0000 (16:21 -0700)]
Hide __libc_malloc_dispatch.
Now that -Bsymbolic is fixed, we can hide __libc_malloc_dispatch without
breaking ASAN.
Bug:
11156955
Change-Id: Ia2fc9b046a74e666b33aa6c6c5435f70a63b8021
Dmitriy Ivanov [Mon, 11 Aug 2014 16:47:03 +0000 (16:47 +0000)]
am
ab63b6b0: am
00c16c1b: Merge "Label pages mapped by linker_allocator"
* commit '
ab63b6b067c848aa789c6bda4f420b929d5f3c14':
Label pages mapped by linker_allocator
Dmitriy Ivanov [Mon, 11 Aug 2014 16:42:25 +0000 (16:42 +0000)]
am
00c16c1b: Merge "Label pages mapped by linker_allocator"
* commit '
00c16c1b921dfeab42eb92ac53c6d79addc9f549':
Label pages mapped by linker_allocator
Elliott Hughes [Sun, 10 Aug 2014 08:59:06 +0000 (08:59 +0000)]
am
a466df52: am
72d7e667: Fix our x86 PIC_PROLOGUE.
* commit '
a466df528c90495931f46fbe39ed37ea3893d5ee':
Fix our x86 PIC_PROLOGUE.
Elliott Hughes [Sun, 10 Aug 2014 08:55:52 +0000 (08:55 +0000)]
am
72d7e667: Fix our x86 PIC_PROLOGUE.
* commit '
72d7e667c7e926cb120c4edb53cbf74c652ab915':
Fix our x86 PIC_PROLOGUE.
Elliott Hughes [Sun, 10 Aug 2014 08:55:20 +0000 (08:55 +0000)]
am
cd2cd65c: am
4d0f742a: Merge "Fix our x86 PIC_PROLOGUE."
* commit '
cd2cd65c5f5a65e27610d3cd5a6838395114aa5e':
Fix our x86 PIC_PROLOGUE.
Elliott Hughes [Sun, 10 Aug 2014 08:36:55 +0000 (08:36 +0000)]
am
4d0f742a: Merge "Fix our x86 PIC_PROLOGUE."
* commit '
4d0f742afe4867a0064d46a5b55df33e07c02c9d':
Fix our x86 PIC_PROLOGUE.
Elliott Hughes [Sun, 10 Aug 2014 01:45:55 +0000 (18:45 -0700)]
Fix our x86 PIC_PROLOGUE.
The old definition only worked for functions that didn't use numbered
local labels. Upstream uses '666' not only as some kind of BSD in-joke,
but also because there's little likelihood of any function having
labels that high.
There's a wider question about whether we actually want to go via the
PLT at all in this code, but that's a question for another day.
Bug:
16906712
Change-Id: I3cd8ecc448b33f942bb6e783931808ef39091489
Dan Albert [Sat, 9 Aug 2014 06:58:53 +0000 (06:58 +0000)]
am
2a8efb81: am
f4d21fba: Merge "Make __set_errno hidden in asm." into lmp-dev
* commit '
2a8efb8169ff6b1b9375aac01f2263b4f71cb9ec':
Make __set_errno hidden in asm.
Dan Albert [Sat, 9 Aug 2014 06:55:08 +0000 (06:55 +0000)]
am
f4d21fba: Merge "Make __set_errno hidden in asm." into lmp-dev
* commit '
f4d21fba064c398110ec0428afc0a025afb2254e':
Make __set_errno hidden in asm.
Elliott Hughes [Sun, 10 Aug 2014 05:19:22 +0000 (05:19 +0000)]
Merge "Fix our x86 PIC_PROLOGUE."
Elliott Hughes [Sun, 10 Aug 2014 01:45:55 +0000 (18:45 -0700)]
Fix our x86 PIC_PROLOGUE.
The old definition only worked for functions that didn't use numbered
local labels. Upstream uses '666' not only as some kind of BSD in-joke,
but also because there's little likelihood of any function having
labels that high.
There's a wider question about whether we actually want to go via the
PLT at all in this code, but that's a question for another day.
(cherry-pick of
72d7e667c7e926cb120c4edb53cbf74c652ab915.)
Bug:
16906712
Change-Id: I3cd8ecc448b33f942bb6e783931808ef39091489
Dmitriy Ivanov [Mon, 11 Aug 2014 16:36:33 +0000 (16:36 +0000)]
Merge "Label pages mapped by linker_allocator"
Dmitriy Ivanov [Fri, 8 Aug 2014 23:57:15 +0000 (16:57 -0700)]
Label pages mapped by linker_allocator
Change-Id: I7e0bf29bc1a480e9be0d1ae573ca1063d90d82ff
Dan Albert [Sat, 9 Aug 2014 06:45:48 +0000 (06:45 +0000)]
Merge "Make __set_errno hidden in asm." into lmp-dev
Dan Albert [Fri, 8 Aug 2014 22:53:57 +0000 (22:53 +0000)]
am
21588d1f: am
a0db4641: Merge "Make __set_errno hidden in asm."
* commit '
21588d1f2e885d42b724d8c22ea313593c69cac5':
Make __set_errno hidden in asm.
Dan Albert [Fri, 8 Aug 2014 22:46:15 +0000 (22:46 +0000)]
am
a0db4641: Merge "Make __set_errno hidden in asm."
* commit '
a0db46418757dd1b399acb97ff42083cc274e8ae':
Make __set_errno hidden in asm.
Dan Albert [Fri, 8 Aug 2014 22:45:51 +0000 (22:45 +0000)]
am
287762ed: am
3788a1ee: Merge "Revert "Fix incorrect relocations for x86.""
* commit '
287762edb7bc2d13cdd4c02f049eac4cf8630876':
Revert "Fix incorrect relocations for x86."
Dan Albert [Fri, 8 Aug 2014 22:42:29 +0000 (22:42 +0000)]
am
3788a1ee: Merge "Revert "Fix incorrect relocations for x86.""
* commit '
3788a1ee8eae4180117010bb9302334acfe1d218':
Revert "Fix incorrect relocations for x86."
Dan Albert [Fri, 8 Aug 2014 22:19:20 +0000 (15:19 -0700)]
Make __set_errno hidden in asm.
This fixes the build after the -Bsymbolic change.
Bug:
16853291
Change-Id: I989c9fec3c32e0289ea257a3bd2b7fd2709b6ce2
(cherry picked from commit
bc9f9f25bf1247a6a638a2a2df8441bdd9fabad7)
Hans Boehm [Thu, 31 Jul 2014 22:53:22 +0000 (15:53 -0700)]
Add memory ordering constraint, convert to C11 atomics
Add an ordering constraint/fence to __system_property_serial.
This slows down a read on a Nexus 5 from about 50 to about 70 ns,
but avoids the possibility of seeing an inconsistent property value.
Use C11 atomic operations where easy and appropriate.
This code remains not fully C++11 memory model conformant, but
I would now expect the generated code to now be correct with current compilers.
Bug:
14970171
Change-Id: I0891ff1d0f914ae5c3857e3d76b6a7c8a4a07d83
Brigid Smith [Wed, 23 Jul 2014 18:22:25 +0000 (11:22 -0700)]
Added test for ifunc support in dynamic linker.
ifuncs now work in i386 and x86_64 when called in the same library as
well as in a different library.
Bug:
6657325
Change-Id: Ic0c48b1b0a76cb90f36c20c79f68294cc3fd44a1
Dan Albert [Fri, 8 Aug 2014 22:36:57 +0000 (22:36 +0000)]
Merge "Make __set_errno hidden in asm."
Dan Albert [Fri, 8 Aug 2014 22:19:20 +0000 (15:19 -0700)]
Make __set_errno hidden in asm.
This fixes the build after the -Bsymbolic change.
Bug:
16853291
Change-Id: I989c9fec3c32e0289ea257a3bd2b7fd2709b6ce2
Christopher Ferris [Fri, 8 Aug 2014 16:57:32 +0000 (16:57 +0000)]
am
98d4eaab: am
1c5e415f: Merge "Add a way to disable backtracing in malloc debug."
* commit '
98d4eaab3fe8e0a243ce2abaf6647acb99e9d81e':
Add a way to disable backtracing in malloc debug.
Christopher Ferris [Fri, 8 Aug 2014 16:53:11 +0000 (16:53 +0000)]
am
1c5e415f: Merge "Add a way to disable backtracing in malloc debug."
* commit '
1c5e415f8c4cd2cb10ad1d1cf660d17161132772':
Add a way to disable backtracing in malloc debug.
Christopher Ferris [Fri, 8 Aug 2014 16:38:57 +0000 (16:38 +0000)]
am
f1820351: am
49de01a5: Add a way to disable backtracing in malloc debug.
* commit '
f18203517e61fdefbe42620426cc9990294dda00':
Add a way to disable backtracing in malloc debug.
Christopher Ferris [Fri, 8 Aug 2014 16:35:57 +0000 (16:35 +0000)]
am
49de01a5: Add a way to disable backtracing in malloc debug.
* commit '
49de01a5be7bfb07baaea7415647d838383e1b59':
Add a way to disable backtracing in malloc debug.
Elliott Hughes [Fri, 8 Aug 2014 16:25:09 +0000 (16:25 +0000)]
am
b763b7d6: am
f2d8c357: Merge "Remove misleading arm/arm64 PIC_SYM."
* commit '
b763b7d6d57380eb82f6fe5cb62864ea12b405ae':
Remove misleading arm/arm64 PIC_SYM.
Elliott Hughes [Fri, 8 Aug 2014 16:21:23 +0000 (16:21 +0000)]
am
f2d8c357: Merge "Remove misleading arm/arm64 PIC_SYM."
* commit '
f2d8c357eec1bbc4e7441942dfc338ad1d9a207a':
Remove misleading arm/arm64 PIC_SYM.
Christopher Ferris [Fri, 8 Aug 2014 07:19:10 +0000 (07:19 +0000)]
am
e2005cda: am
92f0c91b: Merge "Create a distinct temp directory for each run."
* commit '
e2005cdae0e6ad103fa18e61d5f46c5549fac4e4':
Create a distinct temp directory for each run.
Christopher Ferris [Fri, 8 Aug 2014 07:17:17 +0000 (07:17 +0000)]
am
92f0c91b: Merge "Create a distinct temp directory for each run."
* commit '
92f0c91b82c60788b14062ca032ccc732f0fba4c':
Create a distinct temp directory for each run.
Christopher Ferris [Thu, 7 Aug 2014 23:21:21 +0000 (16:21 -0700)]
Add a way to disable backtracing in malloc debug.
The property libc.debug.malloc.nobacktrace set to non-zero disables
getting backtracing when using mode 1 or mode 10.
Bug:
16874447
Change-Id: I7650ba9f4385b5110b743cab01e877fc69545b3c
Elliott Hughes [Fri, 8 Aug 2014 02:26:42 +0000 (02:26 +0000)]
am
0d9cc846: am
43227c0b: Android is all-PIC/PIE.
* commit '
0d9cc846f748c72ad8d8df4b606f5333b61cabf0':
Android is all-PIC/PIE.
Elliott Hughes [Fri, 8 Aug 2014 00:53:31 +0000 (00:53 +0000)]
am
43227c0b: Android is all-PIC/PIE.
* commit '
43227c0b400a33dc9722269beda26313c391fb1e':
Android is all-PIC/PIE.
Dan Albert [Fri, 8 Aug 2014 00:29:29 +0000 (00:29 +0000)]
am
d17047ff: am
cdd2f072: Merge "Fix incorrect relocations for x86."
* commit '
d17047ffd6a6c54e177bc75b05082afeae40f2f9':
Fix incorrect relocations for x86.
Dan Albert [Fri, 8 Aug 2014 00:23:54 +0000 (00:23 +0000)]
am
cdd2f072: Merge "Fix incorrect relocations for x86."
* commit '
cdd2f072af5c22750e06d1613b72336ecda7e71f':
Fix incorrect relocations for x86.
Dan Albert [Fri, 8 Aug 2014 22:35:00 +0000 (22:35 +0000)]
Merge "Revert "Fix incorrect relocations for x86.""
Dan Albert [Fri, 8 Aug 2014 22:15:29 +0000 (15:15 -0700)]
Revert "Fix incorrect relocations for x86."
Bug:
16853291
This reverts commit
512bc5232689bec9c763c8247b59de970096ff87.
Elliott Hughes [Thu, 7 Aug 2014 18:37:50 +0000 (18:37 +0000)]
am
1636f80b: am
d994622e: Merge "Android is all-PIC/PIE."
* commit '
1636f80b7d30103f10ab3ccc2632e8f693c0f9c0':
Android is all-PIC/PIE.
Elliott Hughes [Thu, 7 Aug 2014 18:33:33 +0000 (18:33 +0000)]
am
d994622e: Merge "Android is all-PIC/PIE."
* commit '
d994622ebf2c4b7e918d9e1f1840f9df88ee7222':
Android is all-PIC/PIE.
Elliott Hughes [Thu, 7 Aug 2014 17:51:32 +0000 (10:51 -0700)]
Android is all-PIC/PIE.
Clean up the x86/x86_64 assembler. The motivator (other than reducing
confusion) was that asm.h incorrectly checked PIC rather than __PIC__.
Bug:
16823325
(cherry picked from commit
6b6364a7fc7c3ba37ee907776a29bdc8c9793db9)
Change-Id: I89ca57fa0eb34a36de6cb11ea85f71054fce709d
Christopher Ferris [Fri, 8 Aug 2014 16:46:18 +0000 (16:46 +0000)]
Merge "Add a way to disable backtracing in malloc debug."
Christopher Ferris [Thu, 7 Aug 2014 23:21:21 +0000 (16:21 -0700)]
Add a way to disable backtracing in malloc debug.
The property libc.debug.malloc.nobacktrace set to non-zero disables
getting backtracing when using mode 1 or mode 10.
Bug:
16874447
(cherry picked from
49de01a5be7bfb07baaea7415647d838383e1b59)
Change-Id: I6bbefe5420b14991fe84c2f849222dcd7cb592bf
Christopher Ferris [Fri, 8 Aug 2014 07:07:48 +0000 (07:07 +0000)]
Merge "Create a distinct temp directory for each run."
Christopher Ferris [Tue, 5 Aug 2014 19:19:27 +0000 (12:19 -0700)]
Create a distinct temp directory for each run.
Modify make__NR_name so that only __ARM_NR_ is exempted from the
__NR_ being prepended. This avoids a case where using a name starting
with __ but is not a valid syscall name in SYSCALLS.TXT does not generate
code that will compile but references the function itself and causes
link errors.
Fix all of the directory references from dir_part1 + dir_part2 to
use os.path.join() instead.
Change-Id: Ib9527eba6f25f26a30c5cb0ad431f3f88a7683cf
Dan Albert [Thu, 7 Aug 2014 23:23:22 +0000 (23:23 +0000)]
Merge "Fix incorrect relocations for x86."
Dan Albert [Thu, 7 Aug 2014 17:46:42 +0000 (10:46 -0700)]
Fix incorrect relocations for x86.
These calls were not going through the PLT like they should have been.
Bug:
16853291
Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
Elliott Hughes [Thu, 7 Aug 2014 18:25:35 +0000 (18:25 +0000)]
Merge "Android is all-PIC/PIE."
Elliott Hughes [Thu, 7 Aug 2014 17:51:32 +0000 (10:51 -0700)]
Android is all-PIC/PIE.
Clean up the x86/x86_64 assembler. The motivator (other than reducing
confusion) was that asm.h incorrectly checked PIC rather than __PIC__.
Bug:
16823325
Change-Id: Iaa9d45009e93a4b31b719021c93ac221e336479b
Christopher Ferris [Thu, 7 Aug 2014 01:17:28 +0000 (01:17 +0000)]
am
1c85152f: am
85ebcfce: Merge "Do a second key cleanup in pthread_exit."
* commit '
1c85152f76e0696e117760d5f89d23480a753afd':
Do a second key cleanup in pthread_exit.
Christopher Ferris [Thu, 7 Aug 2014 01:14:05 +0000 (01:14 +0000)]
am
85ebcfce: Merge "Do a second key cleanup in pthread_exit."
* commit '
85ebcfceb62f011e0db359affefcf5570f518bd5':
Do a second key cleanup in pthread_exit.
Christopher Ferris [Thu, 7 Aug 2014 01:13:13 +0000 (01:13 +0000)]
am
60b4de13: am
3e7b8e2a: Merge "Do a second key cleanup in pthread_exit." into lmp-dev
* commit '
60b4de132cfa2efef75033aefe3322762042ea92':
Do a second key cleanup in pthread_exit.
Christopher Ferris [Thu, 7 Aug 2014 01:05:51 +0000 (01:05 +0000)]
am
3e7b8e2a: Merge "Do a second key cleanup in pthread_exit." into lmp-dev
* commit '
3e7b8e2a8bd16a37cecdae1135a5e7fc6e64c762':
Do a second key cleanup in pthread_exit.
Elliott Hughes [Thu, 7 Aug 2014 01:00:59 +0000 (01:00 +0000)]
am
3ea3982f: am
501eb513: Merge "Upgrade bionic to tzdata2014f." into lmp-dev
* commit '
3ea3982f1f810049ad02f658220784ace5eae6db':
Upgrade bionic to tzdata2014f.
Elliott Hughes [Thu, 7 Aug 2014 00:53:33 +0000 (00:53 +0000)]
am
501eb513: Merge "Upgrade bionic to tzdata2014f." into lmp-dev
* commit '
501eb513ae4f037dc5ef5db530886c05b7f5d964':
Upgrade bionic to tzdata2014f.
Elliott Hughes [Thu, 7 Aug 2014 00:52:49 +0000 (00:52 +0000)]
am
af0ec906: am
6edf8985: Merge "Fix the tzdata update tools." into lmp-dev
* commit '
af0ec906bd0f77971afaf135466e60e41f7faea7':
Fix the tzdata update tools.
Elliott Hughes [Thu, 7 Aug 2014 00:52:48 +0000 (00:52 +0000)]
am
5a092670: am
f3868fa7: Merge "Upgrade bionic to tzdata2014f."
* commit '
5a0926701997d6ff2189054787147adb956d4b3a':
Upgrade bionic to tzdata2014f.
Elliott Hughes [Thu, 7 Aug 2014 00:52:48 +0000 (00:52 +0000)]
am
0415a4a6: am
b4b7e054: Merge "Fix the tzdata update tools."
* commit '
0415a4a6f89e31cd8b3d5126fd7a1b9877d84906':
Fix the tzdata update tools.
Elliott Hughes [Thu, 7 Aug 2014 00:44:37 +0000 (00:44 +0000)]
am
6edf8985: Merge "Fix the tzdata update tools." into lmp-dev
* commit '
6edf8985c1fe205d13543212fba0e079ed7dc4a9':
Fix the tzdata update tools.
Elliott Hughes [Thu, 7 Aug 2014 00:42:12 +0000 (00:42 +0000)]
am
f3868fa7: Merge "Upgrade bionic to tzdata2014f."
* commit '
f3868fa735ad67ec853f3db36936ca184bd5f79a':
Upgrade bionic to tzdata2014f.
Elliott Hughes [Thu, 7 Aug 2014 00:42:11 +0000 (00:42 +0000)]
am
b4b7e054: Merge "Fix the tzdata update tools."
* commit '
b4b7e0547da259b38b3e31dbd08cf26026cff1ee':
Fix the tzdata update tools.
Elliott Hughes [Thu, 7 Aug 2014 00:38:29 +0000 (00:38 +0000)]
Merge "Upgrade bionic to tzdata2014f."
Elliott Hughes [Wed, 6 Aug 2014 22:26:13 +0000 (15:26 -0700)]
Upgrade bionic to tzdata2014f.
From the release notes:
Changes affecting future time stamps
Russia will subtract an hour from most of its time zones on
2014-10-26 at 02:00 local time. (Thanks to Alexander Krivenyshev.)
There are a few exceptions: Magadan Oblast (Asia/Magadan) and
Zabaykalsky Krai are subtracting two hours; conversely, Chukotka
Autonomous Okrug (Asia/Anadyr), Kamchatka Krai (Asia/Kamchatka),
Kemerovo Oblast (Asia/Novokuznetsk), and the Samara Oblast and the
Udmurt Republic (Europe/Samara) are not changing their clocks. The
changed zones are Europe/Kaliningrad, Europe/Moscow,
Europe/Simferopol, Europe/Volgograd, Asia/Yekaterinburg, Asia/Omsk,
Asia/Novosibirsk, Asia/Krasnoyarsk, Asia/Irkutsk, Asia/Yakutsk,
Asia/Vladivostok, Asia/Khandyga, Asia/Sakhalin, and Asia/Ust-Nera;
Asia/Magadan will have two hours subtracted; and Asia/Novokuznetsk's
time zone abbreviation is affected, but not its UTC offset. Two
zones are added: Asia/Chita (split from Asia/Yakutsk, and also with
two hours subtracted) and Asia/Srednekolymsk (split from
Asia/Magadan, but with only one hour subtracted). (Thanks to Tim
Parenti for much of the above.)
Changes affecting past time stamps
China's five zones have been simplified to two, since the post-1970
differences in the other three seem to have been imaginary. The
zones Asia/Harbin, Asia/Chongqing, and Asia/Kashgar have been
removed; backwards-compatibility links still work, albeit with
different behaviors for time stamps before May 1980. Asia/Urumqi's
1980 transition to UTC+8 has been removed, so that it is now at
UTC+6 and not UTC+8. (Thanks to Luther Ma and to Alois Treindl;
Treindl sent helpful translations of two papers by Guo Qingsheng.)
Some zones have been turned into links, when they differed from
existing zones only for older UTC offsets where the data were likely
invented. These changes affect UTC offsets in pre-1970 time stamps
only. This is similar to the change in release 2013e, except this
time for western Africa. The affected zones are: Africa/Bamako,
Africa/Banjul, Africa/Conakry, Africa/Dakar, Africa/Freetown,
Africa/Lome, Africa/Nouakchott, Africa/Ouagadougou, Africa/Sao_Tome,
and Atlantic/St_Helena. This also affects the
backwards-compatibility link Africa/Timbuktu. (Thanks to Alan
Barrett, Stephen Colebourne, Tim Parenti, and David Patte for
reporting problems in earlier versions of this change.)
Asia/Shanghai's pre-standard-time UT offset has been changed from
8:05:57 to 8:05:43, the location of Xujiahui Observatory. Its
transition to standard time has been changed from 1928 to 1901.
Asia/Taipei switched to JWST on 1896-01-01, then to JST on
1937-10-01, then to CST on 1945-09-21 at 01:00, and did not observe
DST in 1945. In 1946 it observed DST from 05-15 through 09-30; in
1947 from 04-15 through 10-31; and in 1979 from 07-01 through 09-30.
(Thanks to Yu-Cheng Chuang.)
Asia/Riyadh's transition to standard time is now 1947-03-14, not
1950.
Europe/Helsinki's 1942 fall-back transition was 10-04 at 01:00, not
10-03 at 00:00. (Thanks to Konstantin Hyppönen.)
Pacific/Pago_Pago has been changed from UTC-11:30 to UTC-11 for the
period from 1911 to 1950.
Pacific/Chatham has been changed to New Zealand standard time plus
45 minutes for the period before 1957, reflecting a 1956 remark in
the New Zealand parliament.
Europe/Budapest has several pre-1946 corrections: in 1918 the
transition out of DST was on 09-16, not 09-29; in 1919 it was on
11-24, not 09-15; in 1945 it was on 11-01, not 11-03; in 1941 the
transition to DST was 04-08 not 04-06 at 02:00; and there was no DST
in 1920.
Africa/Accra is now assumed to have observed DST from 1920 through
1935.
Time in Russia before 1927 or so has been corrected by a few seconds
in the following zones: Europe/Moscow, Asia/Irkutsk, Asia/Tbilisi,
Asia/Tashkent, Asia/Vladivostok, Asia/Yekaterinburg,
Europe/Helsinki, and Europe/Riga. Also, Moscow's location has been
changed to its Kilometer 0 point. (Thanks to Vladimir Karpinsky for
the Moscow changes.)
(cherry-pick of
0dc2c1db6fc84b4526f2a5f8d73e1187500f2300.)
Bug:
16168653
Change-Id: I23827254bcf50dd07a2192ed34b02224d73e07a0
Elliott Hughes [Thu, 7 Aug 2014 00:34:37 +0000 (00:34 +0000)]
Merge "Fix the tzdata update tools."
Elliott Hughes [Wed, 6 Aug 2014 22:23:11 +0000 (15:23 -0700)]
Fix the tzdata update tools.
The recent libcore ZoneInfo changes mean that we can no longer
compile libcore's ZoneInfo against the RI. Luckily, the field in
our data file that we needed ZoneInfo for isn't actually used.
This change removes our dependence on libcore.
I've left the field in to avoid a file format change. We can remove
the field if/when we next have a real need to bump the file format.
(cherry-pick of
90cb5ffb85a9bc2e725824b3ca8db932d02c45db.)
Bug:
16168653
Change-Id: Iedad2252c2b49f4d8bb2c7d9078b39b622444ca7
Christopher Ferris [Thu, 7 Aug 2014 00:52:19 +0000 (00:52 +0000)]
Merge "Do a second key cleanup in pthread_exit." into lmp-dev
Christopher Ferris [Wed, 6 Aug 2014 21:15:01 +0000 (14:15 -0700)]
Do a second key cleanup in pthread_exit.
During pthread_exit, the keys are cleaned. Unfortunately, a call to
free occurs after the cleanup and the memory for some of the keys
is recreated when using jemalloc. The solution is to do the key
cleanup twice.
Also, modify the pthread_detach__leak test to be less flaky
when run on a jemalloc system.
Bug:
16513133
Change-Id: Ic17e8344bdc1ba053c4f5b6d827a4c19c57860c1
Elliott Hughes [Thu, 7 Aug 2014 00:36:48 +0000 (00:36 +0000)]
Merge "Upgrade bionic to tzdata2014f." into lmp-dev