Dan Albert
d971171dfb
am 934c8015: Merge "Expose android_set_abort_message()."
...
* commit '934c8015d515f96c1f97255b48357da922cf626a':
Expose android_set_abort_message().
2014-08-19 17:32:53 +00:00
Elliott Hughes
ecd48356e3
am e4fcc3ad: Merge "Fix _BSD_SOURCE/__USE_BSD."
...
* commit 'e4fcc3ad2b2965858571f5fb7d485ceb7e4a8266':
Fix _BSD_SOURCE/__USE_BSD.
2014-08-19 17:11:21 +00:00
Dmitriy Ivanov
707ed62b9f
am 8a76ee82: Merge "Revert "Add support for protected local symbol lookup.""
...
* commit '8a76ee821e49a912d1777fbe83b1ab07c1da541a':
Revert "Add support for protected local symbol lookup."
2014-08-19 17:11:21 +00:00
Dmitriy Ivanov
19bf7f7170
resolved conflicts for merge of e3ad34b3 to lmp-dev-plus-aosp
...
Change-Id: Ib744885890d38fa8dfbc130de8373343f49352cc
2014-08-19 06:28:24 -07:00
Elliott Hughes
e4fcc3ad2b
Merge "Fix _BSD_SOURCE/__USE_BSD."
2014-08-19 02:44:29 +00:00
Elliott Hughes
b810462028
Fix _BSD_SOURCE/__USE_BSD.
...
Bug: 14659579
Change-Id: I80ec9584f054c02d1078828f6bca759c42bc1d4c
2014-08-19 09:18:03 -07:00
Dmitriy Ivanov
8a76ee821e
Merge "Revert "Add support for protected local symbol lookup.""
2014-08-19 02:44:29 +00:00
Dmitriy Ivanov
02aa70589d
Revert "Add support for protected local symbol lookup."
...
This reverts commit d97e9f546ea195686a78e539315b273393609b9e.
Bug: 17107521
(cherry picked from commit 9419420919ea846bbad5510850c7aaec95021648)
Change-Id: I1a6df946ac8075699e77d68ffa6ac4a21b88e4bf
2014-08-19 05:19:53 -07:00
Elliott Hughes
38ba927c35
am 0baf2ca3: Merge "Fix <features.h> (_BSD_SOURCE and _GNU_SOURCE)."
...
* commit '0baf2ca34c7d9ec067b1f33bad69782c2dedc231':
Fix <features.h> (_BSD_SOURCE and _GNU_SOURCE).
2014-08-19 00:41:14 +00:00
Elliott Hughes
c228979648
am 205cc415: Merge "Improve <sys/cdefs.h>."
...
* commit '205cc41556d44b104a21bc6839b7ea44f72df9ba':
Improve <sys/cdefs.h>.
2014-08-18 22:28:12 +00:00
Dan Albert
247e441b0c
Resolved conflicts for merge of 6df7b609 to lmp-dev-plus-aosp.
...
Change-Id: I204e5701031c9ba9cd783c0db58cd51d93a5dc61
2014-08-18 14:58:13 -07:00
Elliott Hughes
205cc41556
Merge "Improve <sys/cdefs.h>."
2014-08-18 21:31:43 +00:00
Elliott Hughes
2cfb4e8e2e
Improve <sys/cdefs.h>.
...
Fix and use __RENAME (and lose ___RENAME --- two underscores should be
enough for anybody). This was the point of this change, because I want
to use __RENAME to support the two basename variants and the two
strerror_r variants.
Lose a bunch of macros that weren't being used.
Lose three dead files from the DNS code.
Change-Id: I3ef645c566b16a52217bc2e68c7d54b37c7c9522
2014-08-18 14:45:42 -07:00
Dmitriy Ivanov
e3ad34b3bc
Merge "Revert "Add support for protected local symbol lookup."" into lmp-dev
2014-08-18 21:31:41 +00:00
Dmitriy Ivanov
9419420919
Revert "Add support for protected local symbol lookup."
...
This reverts commit d97e9f546ea195686a78e539315b273393609b9e.
Bug: 17107521
Change-Id: I2b81ce2b5a4a2d166133a2626e49d81b6aef3672
2014-08-18 15:11:50 -07:00
Christopher Ferris
bd4351f945
am 54d24e09: Merge "Fix leak_realloc, copy entire allocation."
...
* commit '54d24e099c24d0811ae723640d4e12e9558cab73':
Fix leak_realloc, copy entire allocation.
2014-08-18 21:05:59 +00:00
Christopher Ferris
3290fd4625
am 3c7c9a8d: (-s ours) Merge "malloc_usable_size returns the original size."
...
* commit '3c7c9a8d3fda1057b8a4dea85f357a044dd21563':
malloc_usable_size returns the original size.
2014-08-18 21:05:59 +00:00
Dan Albert
6df7b60998
Hide C++ stuff in libc. Put it back in libstdc++.
...
Bug: 17062445
Change-Id: I027b186719654c2865b08c3fa83f90fa00c1e838
(cherry picked from commit fd5ee9aebc0a43c7f36a0778c7f416b39ddb870e)
2014-08-18 13:56:07 -07:00
Dan Albert
2b91cf32e6
am db2e0247: Merge "Hide C++ stuff in libc. Put it back in libstdc++."
...
* commit 'db2e0247ed67dfdf6e16eb47348db81dc8ccd04d':
Hide C++ stuff in libc. Put it back in libstdc++.
2014-08-18 20:14:48 +00:00
Christopher Ferris
3d7f92e914
am 9e56ce4c: Merge "Fix leak_realloc, copy entire allocation." into lmp-dev
...
* commit '9e56ce4cd387cfa45de3a71dcccedd061e09d2f5':
Fix leak_realloc, copy entire allocation.
2014-08-18 19:33:55 +00:00
Dan Albert
934c8015d5
Merge "Expose android_set_abort_message()."
2014-08-16 04:20:19 +00:00
Dan Albert
ce6b1abbb1
Expose android_set_abort_message().
...
Removes the leading underscores from __android_set_abort_message() and
moves its declaration into a public header file.
Bug: 17059126
Change-Id: I470c79db47ec783ea7a54b800f8b78ecbe7479ab
2014-08-18 14:37:42 -07:00
Christopher Ferris
3c7c9a8d3f
Merge "malloc_usable_size returns the original size."
2014-08-16 04:09:33 +00:00
Christopher Ferris
5d9e145c62
malloc_usable_size returns the original size.
...
Bug: 16874447
(cherry picked from commit 59c1ee44d0a560a754513fab12641c8a57a20d9e)
Change-Id: I70839632974367c8b9893fb1f9c5ee4364608470
2014-08-18 13:10:16 -07:00
Christopher Ferris
54d24e099c
Merge "Fix leak_realloc, copy entire allocation."
2014-08-16 04:08:14 +00:00
Christopher Ferris
6d40d34908
Fix leak_realloc, copy entire allocation.
...
Bug: 16874447
(cherry picked from commit 5df0839cea98bd8c37d8dba5b94b98e99c681a94)
Change-Id: I9280505c0c1c3b5da24ba590448dcd6e7a230406
2014-08-18 13:10:47 -07:00
Dan Albert
db2e0247ed
Merge "Hide C++ stuff in libc. Put it back in libstdc++."
2014-08-16 04:08:14 +00:00
Dan Albert
fd5ee9aebc
Hide C++ stuff in libc. Put it back in libstdc++.
...
Bug: 17062445
Change-Id: I027b186719654c2865b08c3fa83f90fa00c1e838
2014-08-18 12:01:01 -07:00
Elliott Hughes
0baf2ca34c
Merge "Fix <features.h> (_BSD_SOURCE and _GNU_SOURCE)."
2014-08-16 04:03:35 +00:00
Elliott Hughes
5f5cc45cf0
Fix <features.h> (_BSD_SOURCE and _GNU_SOURCE).
...
<features.h> is supposed to take user-settable stuff like _GNU_SOURCE
and _BSD_SOURCE and turn them into __USE_GNU and __USE_BSD for use in
the C library headers. Instead, bionic used to unconditionally define
_BSD_SOURCE and _GNU_SOURCE, and then test _GNU_SOURCE in the header
files (which makes no sense whatsoever).
Bug: 14659579
Change-Id: Ice4cf21a364ea2e559071dc8329e995277d5b987
2014-08-18 16:04:03 -07:00
Christopher Ferris
9e56ce4cd3
Merge "Fix leak_realloc, copy entire allocation." into lmp-dev
2014-08-16 04:01:11 +00:00
Christopher Ferris
5df0839cea
Fix leak_realloc, copy entire allocation.
...
Bug: 16874447
Change-Id: Ie54a73fd75529961195fa5173d9116d0ae897b03
2014-08-15 18:55:53 -07:00
Dmitriy Ivanov
05d2a98133
am 2b6cdb5e: Merge "Add atexit test for attributed c-tor/d-tor"
...
* commit '2b6cdb5e459661727c99e81660c7c3df5cdbe024':
Add atexit test for attributed c-tor/d-tor
2014-08-15 23:13:30 +00:00
Dmitriy Ivanov
18fbdce86e
am d8e00769: Merge "Keep symbols for linker" into lmp-dev
...
* commit 'd8e007695c755bba75b7243077271b6d655d818a':
Keep symbols for linker
2014-08-15 21:42:47 +00:00
Dmitriy Ivanov
2b6cdb5e45
Merge "Add atexit test for attributed c-tor/d-tor"
2014-08-15 21:23:56 +00:00
Dmitriy Ivanov
d8e007695c
Merge "Keep symbols for linker" into lmp-dev
2014-08-15 21:23:40 +00:00
Dmitriy Ivanov
4571f31bd4
Add atexit test for attributed c-tor/d-tor
...
1. Add test for __attribute__((constructor/destructor))
and static constructor
2. Compile C++ testlibs with -std=gnu++11
Change-Id: I67f9308144a0c638a51f111fcba8e1933fe0ba41
2014-08-15 14:22:07 -07:00
Dmitriy Ivanov
be4348e7c7
Keep symbols for linker
...
Bug: 17011146
(cherry picked from commit ad5e8b50737144833233d47fe04deb3fa0284df2)
Change-Id: Ib1d3f8d6d38af98586658e01ed1ec79d2c5b4d42
2014-08-15 14:18:26 -07:00
Hans Boehm
a1ff9e8eb0
am f0f66c02: Have stdatomic.h punt to C++ atomic when possible
...
* commit 'f0f66c0264eb4b6ee56072af34c91a78a9184f23':
Have stdatomic.h punt to C++ atomic when possible
2014-08-15 21:16:51 +00:00
Hans Boehm
f0f66c0264
Have stdatomic.h punt to C++ atomic when possible
...
This is an alternate, somewhat simpler, fix that makes it safe to
include both <atomic> and <stdatomic.h> from C++ code in either order.
It means that C code consistently uses one implementation of atomics
and C++ another. We still have to make sure that those two
implementations interoperate correctly at runtime; in particular,
any flavor of atomic object needs to be represented exactly like the
underlying type, with the proper alignment constraint.
Bug:17007799
Change-Id: Iffcfc5220d8fa150f89dd083a121b24d23f268fc
(cherry picked from commit 019d3958118b7dc3ec8444ad2accca50c268b737)
2014-08-15 11:42:36 -07:00
Hans Boehm
e9c7a4528c
am 7d05f741: Merge "Have stdatomic.h punt to C++ atomic when possible"
...
* commit '7d05f741e7885ad42f853b5fe2b1d31cdc756b5c':
Have stdatomic.h punt to C++ atomic when possible
2014-08-15 18:27:38 +00:00
Dan Albert
47822dae63
am e2050ae1: Merge "Change name of MB_CUR_MAX implementation function." into lmp-dev
...
* commit 'e2050ae1aa9d7e8e6f425bbb7a3991fe612f3913':
Change name of MB_CUR_MAX implementation function.
2014-08-15 11:49:36 +00:00
Dan Albert
716fe4caac
am 553c0ea5: Merge "Move mtctxres.c to libc_dns.a." into lmp-dev
...
* commit '553c0ea52bde59800fda2ddd380dd18d4f3ab192':
Move mtctxres.c to libc_dns.a.
2014-08-15 11:49:36 +00:00
Christopher Ferris
c3731ea8fd
am 0533195e: Merge "malloc_usable_size returns the original size." into lmp-dev
...
* commit '0533195e16b86794f14dfb1800ca170ce2548b9f':
malloc_usable_size returns the original size.
2014-08-15 11:36:56 +00:00
Hans Boehm
7d05f741e7
Merge "Have stdatomic.h punt to C++ atomic when possible"
2014-08-15 05:01:31 +00:00
Hans Boehm
019d395811
Have stdatomic.h punt to C++ atomic when possible
...
This is an alternate, somewhat simpler, fix that makes it safe to
include both <atomic> and <stdatomic.h> from C++ code in either order.
It means that C code consistently uses one implementation of atomics
and C++ another. We still have to make sure that those two
implementations interoperate correctly at runtime; in particular,
any flavor of atomic object needs to be represented exactly like the
underlying type, with the proper alignment constraint.
Bug:17007799
Change-Id: Iffcfc5220d8fa150f89dd083a121b24d23f268fc
2014-08-15 10:38:20 -07:00
Dmitriy Ivanov
a43011daf0
am 4bea4c63: Label pages mapped by linker_allocator
...
* commit '4bea4c631f747cc6b570ecd42c744a9b1103bf28':
Label pages mapped by linker_allocator
2014-08-14 23:34:48 +00:00
Dan Albert
3dbab7a709
am d0cce143: Merge "Move mtctxres.c to libc_dns.a."
...
* commit 'd0cce1436435bfcb477f2c5a670ea6675473c2f8':
Move mtctxres.c to libc_dns.a.
2014-08-14 23:28:19 +00:00
Dmitriy Ivanov
f6829737cc
am 8457779b: Merge "Keep symbols for linker"
...
* commit '8457779b3469f5fa6b8104c2fd3869a72f1345dd':
Keep symbols for linker
2014-08-14 22:55:53 +00:00
Dan Albert
49af4264ab
am 0d4ccee3: Merge "Change name of MB_CUR_MAX implementation function."
...
* commit '0d4ccee35101c6bcd6cc28c23fe79d7b48a98dd0':
Change name of MB_CUR_MAX implementation function.
2014-08-14 21:31:21 +00:00