OSDN Git Service
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
Dmitriy Ivanov [Tue, 26 Aug 2014 22:53:15 +0000 (22:53 +0000)]
Merge "Enable __cxa_atexit && __cxa_finalize for linker"
Dmitriy Ivanov [Tue, 26 Aug 2014 21:16:52 +0000 (14:16 -0700)]
Enable __cxa_atexit && __cxa_finalize for linker
This allows adding destructors to classes used
for global variables.
Change-Id: I5e1cd63fe3bf8f66de88cc4f7437cafb350f49b5
Elliott Hughes [Tue, 26 Aug 2014 20:08:44 +0000 (20:08 +0000)]
am
c764fb24: Merge "Fix pthread_getattr_np for the main thread."
* commit '
c764fb24ccb47e05d8e140cde5b4111225790ef1':
Fix pthread_getattr_np for the main thread.
Elliott Hughes [Tue, 26 Aug 2014 19:53:40 +0000 (19:53 +0000)]
Merge "Fix pthread_getattr_np for the main thread."
Elliott Hughes [Tue, 26 Aug 2014 00:26:50 +0000 (17:26 -0700)]
Fix pthread_getattr_np for the main thread.
On most architectures the kernel subtracts a random offset to the stack
pointer in create_elf_tables by calling arch_align_stack before writing
the auxval table and so on. On all but x86 this doesn't cause a problem
because the random offset is less than a page, but on x86 it's up to two
pages. This means that our old technique of rounding the stack pointer
doesn't work. (Our old implementation of that technique was wrong too.)
It's also incorrect to assume that the main thread's stack base and size
are constant. Likewise to assume that the main thread has a guard page.
The main thread is not like other threads.
This patch switches to reading /proc/self/maps (and checking RLIMIT_STACK)
whenever we're asked.
Bug:
17111575
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Change-Id: I1d4dbffe7bc7bda1d353c3a295dbf68d29f63158
Chih-Hung Hsieh [Mon, 25 Aug 2014 22:29:24 +0000 (22:29 +0000)]
am
9e307af9: Merge "Add standard throw() spec to delete operators."
* commit '
9e307af982ea9030849293b5e3307733289e3c2c':
Add standard throw() spec to delete operators.
Chih-Hung Hsieh [Mon, 25 Aug 2014 22:08:32 +0000 (22:08 +0000)]
Merge "Add standard throw() spec to delete operators."
Chih-Hung Hsieh [Mon, 25 Aug 2014 19:08:19 +0000 (12:08 -0700)]
Add standard throw() spec to delete operators.
Without these specs, clang will reports mismatch between standard definitions and these declarations/definitions. These specs are ignored when compiled with -fno-exceptions.
BUG:
17136236
Change-Id: I386c712a61dc4fc74dfde45f9ec2d3d037f2e9f1
Hans Boehm [Fri, 22 Aug 2014 23:15:54 +0000 (23:15 +0000)]
am
a4a8c4fe: Merge "Fix, generalize stdatomic.h; improve test."
* commit '
a4a8c4feb8cf3cebf8aceace70e699e128095b5c':
Fix, generalize stdatomic.h; improve test.
Hans Boehm [Fri, 22 Aug 2014 22:52:31 +0000 (22:52 +0000)]
Merge "Fix, generalize stdatomic.h; improve test."
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.
Change-Id: If6a14c1075b379395ba5d93357d56025c0ffab68
Dmitriy Ivanov [Fri, 22 Aug 2014 21:03:34 +0000 (21:03 +0000)]
am
9d34f6a9: Merge "Bump soinfo version"
* commit '
9d34f6a90973bea086b4244df6eff74ab2211814':
Bump soinfo version
Dmitriy Ivanov [Fri, 22 Aug 2014 20:44:56 +0000 (20:44 +0000)]
Merge "Bump soinfo version"
Dmitriy Ivanov [Fri, 22 Aug 2014 19:25:04 +0000 (12:25 -0700)]
Bump soinfo version
This includes:
1. Placing has_ifunc after fields with version = 0
2. Switch to has_min_version(v) function.
3. Minor soinfo initialization refactoring (placement new + ctor)
Change-Id: I1bf5fde4d930914012ce5f3ad5acb48217da9b2d
Dan Albert [Fri, 22 Aug 2014 18:25:06 +0000 (18:25 +0000)]
am
0b9fa4c9: Merge "Fix dlmalloc build."
* commit '
0b9fa4c9bff5d3128f120a2008aa6997c7363b49':
Fix dlmalloc build.
Dan Albert [Fri, 22 Aug 2014 18:06:36 +0000 (18:06 +0000)]
Merge "Fix dlmalloc build."
Dan Albert [Fri, 22 Aug 2014 18:05:48 +0000 (11:05 -0700)]
Fix dlmalloc build.
Change-Id: Ied542c40867ab443cdd2076bd2e535b00c4854e4
Dan Albert [Fri, 22 Aug 2014 18:04:08 +0000 (18:04 +0000)]
am
4756afe3: Merge "Implement malloc_info(3)."
* commit '
4756afe3d5017b50c89761c47f0da17a6799c81e':
Implement malloc_info(3).
Dan Albert [Fri, 22 Aug 2014 17:39:18 +0000 (17:39 +0000)]
Merge "Implement malloc_info(3)."
Dan Albert [Wed, 20 Aug 2014 16:16:57 +0000 (09:16 -0700)]
Implement malloc_info(3).
Expose jemalloc stats through the malloc_info(3) interface.
Bug:
16874689
Change-Id: I4358ac283002e60ff161107028d1a3fb1e9afb0a
Elliott Hughes [Fri, 22 Aug 2014 16:42:23 +0000 (16:42 +0000)]
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/bionic into lmp-dev-plus-aosp
Elliott Hughes [Fri, 22 Aug 2014 16:42:17 +0000 (16:42 +0000)]
am
84d0683a: Fix unistd.getpid_caching_and_clone.
* commit '
84d0683a824fa02dbaa6d1b56a79223804b54e80':
Fix unistd.getpid_caching_and_clone.
Elliott Hughes [Fri, 22 Aug 2014 16:42:15 +0000 (16:42 +0000)]
am
538db6d2: Merge "Fix unistd.getpid_caching_and_clone."
* commit '
538db6d2e63b203622c49344488099eaa5062850':
Fix unistd.getpid_caching_and_clone.
Elliott Hughes [Fri, 22 Aug 2014 16:28:02 +0000 (16:28 +0000)]
Merge "Fix unistd.getpid_caching_and_clone."
Elliott Hughes [Fri, 22 Aug 2014 02:23:53 +0000 (19:23 -0700)]
Fix unistd.getpid_caching_and_clone.
This test only works if you're root (strictly: if you have permission to
CLONE_NEWNS), so it's useful to us when we're doing ad hoc testing (since
that's usually done as root), but it's not useful as part of CTS or when
running the tests on the host.
(cherry-pick of
84d0683a824fa02dbaa6d1b56a79223804b54e80.)
Bug:
16705621
Bug:
17170200
Change-Id: Ia92c871b15f7e45fc174bb59bc95540fd00ae745
Elliott Hughes [Fri, 22 Aug 2014 02:23:53 +0000 (19:23 -0700)]
Fix unistd.getpid_caching_and_clone.
This test only works if you're root (strictly: if you have permission to
CLONE_NEWNS), so it's useful to us when we're doing ad hoc testing (since
that's usually done as root), but it's not useful as part of CTS or when
running the tests on the host.
Bug:
16705621
Bug:
17170200
Change-Id: Ia92c871b15f7e45fc174bb59bc95540fd00ae745
Dan Albert [Thu, 21 Aug 2014 22:12:30 +0000 (22:12 +0000)]
am
2e6c5fc4: Merge "Remove _flush_cache(2) for mips64."
* commit '
2e6c5fc4e903b6ef58bd94e13e51b3f0aa4689b3':
Remove _flush_cache(2) for mips64.
Dan Albert [Thu, 21 Aug 2014 21:51:41 +0000 (21:51 +0000)]
Merge "Remove _flush_cache(2) for mips64."
Dmitriy Ivanov [Thu, 21 Aug 2014 21:45:24 +0000 (21:45 +0000)]
am
2bd88d45: Merge "Run constructors before resolving ifunc functions"
* commit '
2bd88d450ead2ad8b44a76126c720cf4a9772002':
Run constructors before resolving ifunc functions
Dmitriy Ivanov [Thu, 21 Aug 2014 21:27:52 +0000 (21:27 +0000)]
Merge "Run constructors before resolving ifunc functions"
Dmitriy Ivanov [Thu, 21 Aug 2014 20:54:03 +0000 (13:54 -0700)]
Run constructors before resolving ifunc functions
Bug:
17177284
Change-Id: I5714b9bc2d1ca8f8711806bfb68da3d524213e99
Dan Albert [Thu, 21 Aug 2014 19:13:24 +0000 (12:13 -0700)]
Remove _flush_cache(2) for mips64.
Also remove declaration.
The only user is compiler-rt, and they can replace that call with one to
syscall(2). compiler-rt doesn't currently build on mips64 anyway.
Bug:
11156955
Change-Id: Ieae0ba49c8e7aa50253401fc1d7c2d17bc867d39
Dan Albert [Thu, 21 Aug 2014 19:33:19 +0000 (19:33 +0000)]
am
31572118: Merge "__gnu_basename(3) is accounted for."
* commit '
3157211849f808f89a7f1465fd60d6b41917ee4f':
__gnu_basename(3) is accounted for.
Dan Albert [Thu, 21 Aug 2014 19:14:44 +0000 (19:14 +0000)]
Merge "__gnu_basename(3) is accounted for."
Dan Albert [Thu, 21 Aug 2014 18:36:07 +0000 (11:36 -0700)]
__gnu_basename(3) is accounted for.
Change-Id: I3836b14a797c4a8d121c6d29d95791ac768257da
Elliott Hughes [Thu, 21 Aug 2014 18:25:59 +0000 (18:25 +0000)]
am
2d80400a: Fix some 32-bit-isms in <stdio.h>.
* commit '
2d80400a9e8454038a3ec29959436184be0c4c65':
Fix some 32-bit-isms in <stdio.h>.
Elliott Hughes [Thu, 21 Aug 2014 03:11:32 +0000 (03:11 +0000)]
am
d5fbc371: Merge "Add POSIX-2008 fmemopen, open_memstream, and open_wmemstream."
* commit '
d5fbc37119ef6cd757ceb449cb071ee03c66590e':
Add POSIX-2008 fmemopen, open_memstream, and open_wmemstream.
Elliott Hughes [Thu, 21 Aug 2014 02:39:34 +0000 (02:39 +0000)]
Merge "Add POSIX-2008 fmemopen, open_memstream, and open_wmemstream."
Elliott Hughes [Wed, 20 Aug 2014 23:10:49 +0000 (16:10 -0700)]
Add POSIX-2008 fmemopen, open_memstream, and open_wmemstream.
Bug:
17164505
Change-Id: I59e28a08ff8b6ab632230b11a5807cfd5278aeb5
Elliott Hughes [Wed, 20 Aug 2014 20:54:13 +0000 (20:54 +0000)]
am
b6ed5407: Merge "Simplify _ALIGN_TEXT."
* commit '
b6ed54076abdd337150d7a92a661247b69d26cb4':
Simplify _ALIGN_TEXT.
Elliott Hughes [Wed, 20 Aug 2014 20:49:21 +0000 (20:49 +0000)]
am
7134fc30: Merge "Regenerate "services.h" from /etc/services."
* commit '
7134fc30892bff763e7c24ac722151e0777b5409':
Regenerate "services.h" from /etc/services.
Elliott Hughes [Wed, 20 Aug 2014 20:49:21 +0000 (20:49 +0000)]
am
3bcd414b: Merge "Clean up some of our python scripts."
* commit '
3bcd414b78e515482139c7dc3dad8cad3357b374':
Clean up some of our python scripts.
Elliott Hughes [Wed, 20 Aug 2014 20:49:14 +0000 (20:49 +0000)]
am
55244a9b: Merge "Add <stdio_ext.h> for elfutils."
* commit '
55244a9bdbc661212999655644c374352ae92040':
Add <stdio_ext.h> for elfutils.
Hans Boehm [Wed, 20 Aug 2014 20:48:45 +0000 (20:48 +0000)]
am
b61c5064: Merge "Work around atomic_load(const T*) issues."
* commit '
b61c50647b85b3c33af8ca155e88ec098d9e8cb0':
Work around atomic_load(const T*) issues.
Elliott Hughes [Wed, 20 Aug 2014 20:36:04 +0000 (20:36 +0000)]
Merge "Simplify _ALIGN_TEXT."
Elliott Hughes [Wed, 20 Aug 2014 20:11:58 +0000 (13:11 -0700)]
Simplify _ALIGN_TEXT.
Bug:
16872067
Change-Id: I2b622f252c21ce1b344c040f828ab3f4bf9b6c0a
Elliott Hughes [Wed, 20 Aug 2014 19:14:21 +0000 (12:14 -0700)]
Fix some 32-bit-isms in <stdio.h>.
Bug:
17157793
Change-Id: I8290e240b92e5617f4c12c0eacad6e622e677b6a
Hans Boehm [Tue, 19 Aug 2014 22:34:00 +0000 (22:34 +0000)]
Merge "Work around atomic_load(const T*) issues."
Elliott Hughes [Tue, 19 Aug 2014 22:19:07 +0000 (22:19 +0000)]
am
b9d674c8: Merge "Implement the GNU basename(3) in addition to the POSIX one."
* commit '
b9d674c8ada9c1e9c22b41bc7c89e35f11f4eb1e':
Implement the GNU basename(3) in addition to the POSIX one.
Hans Boehm [Tue, 19 Aug 2014 21:07:55 +0000 (14:07 -0700)]
Work around atomic_load(const T*) issues.
Bug:
17067219
Change-Id: I78e753bcf03464f5f05c3f37e394f2727d282589
Dan Albert [Tue, 19 Aug 2014 20:29:23 +0000 (20:29 +0000)]
am
1506fc17: Expose android_set_abort_message().
* commit '
1506fc178e9dcd873eaf95535ac7625ebb59388f':
Expose android_set_abort_message().
Elliott Hughes [Tue, 19 Aug 2014 20:26:45 +0000 (20:26 +0000)]
am
c5d6df6f: Merge "Add in_port_t and move it and in_addr_t to the correct header file."
* commit '
c5d6df6f2fe57fd5aadbd9ebb131023234c30a0c':
Add in_port_t and move it and in_addr_t to the correct header file.
Elliott Hughes [Tue, 19 Aug 2014 19:04:24 +0000 (19:04 +0000)]
am
6f4220c4: Merge "Move the meat of <features.h> into <sys/cdefs.h>."
* commit '
6f4220c49e90b18a50d36e47cc9287c7593af939':
Move the meat of <features.h> into <sys/cdefs.h>.
Dan Albert [Mon, 18 Aug 2014 21:37:42 +0000 (14:37 -0700)]
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
(cherry picked from commit
ce6b1abbb1da797e716d8ec03da4e3b6304fd11d)
(cherry picked from commit
3a25ab952befbe908f6df45805683ebe3bf65863)
Dan Albert [Tue, 19 Aug 2014 18:39:11 +0000 (18:39 +0000)]
am
2222eae6: Merge "Missing #include <sys/cdefs.h>."
* commit '
2222eae61e723d946029899edaf7afcbaa160bb7':
Missing #include <sys/cdefs.h>.
Elliott Hughes [Tue, 19 Aug 2014 17:50:01 +0000 (17:50 +0000)]
am
17f83c93: Merge "Remove unused defines from <features.h>."
* commit '
17f83c93cbbde3e38a03182931f40b7390061a7d':
Remove unused defines from <features.h>.
Dan Albert [Tue, 19 Aug 2014 17:32:53 +0000 (17:32 +0000)]
am
934c8015: Merge "Expose android_set_abort_message()."
* commit '
934c8015d515f96c1f97255b48357da922cf626a':
Expose android_set_abort_message().
Elliott Hughes [Tue, 19 Aug 2014 17:11:21 +0000 (17:11 +0000)]
am
e4fcc3ad: Merge "Fix _BSD_SOURCE/__USE_BSD."
* commit '
e4fcc3ad2b2965858571f5fb7d485ceb7e4a8266':
Fix _BSD_SOURCE/__USE_BSD.
Dmitriy Ivanov [Tue, 19 Aug 2014 17:11:21 +0000 (17:11 +0000)]
am
8a76ee82: Merge "Revert "Add support for protected local symbol lookup.""
* commit '
8a76ee821e49a912d1777fbe83b1ab07c1da541a':
Revert "Add support for protected local symbol lookup."
Elliott Hughes [Tue, 19 Aug 2014 20:11:53 +0000 (20:11 +0000)]
Merge "Add in_port_t and move it and in_addr_t to the correct header file."
Elliott Hughes [Tue, 19 Aug 2014 19:43:50 +0000 (12:43 -0700)]
Add in_port_t and move it and in_addr_t to the correct header file.
No one's reported this, but I saw it in an Android port of fuser(1).
We still have lots of problems in our network headers because we
get most of the structs direct from the kernel, and it doesn't use
types like this (which is why we've got away without this one for
so long). One day we should probably look at cleaning that up, but
doing so can wait.
Change-Id: If15edf0cfc32716fa312d7ed97c48321b760d979
Dmitriy Ivanov [Tue, 19 Aug 2014 13:28:24 +0000 (06:28 -0700)]
resolved conflicts for merge of
e3ad34b3 to lmp-dev-plus-aosp
Change-Id: Ib744885890d38fa8dfbc130de8373343f49352cc
Elliott Hughes [Wed, 20 Aug 2014 17:41:08 +0000 (17:41 +0000)]
Merge "Add <stdio_ext.h> for elfutils."
Elliott Hughes [Wed, 20 Aug 2014 00:00:33 +0000 (17:00 -0700)]
Add <stdio_ext.h> for elfutils.
Bug:
17139679
Change-Id: I1605ac382dbb6f23b2d874dbb9769f3cde4a6a99
Elliott Hughes [Tue, 19 Aug 2014 22:04:58 +0000 (22:04 +0000)]
Merge "Implement the GNU basename(3) in addition to the POSIX one."
Elliott Hughes [Tue, 19 Aug 2014 21:30:30 +0000 (14:30 -0700)]
Implement the GNU basename(3) in addition to the POSIX one.
Code like perf(1) needs this.
Bug:
11860789
Change-Id: I907eb448052a7b165e4012d74303330d32328cb2
Elliott Hughes [Tue, 19 Aug 2014 18:55:17 +0000 (18:55 +0000)]
Merge "Move the meat of <features.h> into <sys/cdefs.h>."
Elliott Hughes [Tue, 19 Aug 2014 18:16:41 +0000 (11:16 -0700)]
Move the meat of <features.h> into <sys/cdefs.h>.
This way it's a lot harder for us to screw up (since we should always
be including <sys/cdefs.h> anyway).
Bug:
14659579
Change-Id: I23070fff3296b0d1c683bb5e3a6e214146327d53
Elliott Hughes [Tue, 19 Aug 2014 17:39:21 +0000 (17:39 +0000)]
Merge "Remove unused defines from <features.h>."
Elliott Hughes [Tue, 19 Aug 2014 17:07:00 +0000 (10:07 -0700)]
Remove unused defines from <features.h>.
Bug:
14659579
Change-Id: I2ab02b13cafe3faad31248b843d39ab2cdbfeb91
Elliott Hughes [Tue, 19 Aug 2014 16:48:43 +0000 (16:48 +0000)]
Merge "Fix _BSD_SOURCE/__USE_BSD."
Elliott Hughes [Tue, 19 Aug 2014 16:18:03 +0000 (09:18 -0700)]
Fix _BSD_SOURCE/__USE_BSD.
Bug:
14659579
Change-Id: I80ec9584f054c02d1078828f6bca759c42bc1d4c
Dmitriy Ivanov [Tue, 19 Aug 2014 16:45:34 +0000 (16:45 +0000)]
Merge "Revert "Add support for protected local symbol lookup.""
Dmitriy Ivanov [Mon, 18 Aug 2014 22:08:51 +0000 (15:08 -0700)]
Revert "Add support for protected local symbol lookup."
This reverts commit
d97e9f546ea195686a78e539315b273393609b9e.
Bug:
17107521
(cherry picked from commit
9419420919ea846bbad5510850c7aaec95021648)
Change-Id: I1a6df946ac8075699e77d68ffa6ac4a21b88e4bf
Elliott Hughes [Tue, 19 Aug 2014 00:41:14 +0000 (00:41 +0000)]
am
0baf2ca3: Merge "Fix <features.h> (_BSD_SOURCE and _GNU_SOURCE)."
* commit '
0baf2ca34c7d9ec067b1f33bad69782c2dedc231':
Fix <features.h> (_BSD_SOURCE and _GNU_SOURCE).
Elliott Hughes [Mon, 18 Aug 2014 22:28:12 +0000 (22:28 +0000)]
am
205cc415: Merge "Improve <sys/cdefs.h>."
* commit '
205cc41556d44b104a21bc6839b7ea44f72df9ba':
Improve <sys/cdefs.h>.
Dan Albert [Mon, 18 Aug 2014 21:58:13 +0000 (14:58 -0700)]
Resolved conflicts for merge of
6df7b609 to lmp-dev-plus-aosp.
Change-Id: I204e5701031c9ba9cd783c0db58cd51d93a5dc61
Elliott Hughes [Mon, 18 Aug 2014 22:11:55 +0000 (22:11 +0000)]
Merge "Improve <sys/cdefs.h>."
Elliott Hughes [Mon, 18 Aug 2014 21:45:42 +0000 (14:45 -0700)]
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
Dmitriy Ivanov [Tue, 19 Aug 2014 12:14:39 +0000 (12:14 +0000)]
Merge "Revert "Add support for protected local symbol lookup."" into lmp-dev
Dmitriy Ivanov [Mon, 18 Aug 2014 22:08:51 +0000 (15:08 -0700)]
Revert "Add support for protected local symbol lookup."
This reverts commit
d97e9f546ea195686a78e539315b273393609b9e.
Bug:
17107521
Change-Id: I2b81ce2b5a4a2d166133a2626e49d81b6aef3672
Christopher Ferris [Mon, 18 Aug 2014 21:05:59 +0000 (21:05 +0000)]
am
54d24e09: Merge "Fix leak_realloc, copy entire allocation."
* commit '
54d24e099c24d0811ae723640d4e12e9558cab73':
Fix leak_realloc, copy entire allocation.
Christopher Ferris [Mon, 18 Aug 2014 21:05:59 +0000 (21:05 +0000)]
am
3c7c9a8d: (-s ours) Merge "malloc_usable_size returns the original size."
* commit '
3c7c9a8d3fda1057b8a4dea85f357a044dd21563':
malloc_usable_size returns the original size.
Dan Albert [Fri, 15 Aug 2014 21:20:04 +0000 (14:20 -0700)]
Hide C++ stuff in libc. Put it back in libstdc++.
Bug:
17062445
Change-Id: I027b186719654c2865b08c3fa83f90fa00c1e838
(cherry picked from commit
fd5ee9aebc0a43c7f36a0778c7f416b39ddb870e)
Dan Albert [Mon, 18 Aug 2014 20:14:48 +0000 (20:14 +0000)]
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++.
Christopher Ferris [Mon, 18 Aug 2014 19:33:55 +0000 (19:33 +0000)]
am
9e56ce4c: Merge "Fix leak_realloc, copy entire allocation." into lmp-dev
* commit '
9e56ce4cd387cfa45de3a71dcccedd061e09d2f5':
Fix leak_realloc, copy entire allocation.
Elliott Hughes [Wed, 20 Aug 2014 19:21:54 +0000 (19:21 +0000)]
Merge "Regenerate "services.h" from /etc/services."
Elliott Hughes [Wed, 20 Aug 2014 19:11:31 +0000 (12:11 -0700)]
Regenerate "services.h" from /etc/services.
Change-Id: Iec118f9a342b5c1f6ce6d48965798b12a7159ad3
Elliott Hughes [Wed, 20 Aug 2014 19:07:51 +0000 (19:07 +0000)]
Merge "Clean up some of our python scripts."
Elliott Hughes [Wed, 20 Aug 2014 18:16:11 +0000 (11:16 -0700)]
Clean up some of our python scripts.
Change-Id: Ifa75345db43434298cfb6113fbe2f7a33b88c79d
Dan Albert [Tue, 19 Aug 2014 18:29:31 +0000 (18:29 +0000)]
Merge "Missing #include <sys/cdefs.h>."
Dan Albert [Tue, 19 Aug 2014 18:06:33 +0000 (11:06 -0700)]
Missing #include <sys/cdefs.h>.
Needed for __BEGIN_DECLS/__END_DECLS. Currently fine because it's being
included after other files that do this.
Change-Id: I1f12368fc461f6ef5ca90992cf19f317f0b5d7af
Dan Albert [Tue, 19 Aug 2014 17:18:19 +0000 (17:18 +0000)]
Merge "Expose android_set_abort_message()."
Dan Albert [Mon, 18 Aug 2014 21:37:42 +0000 (14:37 -0700)]
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
Christopher Ferris [Mon, 18 Aug 2014 20:12:54 +0000 (20:12 +0000)]
Merge "malloc_usable_size returns the original size."
Christopher Ferris [Thu, 14 Aug 2014 19:48:04 +0000 (12:48 -0700)]
malloc_usable_size returns the original size.
Bug:
16874447
(cherry picked from commit
59c1ee44d0a560a754513fab12641c8a57a20d9e)
Change-Id: I70839632974367c8b9893fb1f9c5ee4364608470
Christopher Ferris [Mon, 18 Aug 2014 20:12:59 +0000 (20:12 +0000)]
Merge "Fix leak_realloc, copy entire allocation."
Christopher Ferris [Sat, 16 Aug 2014 01:42:58 +0000 (18:42 -0700)]
Fix leak_realloc, copy entire allocation.
Bug:
16874447
(cherry picked from commit
5df0839cea98bd8c37d8dba5b94b98e99c681a94)
Change-Id: I9280505c0c1c3b5da24ba590448dcd6e7a230406
Dan Albert [Mon, 18 Aug 2014 19:56:41 +0000 (19:56 +0000)]
Merge "Hide C++ stuff in libc. Put it back in libstdc++."