OSDN Git Service
Dmitriy Ivanov [Wed, 29 Oct 2014 17:13:49 +0000 (17:13 +0000)]
am
3a3a4b8a: am
e23f564b: Merge "Fix *tests-run-on-host target"
* commit '
3a3a4b8ae6c03b58c59717ab3c3be85099939d3b':
Fix *tests-run-on-host target
Elliott Hughes [Wed, 29 Oct 2014 17:13:49 +0000 (17:13 +0000)]
am
44331e8b: am
c716dd1e: Merge "bionic tests: migrate test for mutex type from system/extras"
* commit '
44331e8bb0ba17be0387e9353d2309f980136273':
bionic tests: migrate test for mutex type from system/extras
Dmitriy Ivanov [Wed, 29 Oct 2014 17:13:32 +0000 (17:13 +0000)]
am
85d77021: am
f56a2f5e: Merge "Remove unnecessary reinterpret_cast"
* commit '
85d770211b33ede2d7bf1b37a6e01bcb308cb666':
Remove unnecessary reinterpret_cast
Chih-Hung Hsieh [Wed, 29 Oct 2014 17:13:31 +0000 (17:13 +0000)]
am
f3b0d9cd: am
57c5a556: Merge "Disable clang compilation due to lack of ifunc."
* commit '
f3b0d9cd79574ac43d41e50bf81f57016c620624':
Disable clang compilation due to lack of ifunc.
Elliott Hughes [Wed, 29 Oct 2014 17:13:30 +0000 (17:13 +0000)]
am
1dd65cc3: am
c83837ec: Merge "Make the netdb unit tests work on the host."
* commit '
1dd65cc30c43921f9a0fc604597701b349e3e028':
Make the netdb unit tests work on the host.
Elliott Hughes [Wed, 29 Oct 2014 17:13:29 +0000 (17:13 +0000)]
am
3f5d8a00: am
cad8d226: Merge "Use mxcr_mask instead of mxcsr_mask to match glibc."
* commit '
3f5d8a00e4b57fdf7ec8cc01cc33fbfab5ae1316':
Use mxcr_mask instead of mxcsr_mask to match glibc.
Elliott Hughes [Wed, 29 Oct 2014 17:13:26 +0000 (17:13 +0000)]
am
43ec1fb7: am
a4c0b756: Merge "Add mkfifoat(3)."
* commit '
43ec1fb76c679738011adc0706e6ef2e01058e79':
Add mkfifoat(3).
Dmitriy Ivanov [Wed, 29 Oct 2014 17:13:25 +0000 (17:13 +0000)]
am
3db80168: am
f33a7d7f: Merge "Fix mips build"
* commit '
3db80168ff376c08f1faa948b9a41a0c823c9631':
Fix mips build
Dmitriy Ivanov [Wed, 29 Oct 2014 17:13:24 +0000 (17:13 +0000)]
am
fee054f3: am
398eb5a7: Merge "Remove unnecessary lookups during relocations"
* commit '
fee054f3ecd7c26705f544ecf0d76ce4ec57a2d4':
Remove unnecessary lookups during relocations
Dmitriy Ivanov [Wed, 29 Oct 2014 17:13:23 +0000 (17:13 +0000)]
am
1babff27: am
566f2bc6: Merge "Fix relocation to look for symbols in local group"
* commit '
1babff27fd0e62bd719d04e789da01adbb0b01cd':
Fix relocation to look for symbols in local group
Elliott Hughes [Wed, 29 Oct 2014 17:13:22 +0000 (17:13 +0000)]
am
ac5df33e: am
6c5694b6: Merge "Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3)."
* commit '
ac5df33e091c079d667354d225ed37d23326a270':
Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3).
Elliott Hughes [Wed, 29 Oct 2014 17:10:58 +0000 (17:10 +0000)]
am
7f558f60: am
cf8ea37f: Merge "bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests"
* commit '
7f558f60cb51c54782f6d51cd3537082e00970bc':
bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests
Elliott Hughes [Wed, 29 Oct 2014 16:42:51 +0000 (16:42 +0000)]
am
96a6f401: am
e516321d: Merge "Update bionic to tzdata2014i."
* commit '
96a6f40163b5a2b97c470894ef81041e18265192':
Update bionic to tzdata2014i.
Christopher Ferris [Wed, 29 Oct 2014 16:42:50 +0000 (16:42 +0000)]
am
274f5e73: am
efd2ec8f: Merge "Fix race condition in timer disarm/delete."
* commit '
274f5e737dcae3c9d328f89f4f7df29acee41230':
Fix race condition in timer disarm/delete.
Elliott Hughes [Tue, 28 Oct 2014 23:58:11 +0000 (16:58 -0700)]
Fix merge-induced makefile error.
Change-Id: I6ac7e5e3b9d55108681916044cf2de0e01bca0b2
Elliott Hughes [Tue, 28 Oct 2014 23:01:58 +0000 (16:01 -0700)]
Merge remote-tracking branch 'goog/lmp-mr1-ub-dev' into manualmerge
Conflicts:
libc/arch-arm/bionic/__restore.S
libc/arch-arm/cortex-a15/bionic/stpcpy.S
libc/arch-arm/cortex-a9/bionic/stpcpy.S
libc/arch-arm64/generic/bionic/memcpy_base.S
libc/arch-x86/bionic/__restore.S
libc/arch-x86/x86.mk
libc/arch-x86_64/bionic/__restore_rt.S
tests/stack_unwinding_test.cpp
tests/stack_unwinding_test_impl.c
Change-Id: I2cb250ad78e9da6f390bc279aec742564b75e6c7
Elliott Hughes [Thu, 4 Sep 2014 22:43:10 +0000 (15:43 -0700)]
Fix mips signed/unsigned signal_test.cpp build breakage.
(cherry picked from commit
aa13e839f06231b9299bb683a71abd954294b49b)
Bug:
17436734
Change-Id: I167fc5d74c49cca7031c5739bc53fdf3bde71887
Christopher Ferris [Wed, 24 Sep 2014 01:31:45 +0000 (18:31 -0700)]
Remove the unnecessary generic-neon code.
Bug:
18156619
(cherry picked from commit
2169e17482da91865e412e55b52b88d7c8db47f6)
Change-Id: I4a7f5bb9ad4c27b274f3a3c86c1617ca0578b98f
Dmitriy Ivanov [Tue, 28 Oct 2014 17:34:12 +0000 (17:34 +0000)]
am
e23f564b: Merge "Fix *tests-run-on-host target"
* commit '
e23f564b52fed0dce661cf6db25cf3a89bd66f18':
Fix *tests-run-on-host target
Elliott Hughes [Tue, 28 Oct 2014 17:34:01 +0000 (17:34 +0000)]
am
c716dd1e: Merge "bionic tests: migrate test for mutex type from system/extras"
* commit '
c716dd1e21438ac6585be79fb799b3135e9b381f':
bionic tests: migrate test for mutex type from system/extras
Elliott Hughes [Tue, 28 Oct 2014 15:36:55 +0000 (15:36 +0000)]
Merge "Don't mask out SA_RESTORER from sa_flags." into lmp-mr1-dev
Elliott Hughes [Tue, 28 Oct 2014 15:06:30 +0000 (15:06 +0000)]
Merge "Disable tzdata in $ANDROID_DATA." into lmp-mr1-dev
Elliott Hughes [Thu, 4 Sep 2014 20:54:42 +0000 (13:54 -0700)]
Don't mask out SA_RESTORER from sa_flags.
glibc doesn't do this, and we probably shouldn't either.
Bug:
16703540
Bug:
17436734
(cherry picked from commit
afe58ad9892de27a7acb0aaded6312ee0f958314)
Change-Id: Iada5d0ae814f438cb276f056b2b5e3675f0e3666
Dmitriy Ivanov [Tue, 28 Oct 2014 04:51:51 +0000 (04:51 +0000)]
am
f56a2f5e: Merge "Remove unnecessary reinterpret_cast"
* commit '
f56a2f5ed2508e0743581003420c0f2d9cb54c7b':
Remove unnecessary reinterpret_cast
Chih-Hung Hsieh [Tue, 28 Oct 2014 04:51:47 +0000 (04:51 +0000)]
am
57c5a556: Merge "Disable clang compilation due to lack of ifunc."
* commit '
57c5a5562b08007dbe6379a4b68ca3a0225747c0':
Disable clang compilation due to lack of ifunc.
Elliott Hughes [Tue, 28 Oct 2014 04:51:46 +0000 (04:51 +0000)]
am
c83837ec: Merge "Make the netdb unit tests work on the host."
* commit '
c83837ec158a14bf84ea702c04f606de3b0599a8':
Make the netdb unit tests work on the host.
Elliott Hughes [Tue, 28 Oct 2014 04:51:25 +0000 (04:51 +0000)]
am
cad8d226: Merge "Use mxcr_mask instead of mxcsr_mask to match glibc."
* commit '
cad8d226c3589a65775fda972d4cd3ebd3877dab':
Use mxcr_mask instead of mxcsr_mask to match glibc.
Elliott Hughes [Tue, 28 Oct 2014 04:49:11 +0000 (04:49 +0000)]
am
a4c0b756: Merge "Add mkfifoat(3)."
* commit '
a4c0b7567190968d263bedd1073ea633510f9a45':
Add mkfifoat(3).
Dmitriy Ivanov [Tue, 28 Oct 2014 04:46:55 +0000 (04:46 +0000)]
am
f33a7d7f: Merge "Fix mips build"
* commit '
f33a7d7f1cc96cf1445013fe49f6db0f03cbd44f':
Fix mips build
Dmitriy Ivanov [Tue, 28 Oct 2014 04:46:54 +0000 (04:46 +0000)]
am
398eb5a7: Merge "Remove unnecessary lookups during relocations"
* commit '
398eb5a7ee1f0f7173e463e82381431ef4b21a17':
Remove unnecessary lookups during relocations
Dmitriy Ivanov [Tue, 28 Oct 2014 04:46:52 +0000 (04:46 +0000)]
am
566f2bc6: Merge "Fix relocation to look for symbols in local group"
* commit '
566f2bc623dbd1d6e8bcf3a6c6e7a6fffe7f68fd':
Fix relocation to look for symbols in local group
Elliott Hughes [Tue, 28 Oct 2014 04:33:09 +0000 (04:33 +0000)]
am
6c5694b6: Merge "Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3)."
* commit '
6c5694b6c8343d740c36adbe904442cecd8030a6':
Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3).
Pavel Chupin [Fri, 26 Sep 2014 12:02:09 +0000 (16:02 +0400)]
[x86,x86_64] Fix libgcc unwinding through signal
This change provides __restore/__restore_rt on x86 and __restore_rt on
x86_64 with unwinding information to be able to unwind through signal
frame via libgcc provided unwinding interface. See comments inlined for
more details.
Also remove the test that had a dependency on
__attribute__((cleanup(foo_cleanup))). It doesn't provide us with any
better test coverage than we have from the newer tests, and it doesn't
work well across a variety architectures (presumably because no one uses
this attribute in the real world).
Tested this on host via bionic-unit-tests-run-on-host on both x86 and
x86-64.
Bug:
17436734
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
(cherry picked from commit
50321e2e66f19998970e59d666bc9af387345b3a)
Change-Id: Iba90e36958b00c7cc7db5eeebf888dc89ce4d619
Elliott Hughes [Thu, 18 Sep 2014 00:21:20 +0000 (17:21 -0700)]
Stack unwinding unit tests.
Bug:
17436734
(cherry picked from commit
bee1993a14b47bc7acda544242f405ae45e42566)
Change-Id: I7205a862ba2c3b474e287f5e9c8982cef4610af9
Elliott Hughes [Tue, 16 Sep 2014 22:49:50 +0000 (15:49 -0700)]
Use the kernel's sa_restorer for aarch64.
gdb was happy with what we had, but libgcc and libunwind weren't.
libgcc is happy with the kernel's restorer (because of the extra nop),
though libunwind looks like it's going to need code changes regardless.
We could make our restorer more like the kernel's one, but why bother
when we can just let the kernel supply the canonical one?
Bug:
17436734
(cherry picked from commit
1cff9a89645a8f362a9ce19c7f9544e98c1fd9e7)
Change-Id: Ie13d73fd97395e1979a67c2294e036a97c50000d
Elliott Hughes [Tue, 16 Sep 2014 20:57:39 +0000 (13:57 -0700)]
Fix 32-bit arm unwinding through signal frames.
gdb was already okay; libgcc and libunwind need a little extra help.
Bug:
17436734
(cherry picked from commit
148dff3ec6114a03acc722ae43990f1b342abad9)
Change-Id: I2cc997017acc57c930284af5264f353656b98c7b
Elliott Hughes [Wed, 10 Sep 2014 22:20:40 +0000 (15:20 -0700)]
Fix signal trampolines.
* LP32 should use sa_restorer too. gdb expects this, and future (>= 3.15) x86
kernels will apparently stop supporting the case where SA_RESTORER isn't
set.
* gdb and libunwind care about the exact instruction sequences, so we need to
modify the code slightly in a few cases to match what they're looking for.
* gdb also cares about the exact function names (for some architectures),
so we need to use __restore and __restore_rt rather than __sigreturn and
__rt_sigreturn.
* It's possible that we don't have a VDSO; dl_iterate_phdr shouldn't assume
that getauxval(AT_SYSINFO_EHDR) will return a non-null pointer.
This fixes unwinding through a signal handler in gdb for all architectures.
It doesn't fix libunwind for arm and arm64. I'll keep investigating that...
(cherry picked from commit
36f451a6d93b6807944d99fa23396e039c47e845)
Bug:
17436734
Change-Id: Ic1ea1184db6655c5d96180dc07bcc09628e647cb
Elliott Hughes [Mon, 27 Oct 2014 20:38:21 +0000 (13:38 -0700)]
Disable tzdata in $ANDROID_DATA.
Bug:
18139284
Change-Id: I2670dc1791d635139a5d39a438dc08777439476b
Dmitriy Ivanov [Sun, 26 Oct 2014 05:47:52 +0000 (05:47 +0000)]
Merge "Fix *tests-run-on-host target"
Dmitriy Ivanov [Sat, 25 Oct 2014 19:41:23 +0000 (12:41 -0700)]
Fix *tests-run-on-host target
Change-Id: Id0e5060977a2df91c47b5a916989eb7e2e3f8153
Elliott Hughes [Sat, 25 Oct 2014 02:03:19 +0000 (02:03 +0000)]
Merge "bionic tests: migrate test for mutex type from system/extras"
Derek Xue [Thu, 25 Sep 2014 10:05:32 +0000 (11:05 +0100)]
bionic tests: migrate test for mutex type from system/extras
Migrate the test about pthread mutex type in file
system/extras/tests/bionic/libc/bionic/test_mutex.c
to the new place
bionic/tests/pthread_test.cpp
in the gtest format.
Change-Id: I6aab10170ccad5b9a4892d52dba2403876c86659
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Dmitriy Ivanov [Fri, 24 Oct 2014 22:05:35 +0000 (22:05 +0000)]
Merge "Remove unnecessary reinterpret_cast"
Dmitriy Ivanov [Fri, 24 Oct 2014 21:46:12 +0000 (14:46 -0700)]
Remove unnecessary reinterpret_cast
Change-Id: Id2ddf4e74bc66825206d1287f899d716537a68d0
Elliott Hughes [Fri, 24 Oct 2014 20:18:09 +0000 (20:18 +0000)]
am
cf8ea37f: Merge "bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests"
* commit '
cf8ea37fc91e23d37b3c5873b5e152ccae293f03':
bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests
Chih-Hung Hsieh [Fri, 24 Oct 2014 18:34:40 +0000 (18:34 +0000)]
Merge "Disable clang compilation due to lack of ifunc."
Elliott Hughes [Fri, 24 Oct 2014 18:30:36 +0000 (18:30 +0000)]
Merge "Make the netdb unit tests work on the host."
Chih-Hung Hsieh [Fri, 24 Oct 2014 18:04:51 +0000 (11:04 -0700)]
Disable clang compilation due to lack of ifunc.
BUG:
18055309
Change-Id: I0f36011cf7872a20ddd36a6c3c607eb96f0a8ec2
Elliott Hughes [Fri, 24 Oct 2014 05:14:32 +0000 (22:14 -0700)]
Make the netdb unit tests work on the host.
Bug:
18111005
Change-Id: I79c6929c3827716e19b44d7469db69740f4b449c
Elliott Hughes [Fri, 24 Oct 2014 16:11:49 +0000 (16:11 +0000)]
am
aa6cd581: Use mxcr_mask instead of mxcsr_mask to match glibc.
* commit '
aa6cd5819c8ebd254d995388798a4b51af7ca933':
Use mxcr_mask instead of mxcsr_mask to match glibc.
Elliott Hughes [Fri, 24 Oct 2014 03:29:42 +0000 (20:29 -0700)]
Use mxcr_mask instead of mxcsr_mask to match glibc.
Bug:
18097559
(cherry picked from commit
f485547b9267263e1de220a3cc368deaec367191)
Change-Id: I242105faa8210abc9635a951b25b127cd64ed23c
Elliott Hughes [Fri, 24 Oct 2014 15:40:43 +0000 (15:40 +0000)]
Merge "Use mxcr_mask instead of mxcsr_mask to match glibc."
Elliott Hughes [Fri, 24 Oct 2014 13:01:54 +0000 (13:01 +0000)]
am
e516321d: Merge "Update bionic to tzdata2014i."
* commit '
e516321d78162479a4ce17bd5a9ba8c0834abf18':
Update bionic to tzdata2014i.
Christopher Ferris [Fri, 24 Oct 2014 13:01:53 +0000 (13:01 +0000)]
am
efd2ec8f: Merge "Fix race condition in timer disarm/delete."
* commit '
efd2ec8fbddb99a7a2d7da8e1024655fa08153ca':
Fix race condition in timer disarm/delete.
Elliott Hughes [Fri, 24 Oct 2014 03:29:42 +0000 (20:29 -0700)]
Use mxcr_mask instead of mxcsr_mask to match glibc.
Bug:
18097559
Change-Id: Iaca301d7d4c4902989d4699117f72b88d5c4bd78
Elliott Hughes [Fri, 24 Oct 2014 02:57:11 +0000 (02:57 +0000)]
Merge "Add mkfifoat(3)."
Elliott Hughes [Fri, 24 Oct 2014 02:10:23 +0000 (19:10 -0700)]
Add mkfifoat(3).
Looks like I missed one of the *at functions when I added the rest.
Change-Id: If16de82dbf6f9a3ea7bfdcba406ca1c74a3f2279
Dmitriy Ivanov [Thu, 23 Oct 2014 22:53:23 +0000 (22:53 +0000)]
Merge "Fix mips build"
Dmitriy Ivanov [Thu, 23 Oct 2014 22:53:13 +0000 (22:53 +0000)]
Merge "Remove unnecessary lookups during relocations"
Dmitriy Ivanov [Thu, 23 Oct 2014 21:34:12 +0000 (14:34 -0700)]
Fix mips build
Change-Id: Ia2dc2e07740bdbb91ee92bfea459230015fcc99b
Dmitriy Ivanov [Thu, 23 Oct 2014 21:19:07 +0000 (14:19 -0700)]
Remove unnecessary lookups during relocations
local_group includes this library and its dependencies.
Change-Id: Ib02474b2355bb147de3889f60092cb2f312997ef
Dmitriy Ivanov [Thu, 23 Oct 2014 20:48:59 +0000 (20:48 +0000)]
Merge "Fix relocation to look for symbols in local group"
Dmitriy Ivanov [Tue, 21 Oct 2014 16:23:18 +0000 (09:23 -0700)]
Fix relocation to look for symbols in local group
The local group is a sequence of libraries in default (breadth-first)
order. It allows RTLD_LOCALLY loaded library to correctly relocate
symbols within its group (see test-cases).
Local group lookup is performed after main executable and ld_preloads.
Bug:
2643900
Bug:
15432753
Change-Id: I9bb013b46d17dbb5cbdfb8fef26f552748385541
Elliott Hughes [Thu, 23 Oct 2014 17:57:05 +0000 (17:57 +0000)]
Merge "Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3)."
Bill Yi [Thu, 23 Oct 2014 13:04:55 +0000 (13:04 +0000)]
am
4b8c96d6: Merge commit \'
bc8745cc3dd94331d008d553a374e733df978963\' into HEAD
* commit '
4b8c96d6cd8ead93bcc9acdf34a9e884951c7a7b':
Fix an unintended difference between aosp/master and lmp-dev-plus-aosp.
More cases where libc should use O_CLOEXEC.
Hide ScopedTrace.
Revert "Revert "Added a bionic systrace class and tracing to pthread_mutex.cpp.""
Derek Xue [Wed, 13 Aug 2014 13:19:17 +0000 (14:19 +0100)]
Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3).
This change is to migrate the getaddrinfo tests defined in the old file
system/extras/tests/bionic/libc/common/test_getaddrinfo.c
to the new place bionic/tests/netdb_test.cpp.
The test here is more thorough, and catches a bug in getservbyname(3)
that was breaking getaddrinfo(3)'s ability to look up services by name
without a hint that would cause it to ask for a specific protocol.
Change-Id: Ief5ebd0869496d1bc6a97861dfefa04bdf24bab1
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Chih-Hung Hsieh [Thu, 23 Oct 2014 03:18:16 +0000 (03:18 +0000)]
am
098cf45f: Merge "Replace ambiguous cmp operator with cmpl."
* commit '
098cf45f4e853f3c85c14af0e475bfae0839f027':
Replace ambiguous cmp operator with cmpl.
Dmitriy Ivanov [Thu, 23 Oct 2014 03:18:12 +0000 (03:18 +0000)]
am
54d76360: Merge "Rename library_offset to library_fd_offset"
* commit '
54d76360ebfb79b57177a81632901ebe1c8fc11f':
Rename library_offset to library_fd_offset
Elliott Hughes [Wed, 22 Oct 2014 23:58:46 +0000 (23:58 +0000)]
am
8fab8119: Update bionic to tzdata2014i.
* commit '
8fab8119dd176a280b62e9e8f2b4f08c0d76f36d':
Update bionic to tzdata2014i.
Elliott Hughes [Wed, 22 Oct 2014 21:30:39 +0000 (21:30 +0000)]
Merge "bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests"
Derek Xue [Wed, 13 Aug 2014 13:19:17 +0000 (14:19 +0100)]
bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests
this change migrate the gethostbyname test defined in the old file
system/extras/tests/bionic/libc/common/test_gethostbyname.c
to the new place bionic/tests/netdb_test.cpp
Change-Id: I342171090f681581fb54d68ea4a09adf61f52081
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Elliott Hughes [Wed, 22 Oct 2014 19:31:02 +0000 (12:31 -0700)]
Update bionic to tzdata2014i.
From the release notes:
Changes affecting future time stamps
Pacific/Fiji will observe DST from 2014-11-02 02:00 to
2015-01-18 03:00. (Thanks to Ken Rylander for the heads-up.)
Guess that future years will use a similar pattern.
A new Zone Pacific/Bougainville, for the part of Papua New
Guinea that plans to switch from UTC+10 to UTC+11 on
2014-12-28 at 02:00. (Thanks to Kiley Walbom for the
heads-up.)
Changes affecting time zone abbreviations
Since Belarus is not changing its clocks even though Moscow
is, the time zone abbreviation in Europe/Minsk is changing
from FET to its more-traditional value MSK on 2014-10-26 at
01:00. (Thanks to Alexander Bokovoy for the heads-up about
Belarus.)
The new abbreviation IDT stands for the pre-1976 use of UT+8
in Indochina, to distinguish it better from ICT (UT+7).
Changes affecting past time stamps
Many time stamps have been corrected for Asia/Ho_Chi_Minh
before 1976 (thanks to Trần Ngọc Quân for an indirect pointer
to Trần Tiến Bình's authoritative book). Asia/Ho_Chi_Minh has
been added to zone1970.tab, to give tzselect users in Vietnam
two choices, since north and south Vietnam disagreed after our
1970 cutoff.
Asia/Phnom_Penh and Asia/Vientiane have been turned into
links, as they differed from existing zones only for older
time stamps. As usual, these changes affect pre-1970 time
stamps only. Their old contents have been moved to the
'backzone' file.
Bug:
18085936
(cherry picked from commit
a05c2a2a705c8298154db6665cbbb4dbe3cdbbd5)
Change-Id: If0253cc1515e1bc98e99c6e24eec797836ca7c27
Elliott Hughes [Wed, 22 Oct 2014 20:41:44 +0000 (20:41 +0000)]
Merge "Update bionic to tzdata2014i."
Christopher Ferris [Wed, 22 Oct 2014 20:33:05 +0000 (20:33 +0000)]
Merge "Fix race condition in timer disarm/delete."
Christopher Ferris [Wed, 22 Oct 2014 20:26:27 +0000 (20:26 +0000)]
am
82eeec68: Merge "Fix generic __memcpy_chk implementation." into lmp-mr1-dev
* commit '
82eeec689f66e481928b6788f0a696a5a61f02a3':
Fix generic __memcpy_chk implementation.
Christopher Ferris [Tue, 21 Oct 2014 02:09:19 +0000 (19:09 -0700)]
Fix race condition in timer disarm/delete.
When setting a repeat timer using the SIGEV_THREAD mechanism, it's possible
that the callback can be called after the timer is disarmed or deleted.
This happens because the kernel can generate signals that the timer thread
will continue to handle even after the timer is supposed to be off.
Add two new tests to verify that disarming/deleting doesn't continue to
call the callback.
Modify the repeat test to finish more quickly than before.
Refactor the Counter implementation a bit.
Bug:
18039727
(cherry pick from commit
0724132c3263145f2a667f453a199d313a5b3d9f)
Change-Id: I135726ea4038a47920a6c511708813b1a9996c42
Christopher Ferris [Wed, 22 Oct 2014 20:16:18 +0000 (20:16 +0000)]
Merge "Fix generic __memcpy_chk implementation." into lmp-mr1-dev
Christopher Ferris [Wed, 22 Oct 2014 20:02:58 +0000 (13:02 -0700)]
resolved conflicts for merge of
9b7b0d82 to lmp-mr1-dev-plus-aosp
Change-Id: I706dc7e1a13e55316cbc44c025877d42c6731f97
Christopher Ferris [Wed, 22 Oct 2014 19:43:44 +0000 (19:43 +0000)]
Merge "Fix race condition in timer disarm/delete." into lmp-mr1-dev
Elliott Hughes [Wed, 22 Oct 2014 19:31:02 +0000 (12:31 -0700)]
Update bionic to tzdata2014i.
From the release notes:
Changes affecting future time stamps
Pacific/Fiji will observe DST from 2014-11-02 02:00 to
2015-01-18 03:00. (Thanks to Ken Rylander for the heads-up.)
Guess that future years will use a similar pattern.
A new Zone Pacific/Bougainville, for the part of Papua New
Guinea that plans to switch from UTC+10 to UTC+11 on
2014-12-28 at 02:00. (Thanks to Kiley Walbom for the
heads-up.)
Changes affecting time zone abbreviations
Since Belarus is not changing its clocks even though Moscow
is, the time zone abbreviation in Europe/Minsk is changing
from FET to its more-traditional value MSK on 2014-10-26 at
01:00. (Thanks to Alexander Bokovoy for the heads-up about
Belarus.)
The new abbreviation IDT stands for the pre-1976 use of UT+8
in Indochina, to distinguish it better from ICT (UT+7).
Changes affecting past time stamps
Many time stamps have been corrected for Asia/Ho_Chi_Minh
before 1976 (thanks to Trần Ngọc Quân for an indirect pointer
to Trần Tiến Bình's authoritative book). Asia/Ho_Chi_Minh has
been added to zone1970.tab, to give tzselect users in Vietnam
two choices, since north and south Vietnam disagreed after our
1970 cutoff.
Asia/Phnom_Penh and Asia/Vientiane have been turned into
links, as they differed from existing zones only for older
time stamps. As usual, these changes affect pre-1970 time
stamps only. Their old contents have been moved to the
'backzone' file.
Bug:
18085936
Change-Id: I89c065b4788b10ed7530cc4e8cfbc1b65c05c1b7
Christopher Ferris [Fri, 17 Oct 2014 21:08:54 +0000 (14:08 -0700)]
Fix generic __memcpy_chk implementation.
- Clean up the labels (add .L to make them local).
- Change to using cfi directives.
- Fix unwinding of the __memcpy_chk fail path.
Bug:
18033671
(cherry pick from commit
7123d4371a5e04337b1de5f8cdf6cdc1e08e9cad)
Change-Id: Ife93bcbfc1949ef29fc8e2dc515b7120632b82b1
Dmitriy Ivanov [Wed, 22 Oct 2014 17:15:34 +0000 (17:15 +0000)]
am
702ab5b3: Rename library_offset to library_fd_offset
* commit '
702ab5b37e77684ee352300d32b078606ee388d0':
Rename library_offset to library_fd_offset
Dmitriy Ivanov [Wed, 22 Oct 2014 17:13:08 +0000 (10:13 -0700)]
resolved conflicts for merge of
de01780f to lmp-mr1-dev-plus-aosp
Change-Id: Ibed1ba1f52da7222f534011866515cfce790061f
Dmitriy Ivanov [Tue, 21 Oct 2014 19:09:18 +0000 (12:09 -0700)]
Rename library_offset to library_fd_offset
replace lseek() and use pread() instead
add test for library_fd_offset > file_size case
Bug:
17762003
(cherry picked from commit
a6c1279098f24a675d0df74ce1946f5d534b425e)
Change-Id: Ie117c745081ee33d07db5341115ff6c8e98b0dec
Bill Yi [Wed, 22 Oct 2014 15:45:57 +0000 (08:45 -0700)]
Ying Wang [Wed, 8 Oct 2014 23:22:03 +0000 (16:22 -0700)]
Build dlext_testzip as custom module.
Use $(BUILD_SYSTEM)/base_rules to build it as custom module, so that
it's exposed to utilities like mm/mmma etc.
Bug:
17887283
Bug:
17762003
(cherry picked from commit
667853d47770fbdb54aaf0b3261b0d4882725770)
Change-Id: I405797d16f20dc09e5d84b93b6727b634db2fc2c
Christopher Ferris [Tue, 21 Oct 2014 02:09:19 +0000 (19:09 -0700)]
Fix race condition in timer disarm/delete.
When setting a repeat timer using the SIGEV_THREAD mechanism, it's possible
that the callback can be called after the timer is disarmed or deleted.
This happens because the kernel can generate signals that the timer thread
will continue to handle even after the timer is supposed to be off.
Add two new tests to verify that disarming/deleting doesn't continue to
call the callback.
Modify the repeat test to finish more quickly than before.
Refactor the Counter implementation a bit.
Bug:
18039727
Change-Id: I73192c915cdacf608521b1792c54e5af14a34907
Chih-Hung Hsieh [Wed, 22 Oct 2014 00:55:14 +0000 (00:55 +0000)]
Merge "Replace ambiguous cmp operator with cmpl."
Chih-Hung Hsieh [Tue, 21 Oct 2014 23:25:35 +0000 (16:25 -0700)]
Replace ambiguous cmp operator with cmpl.
Clang assembler rejects ambiguous cmp instruction.
BUG:
17302482
Change-Id: Ie8dca7e4f46e0906c47076bba21c1941482ba6b3
Dan Albert [Tue, 21 Oct 2014 21:33:59 +0000 (21:33 +0000)]
am
ad136624: Merge "Never use ASAN."
* commit '
ad136624b2bed5b6971cd7ba372969b1b352c223':
Never use ASAN.
Dmitriy Ivanov [Tue, 21 Oct 2014 21:06:18 +0000 (21:06 +0000)]
Merge "Rename library_offset to library_fd_offset"
Dmitriy Ivanov [Sat, 4 Oct 2014 00:52:44 +0000 (17:52 -0700)]
Add file_offset parameter to android_extinfo
Bug:
17762003
(cherry picked from commit
07e5bc152d8a3ad4c50808bb86f3c0f2c5e2f514)
Change-Id: I72d527831384ff5dde013a4c8dfe639fbec165f5
Dmitriy Ivanov [Tue, 21 Oct 2014 19:09:18 +0000 (12:09 -0700)]
Rename library_offset to library_fd_offset
replace lseek() and use pread() instead
add test for library_fd_offset > file_size case
Bug:
17762003
Change-Id: I4555f0be635124efe849c1f226985bcba72ffcbd
Dan Albert [Tue, 21 Oct 2014 18:28:18 +0000 (18:28 +0000)]
Merge "Never use ASAN."
Dan Albert [Fri, 17 Oct 2014 17:33:25 +0000 (10:33 -0700)]
Never use ASAN.
Unless we completely redo how we build bionic (so that the object
files for libc.so get built separately from libc.a), we can't enable
ASAN here, as libc.a gets linked into static executables.
Change-Id: I2ce4f51248bd51c4213a555ff481b6faabbf53f8
Hans Boehm [Mon, 20 Oct 2014 23:36:11 +0000 (23:36 +0000)]
am
c712ceee: Make memory_order_acquire visible in global namespace
* commit '
c712ceeec4c15da8488c5ce143fcc6b0a02d74f3':
Make memory_order_acquire visible in global namespace
Hans Boehm [Wed, 1 Oct 2014 01:31:04 +0000 (18:31 -0700)]
Make memory_order_acquire visible in global namespace
We were missing that using directive when including <atomic>.
Bug:
17736764
Change-Id: Ie8ca92a952749415567bcd5fa21d56629a364660
(cherry picked from commit
76ac4d0853c3bba0c65edc98a9cdf932c452e252)
Christopher Ferris [Mon, 20 Oct 2014 18:38:43 +0000 (18:38 +0000)]
am
8f41d3d3: Merge "Fix generic __memcpy_chk implementation."
* commit '
8f41d3d3bc7cf2375e5dd9202da619fd67a5928f':
Fix generic __memcpy_chk implementation.
Christopher Ferris [Mon, 20 Oct 2014 18:38:27 +0000 (18:38 +0000)]
am
8f41d3d3: Merge "Fix generic __memcpy_chk implementation."
* commit '
8f41d3d3bc7cf2375e5dd9202da619fd67a5928f':
Fix generic __memcpy_chk implementation.
Christopher Ferris [Mon, 20 Oct 2014 18:21:21 +0000 (18:21 +0000)]
Merge "Fix generic __memcpy_chk implementation."