OSDN Git Service
Dan Albert [Tue, 2 Sep 2014 23:02:57 +0000 (23:02 +0000)]
am
847e52b9: Merge "Prevent a few test pthread keys from leaking."
* commit '
847e52b9b7bca9dee20e33d1006dfc23885e7494':
Prevent a few test pthread keys from leaking.
Dan Albert [Tue, 2 Sep 2014 22:43:17 +0000 (22:43 +0000)]
Merge "Prevent a few test pthread keys from leaking."
Hans Boehm [Tue, 2 Sep 2014 22:24:33 +0000 (15:24 -0700)]
resolved conflicts for merge of
c8cf3513 to lmp-dev-plus-aosp
Change-Id: If1181e3496d0309eebbaa1f1d2696269e61c64bc
Dan Albert [Tue, 2 Sep 2014 22:24:26 +0000 (15:24 -0700)]
Prevent a few test pthread keys from leaking.
Bug:
17358010
Change-Id: Ie718dc215ddfd431650295a1630c1b1716760c3d
Elliott Hughes [Tue, 2 Sep 2014 21:18:55 +0000 (21:18 +0000)]
am
ec95a9cf: Merge "MIPS64 syscall() arguments"
* commit '
ec95a9cf11f7c4d2211c61da7ce05262a54409d1':
MIPS64 syscall() arguments
Elliott Hughes [Tue, 2 Sep 2014 20:53:30 +0000 (20:53 +0000)]
Merge "MIPS64 syscall() arguments"
Dmitriy Ivanov [Tue, 2 Sep 2014 19:45:29 +0000 (19:45 +0000)]
am
86f594b1: Merge "Encapsulate soinfo_link_image and soinfo_relocate"
* commit '
86f594b19bc51ffe87bfacb6b42687af94c3c648':
Encapsulate soinfo_link_image and soinfo_relocate
Chris Dearman [Wed, 20 Aug 2014 23:39:47 +0000 (16:39 -0700)]
MIPS64 syscall() arguments
The seventh argument for syscall is passed in a register, not on the stack
Change-Id: Idb69fac77d1f710cff5a3ab4ae1259feb61ae69d
Dmitriy Ivanov [Tue, 2 Sep 2014 19:25:08 +0000 (19:25 +0000)]
Merge "Encapsulate soinfo_link_image and soinfo_relocate"
Dmitriy Ivanov [Tue, 2 Sep 2014 18:47:23 +0000 (11:47 -0700)]
Encapsulate soinfo_link_image and soinfo_relocate
Also get rid of needed[] array for these functions
Change-Id: I8d12887dbec0724309bb171e6bbd9b9ceb32cc70
Elliott Hughes [Tue, 2 Sep 2014 18:29:15 +0000 (18:29 +0000)]
am
4625dd75: Merge "Upgrade bionic to tzdata2014g."
* commit '
4625dd751e5f7beb0a9b8ec6a768fc7a2c36367a':
Upgrade bionic to tzdata2014g.
Elliott Hughes [Tue, 2 Sep 2014 17:57:10 +0000 (17:57 +0000)]
Merge "Upgrade bionic to tzdata2014g."
Dmitriy Ivanov [Tue, 2 Sep 2014 17:35:37 +0000 (17:35 +0000)]
am
e057b9fc: Merge "Introduce size-based r/w allocators"
* commit '
e057b9fc82e1674198738ff2fdd4eb70c645bf9e':
Introduce size-based r/w allocators
Hans Boehm [Tue, 19 Aug 2014 23:14:01 +0000 (16:14 -0700)]
Fix, generalize stdatomic.h; improve test.
We seem to use this stdatomic.h sometimes, and slightly different prebuilts
at other times, making them all difficult to test, and making it unclear
which one we're testing. This generalizes the bionic header so that it
can be used directly as the prebuilt header as well. So long as they
don't diverge again, that should somewhat improve test coverage.
Use the correct builtin for atomic_is_lock_free.
Fix atomic_flag_init.
Turn on atomic tests even with __GLIBC__, since they now appear to pass.
Include uchar.h in stdatomic.h where needed.
Add a basic memory ordering test.
Fix bit-rotted comments in bionic tests makefile.
Prerequisite for fixing b/
16880454 and
Bug:
16513433
Change-Id: If6a14c1075b379395ba5d93357d56025c0ffab68
(cherry picked from commit
00aaea364501b3b0abe58dae461136159df1e356)
Dmitriy Ivanov [Tue, 2 Sep 2014 17:21:51 +0000 (17:21 +0000)]
Merge "Introduce size-based r/w allocators"
Dmitriy Ivanov [Tue, 2 Sep 2014 17:15:38 +0000 (17:15 +0000)]
am
4cafa3ce: Merge "Implement LinkedList::visit()"
* commit '
4cafa3ce808419325eefbb8013d21a919e2aabda':
Implement LinkedList::visit()
Dmitriy Ivanov [Tue, 2 Sep 2014 16:54:14 +0000 (16:54 +0000)]
Merge "Implement LinkedList::visit()"
Elliott Hughes [Tue, 2 Sep 2014 16:44:33 +0000 (09:44 -0700)]
Upgrade bionic to tzdata2014g.
From the release notes:
Changes affecting future time stamps
Turks & Caicos is switching from US eastern time to UTC-4 year-round,
modeled as a switch from EST/EDT to AST on 2014-11-02 at 02:00.
Changes affecting past time stamps
Time in Russia or the USSR before 1926 or so has been corrected by
a few seconds in the following zones: Asia/Irkutsk,
Asia/Krasnoyarsk, Asia/Omsk, Asia/Samarkand, Asia/Tbilisi,
Asia/Vladivostok, Asia/Yakutsk, Europe/Riga, Europe/Samara. For
Asia/Yekaterinburg the correction is a few minutes. (Thanks to
Vladimir Karpinsky.)
The Portuguese decree of 1911-05-26 took effect on 1912-01-01.
This affects 1911 time stamps in Africa/Bissau, Africa/Luanda,
Atlantic/Azores, and Atlantic/Madeira. Also, Lisbon's pre-1912
GMT offset was -0:36:45 (rounded from -0:36:44.68), not -0:36:32.
(Thanks to Stephen Colebourne for pointing to the decree.)
Asia/Dhaka ended DST on 2009-12-31 at 24:00, not 23:59.
A new file 'backzone' contains data which may appeal to
connoisseurs of old time stamps, although it is out of scope for
the tz database, is often poorly sourced, and contains some data
that is known to be incorrect. The new file is not recommended
for ordinary use and its entries are not installed by default.
(Thanks to Lester Caine for the high-quality Jersey, Guernsey, and
Isle of Man entries.)
Some more zones have been turned into links, when they differed
from existing zones only for older time stamps. As usual,
these changes affect UTC offsets in pre-1970 time stamps only.
Their old contents have been moved to the 'backzone' file.
The affected zones are: Africa/Bangui, Africa/Brazzaville,
Africa/Douala, Africa/Kinshasa, Africa/Libreville, Africa/Luanda,
Africa/Malabo, Africa/Niamey, and Africa/Porto-Novo.
Bug:
17277574
Change-Id: Idff4a68e927d49bef1e787af534e1b23b5b8a7fb
Dmitriy Ivanov [Tue, 2 Sep 2014 16:45:40 +0000 (09:45 -0700)]
Implement LinkedList::visit()
Change-Id: Ibd9d133dddf1f2e6e65660e3cd2dacafcc0c84d9
Dmitriy Ivanov [Mon, 1 Sep 2014 23:15:52 +0000 (16:15 -0700)]
Introduce size-based r/w allocators
Change-Id: I75165fc392e5380124039e6db49b0f559c8a518e
Dmitriy Ivanov [Mon, 1 Sep 2014 21:36:47 +0000 (21:36 +0000)]
am
5120bcf9: Merge "Look into ld_preloads before current library"
* commit '
5120bcf9f11951bffd8ac595c2b70252ed4a4958':
Look into ld_preloads before current library
Dmitriy Ivanov [Mon, 1 Sep 2014 21:34:15 +0000 (14:34 -0700)]
resolved conflicts for merge of
c191a8ad to lmp-dev-plus-aosp
Change-Id: I24dcf9701ebe3344796f757a596754cbefbf358a
Dmitriy Ivanov [Mon, 1 Sep 2014 21:24:50 +0000 (21:24 +0000)]
am
11387985: Merge "Erase elements in LinkedList::remove_if"
* commit '
11387985d27f7d9794963779c69dcf0056bac43c':
Erase elements in LinkedList::remove_if
Dmitriy Ivanov [Mon, 1 Sep 2014 21:16:40 +0000 (21:16 +0000)]
Merge "Look into ld_preloads before current library"
Dmitriy Ivanov [Fri, 29 Aug 2014 17:15:25 +0000 (10:15 -0700)]
Look into ld_preloads before current library
Change lookup order during relocation so that
ld_preloads always precede caller (unless caller
is main executable).
Asan needs this change in order to intercept libc->libc
calls.
Bug:
15432753
(cherry picked from commit
05e190c093ad5b04691ed87100a711ef91f380b0)
Change-Id: I5bfb58e18015b1ec5b77842dbb37fb122fa1fd1a
Dmitriy Ivanov [Mon, 1 Sep 2014 21:08:54 +0000 (21:08 +0000)]
Merge "Look into ld_preloads before current library" into lmp-dev
Dmitriy Ivanov [Mon, 1 Sep 2014 21:06:32 +0000 (21:06 +0000)]
Merge "Erase elements in LinkedList::remove_if"
Elliott Hughes [Sun, 31 Aug 2014 05:30:48 +0000 (22:30 -0700)]
resolved conflicts for merge of
b2eb09a9 to lmp-dev-plus-aosp
Change-Id: I0208958d78d6d7bc8c41568aa9abee15605b951e
Hans Boehm [Sat, 30 Aug 2014 01:25:10 +0000 (01:25 +0000)]
am
e505cc66: Merge "Make stdatomic.h work with gcc4.6 host compiler"
* commit '
e505cc66a6e03f4ba460de3500f8b272421482c1':
Make stdatomic.h work with gcc4.6 host compiler
Hans Boehm [Sat, 30 Aug 2014 00:49:51 +0000 (00:49 +0000)]
Merge "Make stdatomic.h work with gcc4.6 host compiler"
Dmitriy Ivanov [Fri, 29 Aug 2014 21:01:48 +0000 (14:01 -0700)]
Erase elements in LinkedList::remove_if
Change-Id: I5119a78c73ffe780a81c53ab5ff0266d5c82d319
Hans Boehm [Thu, 28 Aug 2014 22:21:32 +0000 (15:21 -0700)]
Make stdatomic.h work with gcc4.6 host compiler
This is needed to make L work correctly, and bionic tests pass
again, after applying the equivalent of
commit
00aaea364501b3b0abe58dae461136159df1e356 there.
It makes the preexisting code that uses __sync implementations
much more useful, although we should no longer be exercising that
code in AOSP.
Specifically fixes:
We were invoking __has_extension and __has_builtin for GCC compilations.
They're clang specific. Restructured the tests.
The __sync implementation was not defining the LOCK_FREE macros.
ATOMIC_VAR_INIT was using named field initializations. These are a
C, not C++, feature, that is not supported by g++ 4.6.
The stdatomic bionic test still failed with 4.6 and glibc with our
questionable LOCK_FREE macro implementation. Don't run that piece
with 4.6.
In L, this is a prerequisite for fixing:
Bug:
16880454
Bug:
16513433
Change-Id: I9b61e42307f96a114dce7552b6ead4ad1c544eab
Elliott Hughes [Fri, 29 Aug 2014 23:30:14 +0000 (23:30 +0000)]
am
bbe06e0d: Merge "Use __GNUC_PREREQ rather than __GNUC_PREREQ__ to match glibc."
* commit '
bbe06e0da1742e9bdc52d3246ffa9f2ab3ce999a':
Use __GNUC_PREREQ rather than __GNUC_PREREQ__ to match glibc.
Elliott Hughes [Fri, 29 Aug 2014 22:54:11 +0000 (15:54 -0700)]
Use __GNUC_PREREQ rather than __GNUC_PREREQ__ to match glibc.
Bug:
16874785
(cherry picked from commit
e0c56efddf55ad40cb35b2c22e1dd9b4b50df159)
Change-Id: I9c922ba019f648766fc399d1c4e35e789e25acd4
Elliott Hughes [Fri, 29 Aug 2014 23:08:00 +0000 (23:08 +0000)]
Merge "Use __GNUC_PREREQ rather than __GNUC_PREREQ__ to match glibc."
Elliott Hughes [Fri, 29 Aug 2014 22:54:11 +0000 (15:54 -0700)]
Use __GNUC_PREREQ rather than __GNUC_PREREQ__ to match glibc.
Bug:
16874785
Change-Id: I8512f8be3fd149d8720c5c3b4657bedd5ce2b1d1
Dmitriy Ivanov [Fri, 29 Aug 2014 22:51:53 +0000 (22:51 +0000)]
am
83b637fa: Merge "Replace NULL with nullptr"
* commit '
83b637fa28e072aa73691b5ddc588293f06cb54b':
Replace NULL with nullptr
Dmitriy Ivanov [Fri, 29 Aug 2014 22:30:07 +0000 (22:30 +0000)]
Merge "Replace NULL with nullptr"
Dmitriy Ivanov [Fri, 29 Aug 2014 19:02:36 +0000 (12:02 -0700)]
Replace NULL with nullptr
Change-Id: Iad50be617d318ca98883b843229c960ad5b9afa9
Dmitriy Ivanov [Fri, 29 Aug 2014 17:15:25 +0000 (10:15 -0700)]
Look into ld_preloads before current library
Change lookup order during relocation so that
ld_preloads always precede caller (unless caller
is main executable).
Asan needs this change in order to intercept libc->libc
calls.
Bug:
15432753
Change-Id: If69aa16efe59aa35bb30e96feb83d08f1efbec86
Elliott Hughes [Fri, 29 Aug 2014 18:30:59 +0000 (18:30 +0000)]
am
1f39afc8: Merge "The host prebuilt glibc is 2.11, so remove workarounds for 2.9."
* commit '
1f39afc8d4cf402a8aa46d6cb121c62d289922d3':
The host prebuilt glibc is 2.11, so remove workarounds for 2.9.
Elliott Hughes [Fri, 29 Aug 2014 18:12:36 +0000 (18:12 +0000)]
Merge "The host prebuilt glibc is 2.11, so remove workarounds for 2.9."
Chih-Hung Hsieh [Fri, 29 Aug 2014 11:39:56 +0000 (11:39 +0000)]
am
cc4259ed: Merge "Ignore all __weak_alias in OpenBSD libC."
* commit '
cc4259ed9254ae66f63cacc3ad50963c4058eb1c':
Ignore all __weak_alias in OpenBSD libC.
Elliott Hughes [Fri, 29 Aug 2014 11:39:55 +0000 (11:39 +0000)]
am
29f06943: Merge "Add GNU-compatible strerror_r."
* commit '
29f06943a19ef2271a08f4223f597a3383f0d9c0':
Add GNU-compatible strerror_r.
Chih-Hung Hsieh [Fri, 29 Aug 2014 03:10:43 +0000 (03:10 +0000)]
Merge "Ignore all __weak_alias in OpenBSD libC."
Elliott Hughes [Fri, 29 Aug 2014 02:28:35 +0000 (19:28 -0700)]
The host prebuilt glibc is 2.11, so remove workarounds for 2.9.
Change-Id: I1072fcebc8b3018580a9d069fe6eca9c4e74e865
Elliott Hughes [Fri, 29 Aug 2014 02:26:33 +0000 (02:26 +0000)]
Merge "Add GNU-compatible strerror_r."
Elliott Hughes [Tue, 19 Aug 2014 00:28:32 +0000 (17:28 -0700)]
Add GNU-compatible strerror_r.
We already had the POSIX strerror_r, but some third-party code defines
_GNU_SOURCE and expects to get the GNU strerror_r instead.
This exposed a bug in the libc internal logging functions where unlike
their standard brethren they wouldn't return the number of bytes they'd
have liked to have written.
Bug:
16243479
Change-Id: I1745752ccbdc569646d34f5071f6df2be066d5f4
Chih-Hung Hsieh [Thu, 28 Aug 2014 18:47:48 +0000 (11:47 -0700)]
Ignore all __weak_alias in OpenBSD libC.
GCC assembler allows xyz to be redeclared as weak,
by __weak_alias(xyz, _xyz), while _xyz is undefined.
Clang does not like that but silently generates no code.
It will reject its own .s file if the assembly code is saved first.
Since we have no reason to define xyz or _xyz as weak symbol now,
and _xyz is a macro to xyz, we simplify libC to have only
xyz defined as global.
BUG:
17186746
Change-Id: I24b154425838683cae69248cc750c59e26fd5467
Elliott Hughes [Thu, 28 Aug 2014 03:37:22 +0000 (03:37 +0000)]
am
67f1f3b1: Have pthread_attr_getstack for the main thread report RLIMIT_STACK...
* commit '
67f1f3b171ecd5f68f51465bbe4b8c8440bb6b2e':
Have pthread_attr_getstack for the main thread report RLIMIT_STACK...
Elliott Hughes [Thu, 28 Aug 2014 03:03:04 +0000 (20:03 -0700)]
resolved conflicts for merge of
a0eeb0b6 to lmp-dev-plus-aosp
Change-Id: I84193689c0d6a9ee70b8da3c509694eb6d747d4a
Elliott Hughes [Thu, 28 Aug 2014 00:00:07 +0000 (00:00 +0000)]
am
f4e721dd: Merge "Have pthread_attr_getstack for the main thread report RLIMIT_STACK..."
* commit '
f4e721dd519db89c504c8944763811a3df956b32':
Have pthread_attr_getstack for the main thread report RLIMIT_STACK...
Elliott Hughes [Wed, 27 Aug 2014 22:32:01 +0000 (15:32 -0700)]
Have pthread_attr_getstack for the main thread report RLIMIT_STACK...
...rather than just what's already mapped in. This seems somewhat
contrary to POSIX's "All pages within the stack described by stackaddr
and stacksize shall be both readable and writable by the thread", but
it's what glibc does.
Bug:
17111575
(cherry picked from commit
9e4ffa7032eaab308876b8e3da86b05c3c613878)
Change-Id: I73f219a569917b2e4546c09436d7ef5231facc07
Elliott Hughes [Wed, 27 Aug 2014 23:49:56 +0000 (23:49 +0000)]
Merge "Fix pthread_getattr_np for the main thread." into lmp-dev
Elliott Hughes [Wed, 27 Aug 2014 23:43:26 +0000 (23:43 +0000)]
Merge "Have pthread_attr_getstack for the main thread report RLIMIT_STACK..."
Christopher Ferris [Wed, 27 Aug 2014 23:41:56 +0000 (23:41 +0000)]
am
af9da4a3: Merge "Replace snprintf calls in linker."
* commit '
af9da4a343d8fe2456e9d861bbd75bba67f2193c':
Replace snprintf calls in linker.
Christopher Ferris [Wed, 27 Aug 2014 23:29:18 +0000 (23:29 +0000)]
Merge "Replace snprintf calls in linker."
Chih-Hung Hsieh [Wed, 27 Aug 2014 23:24:27 +0000 (23:24 +0000)]
am
fbe9d3df: Merge "Fix strlen function type for mips."
* commit '
fbe9d3dfeb0e09c0e4aa3221aace8249c0efe881':
Fix strlen function type for mips.
Chih-Hung Hsieh [Wed, 27 Aug 2014 23:07:54 +0000 (23:07 +0000)]
Merge "Fix strlen function type for mips."
Christopher Ferris [Wed, 27 Aug 2014 03:48:11 +0000 (20:48 -0700)]
Replace snprintf calls in linker.
When enabling debug malloc, the snprintf calls in the linker fails to
update the buffer.
The problem is that snprintf makes a call to pthread_getspecific that
returns a valid pointer, but the data it points to is zero. This should
never happen and causes the snprintf to stop and do nothing.
Temporarily replace snprintf with a different implementation to work
around this issue.
Bug:
16874447
Bug:
17302493
(cherry pick from commit
172955a4e30b88ce8239a7ef426b4e8903e9923c)
Change-Id: Idca9d417978403d61debfd0434aaa82fd770f33b
Chih-Hung Hsieh [Wed, 27 Aug 2014 21:13:09 +0000 (14:13 -0700)]
Fix strlen function type for mips.
Clang complains about incompatible-library-redeclaration.
BUG:
17302369
Change-Id: I3ae36f24846408c6464b84b5bddb1747e1e4a971
Yigit Boyar [Wed, 27 Aug 2014 23:00:12 +0000 (23:00 +0000)]
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/bionic into lmp-dev-plus-aosp
Christopher Ferris [Wed, 27 Aug 2014 23:00:10 +0000 (23:00 +0000)]
am
598d25bf: Merge "Replace snprintf calls in linker." into lmp-dev
* commit '
598d25bf78fa632e70cb80d4033572328f5bd1b7':
Replace snprintf calls in linker.
Chih-Hung Hsieh [Wed, 27 Aug 2014 23:00:09 +0000 (23:00 +0000)]
am
4f8268e3: Merge "Replace ambiguous cmp instruction with cmpl."
* commit '
4f8268e38f151724722bcb489c32185a93fd86ba':
Replace ambiguous cmp instruction with cmpl.
Chih-Hung Hsieh [Wed, 27 Aug 2014 22:46:06 +0000 (22:46 +0000)]
Merge "Replace ambiguous cmp instruction with cmpl."
Christopher Ferris [Wed, 27 Aug 2014 22:42:11 +0000 (22:42 +0000)]
Merge "Replace snprintf calls in linker." into lmp-dev
Elliott Hughes [Wed, 27 Aug 2014 22:32:01 +0000 (15:32 -0700)]
Have pthread_attr_getstack for the main thread report RLIMIT_STACK...
...rather than just what's already mapped in. This seems somewhat
contrary to POSIX's "All pages within the stack described by stackaddr
and stacksize shall be both readable and writable by the thread", but
it's what glibc does.
Bug:
17111575
Change-Id: If9e2dfad9a603c0d0615a8123aacda4946e95b2c
Christopher Ferris [Wed, 27 Aug 2014 03:48:11 +0000 (20:48 -0700)]
Replace snprintf calls in linker.
When enabling debug malloc, the snprintf calls in the linker fails to
update the buffer.
The problem is that snprintf makes a call to pthread_getspecific that
returns a valid pointer, but the data it points to is zero. This should
never happen and causes the snprintf to stop and do nothing.
Temporarily replace snprintf with a different implementation to work
around this issue.
Bug:
16874447
Bug:
17302493
Change-Id: I7a500f28adf153150cf2812fae745ff41f1c48d3
Chih-Hung Hsieh [Wed, 27 Aug 2014 22:05:14 +0000 (22:05 +0000)]
am
34da32e7: Merge "Add missing type casts before comparison."
* commit '
34da32e7dd00270e98b845f8a810a6f12ffffb9b':
Add missing type casts before comparison.
Chih-Hung Hsieh [Wed, 27 Aug 2014 22:04:23 +0000 (15:04 -0700)]
Replace ambiguous cmp instruction with cmpl.
Clang assembler rejects ambiguous cmp instruction.
BUG:
17302482
Change-Id: I74f49de87464541f9fe6fa288e4093a9fbf37120
Chih-Hung Hsieh [Wed, 27 Aug 2014 21:44:12 +0000 (21:44 +0000)]
Merge "Add missing type casts before comparison."
Christopher Ferris [Wed, 27 Aug 2014 21:35:16 +0000 (21:35 +0000)]
am
6ecd1cd1: Merge "Use the default unwind code."
* commit '
6ecd1cd195546ecaf4317beda3f1a1a27f1d0d57':
Use the default unwind code.
Christopher Ferris [Wed, 27 Aug 2014 21:21:28 +0000 (21:21 +0000)]
Merge "Use the default unwind code."
Chih-Hung Hsieh [Wed, 27 Aug 2014 20:45:37 +0000 (13:45 -0700)]
Add missing type casts before comparison.
BUG:
17300548
Change-Id: Ice9868f36c8fa8cd40bb13741b0e33c8f8d354fd
Christopher Ferris [Tue, 26 Aug 2014 22:47:42 +0000 (15:47 -0700)]
Use the default unwind code.
This speeds up the debug malloc code by using the original unwinding code.
The only catch is that it has to link in the libc++ arm unwind code or
there will be crashes when attempting to unwind through libc++ compiled
code.
Bug:
16874447
(cherry picked from commit
3f7635f4906c53fa744731efc35235456b7d93bf)
Change-Id: If8a3821cdd95ed481bb496bf2daab449d13790f8
Baligh Uddin [Wed, 27 Aug 2014 17:39:51 +0000 (17:39 +0000)]
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/bionic into lmp-dev-plus-aosp
Elliott Hughes [Wed, 27 Aug 2014 17:39:29 +0000 (17:39 +0000)]
am
cb322a11: Merge "call uselocale() before freelocale() to make sure that g_local_key has a valid locale."
* commit '
cb322a116804a690fdde6096d7efef4819151ad9':
call uselocale() before freelocale() to make sure that g_local_key has a valid locale.
Elliott Hughes [Wed, 27 Aug 2014 17:39:28 +0000 (17:39 +0000)]
am
64ae11ab: Merge "Switch to OpenBSD <err.h> implementation."
* commit '
64ae11ab766421fe2c49ebdecb14c36fe0a047fe':
Switch to OpenBSD <err.h> implementation.
Elliott Hughes [Wed, 27 Aug 2014 17:39:01 +0000 (17:39 +0000)]
am
6cc4e3b6: Merge "call uselocale() before freelocale() to make sure that g_local_key has a valid locale." into lmp-dev
* commit '
6cc4e3b6ce726fb7aab6eff1ca8f4a28f9f21ee9':
call uselocale() before freelocale() to make sure that g_local_key has a valid locale.
Elliott Hughes [Wed, 27 Aug 2014 17:27:46 +0000 (17:27 +0000)]
Merge "call uselocale() before freelocale() to make sure that g_local_key has a valid locale."
Wally Yau [Tue, 26 Aug 2014 16:47:23 +0000 (09:47 -0700)]
call uselocale() before freelocale() to make sure that g_local_key has a valid locale.
For tests that call uselocale(), the locale is stored in the
g_userlocale_key thread-specific key. If freelocale() is called later,
then g_uselocal_key points to a deleted pointer. CTS eventually calls
vfprintf to print the result, which calls MB_CUR_MAX and MB_CUR_MAX
accesses the deleted locale stored in g_uselocale_key, causing unpredictable
errors.
Fixed the tests by calling uselocale() with the old locale before
calling freelocale.
(cherry-pick of
8a46cf0fcf82b8c76e05be7e066ec854f974603a.)
Bug:
17299565
Change-Id: I87efa2a9b16999a11d587f68d3aeedcbe6ac8a2c
Elliott Hughes [Wed, 27 Aug 2014 17:26:02 +0000 (17:26 +0000)]
Merge "Switch to OpenBSD <err.h> implementation."
Elliott Hughes [Wed, 27 Aug 2014 17:25:23 +0000 (17:25 +0000)]
Merge "call uselocale() before freelocale() to make sure that g_local_key has a valid locale." into lmp-dev
Wally Yau [Tue, 26 Aug 2014 16:47:23 +0000 (09:47 -0700)]
call uselocale() before freelocale() to make sure that g_local_key has a valid locale.
For tests that call uselocale(), the locale is stored in the
g_userlocale_key thread-specific key. If freelocale() is called later,
then g_uselocal_key points to a deleted pointer. CTS eventually calls
vfprintf to print the result, which calls MB_CUR_MAX and MB_CUR_MAX
accesses the deleted locale stored in g_uselocale_key, causing unpredictable
errors.
Fixed the tests by calling uselocale() with the old locale before
calling freelocale.
Bug:
17299565
Change-Id: I87efa2a9b16999a11d587f68d3aeedcbe6ac8a2c
Christopher Ferris [Wed, 27 Aug 2014 04:46:05 +0000 (04:46 +0000)]
am
3f7635f4: Use the default unwind code.
* commit '
3f7635f4906c53fa744731efc35235456b7d93bf':
Use the default unwind code.
Hans Boehm [Wed, 27 Aug 2014 00:01:46 +0000 (00:01 +0000)]
am
6bfcefe0: Merge "Undefine _Atomic before redefining"
* commit '
6bfcefe02f8fbeec1f6790bd5ebb1fdd5dba1e33':
Undefine _Atomic before redefining
Elliott Hughes [Wed, 27 Aug 2014 00:01:45 +0000 (00:01 +0000)]
am
07401c71: Merge "Switch to OpenBSD daemon(3)."
* commit '
07401c7136af113304a22f4a8245ef3fc1b6929b':
Switch to OpenBSD daemon(3).
Elliott Hughes [Wed, 27 Aug 2014 00:01:42 +0000 (00:01 +0000)]
am
f1e64b5c: (-s ours) Merge "More cases where libc should use O_CLOEXEC."
* commit '
f1e64b5c171a374f36cd970df0c84558d4209e1c':
More cases where libc should use O_CLOEXEC.
Elliott Hughes [Wed, 27 Aug 2014 00:00:37 +0000 (17:00 -0700)]
Switch to OpenBSD <err.h> implementation.
Change-Id: Ia950d88871a30f68e74f9ac7dbd87788e128e02f
Elliott Hughes [Tue, 26 Aug 2014 23:41:23 +0000 (23:41 +0000)]
am
7b87d441: Merge "Switch to OpenBSD res_random."
* commit '
7b87d441b0f2aa3ad5021ab6bd879a995a1bc2ce':
Switch to OpenBSD res_random.
Elliott Hughes [Tue, 26 Aug 2014 23:41:23 +0000 (23:41 +0000)]
am
59de803a: Merge "libc should use O_CLOEXEC when opening files for its own use."
* commit '
59de803af98a284378303489f614be3e53800b3f':
libc should use O_CLOEXEC when opening files for its own use.
Dmitriy Ivanov [Tue, 26 Aug 2014 23:41:22 +0000 (23:41 +0000)]
am
9f5dee55: Merge "Remove unnecessary calls to LinkedList::clear()"
* commit '
9f5dee55aa401b11b3eb15806d3f8ffc291c2bb1':
Remove unnecessary calls to LinkedList::clear()
Hans Boehm [Tue, 26 Aug 2014 23:34:49 +0000 (23:34 +0000)]
Merge "Undefine _Atomic before redefining"
Elliott Hughes [Tue, 26 Aug 2014 23:33:43 +0000 (23:33 +0000)]
Merge "Switch to OpenBSD daemon(3)."
Dmitriy Ivanov [Tue, 26 Aug 2014 23:26:32 +0000 (23:26 +0000)]
am
d2bd3c47: Merge "Enable __cxa_atexit && __cxa_finalize for linker"
* commit '
d2bd3c4717ed223bca1c68a87f243f4bcf492a4b':
Enable __cxa_atexit && __cxa_finalize for linker
Elliott Hughes [Tue, 26 Aug 2014 23:25:19 +0000 (16:25 -0700)]
Switch to OpenBSD daemon(3).
Change-Id: I1fd0be09fdb24aa6f1d945410eba5987f8a949b4
Elliott Hughes [Tue, 26 Aug 2014 23:23:58 +0000 (23:23 +0000)]
Merge "More cases where libc should use O_CLOEXEC."
Elliott Hughes [Tue, 26 Aug 2014 23:20:59 +0000 (16:20 -0700)]
More cases where libc should use O_CLOEXEC.
Change-Id: Idfa111aeebc5deca2399dae919e8b72eb54c23c0
Elliott Hughes [Tue, 26 Aug 2014 23:18:04 +0000 (23:18 +0000)]
Merge "Switch to OpenBSD res_random."
Elliott Hughes [Tue, 26 Aug 2014 23:11:45 +0000 (23:11 +0000)]
Merge "libc should use O_CLOEXEC when opening files for its own use."