OSDN Git Service
Elliott Hughes [Wed, 24 Sep 2014 20:44:46 +0000 (20:44 +0000)]
am
567d3fcb: Merge "Switch to OpenBSD fopen/fclose."
* commit '
567d3fcb7ece287a84912183e91eff851fa48fc2':
Switch to OpenBSD fopen/fclose.
Elliott Hughes [Wed, 24 Sep 2014 20:44:45 +0000 (20:44 +0000)]
am
4fcfd3a4: Merge "Sync with current upstream getopt_long.c."
* commit '
4fcfd3a474ae5a9e5095ca92a10a8aaa0a3dae5a':
Sync with current upstream getopt_long.c.
Elliott Hughes [Wed, 24 Sep 2014 20:24:47 +0000 (20:24 +0000)]
Merge "Switch to OpenBSD fopen/fclose."
Elliott Hughes [Wed, 24 Sep 2014 20:24:19 +0000 (20:24 +0000)]
Merge "Sync with current upstream getopt_long.c."
Elliott Hughes [Wed, 24 Sep 2014 19:39:34 +0000 (12:39 -0700)]
Sync with current upstream getopt_long.c.
Change-Id: I269195aa581a688fd3eb99552d506b8f5f6a8395
Elliott Hughes [Wed, 24 Sep 2014 18:14:36 +0000 (11:14 -0700)]
Switch to OpenBSD fopen/fclose.
This means all our stdio implementation is now the OpenBSD implementation.
The only thing we lose is the STDIO_THREAD_LOCK calls but they were no-ops
anyway.
We should probably talk to upstream about this. Either fix the locking or,
preferably, encourage them to move away from this pooling (especially since
there's no eviction policy).
Bug:
17154680
Change-Id: Ie2523e444a7d0965b8d141d57e3e11f6432d5b9a
Elliott Hughes [Wed, 24 Sep 2014 18:09:37 +0000 (18:09 +0000)]
am
f05410ed: Merge "Sync with upstream findfp.c."
* commit '
f05410edc634040f96643b8f378320faddfef423':
Sync with upstream findfp.c.
Elliott Hughes [Wed, 24 Sep 2014 17:48:58 +0000 (17:48 +0000)]
Merge "Sync with upstream findfp.c."
Dan Albert [Wed, 24 Sep 2014 17:45:54 +0000 (17:45 +0000)]
am
21db6ff1: Merge "Coverage configs for bionic."
* commit '
21db6ff108a8df43582bf2ca0d7d6c925f26b5e5':
Coverage configs for bionic.
Dan Albert [Wed, 24 Sep 2014 17:45:54 +0000 (17:45 +0000)]
am
4a6e7110: Merge "Add a dummy atexit(3) to the linker."
* commit '
4a6e71100e9c99b90b517be5a8e1c21616772d16':
Add a dummy atexit(3) to the linker.
Elliott Hughes [Wed, 24 Sep 2014 17:27:09 +0000 (10:27 -0700)]
Sync with upstream findfp.c.
Change-Id: Ib298f46de0c4d0fd4ce0a9b456c163e8b8b06342
Dan Albert [Wed, 24 Sep 2014 17:28:04 +0000 (17:28 +0000)]
Merge "Coverage configs for bionic."
Dan Albert [Wed, 24 Sep 2014 17:27:37 +0000 (17:27 +0000)]
Merge "Add a dummy atexit(3) to the linker."
Dan Albert [Tue, 23 Sep 2014 17:44:01 +0000 (10:44 -0700)]
Coverage configs for bionic.
Bug:
17553780
Change-Id: Iee7d0c210e2379e71e0c1e4e7058bce23f61e8cd
Dan Albert [Tue, 23 Sep 2014 17:49:21 +0000 (10:49 -0700)]
Add a dummy atexit(3) to the linker.
This is needed when building the linker against a libc that was built
with coverage information.
Bug:
17553780
Change-Id: If131002e067dd7768fc657c30e62c42a45c05ace
Dan Albert [Wed, 24 Sep 2014 16:52:32 +0000 (16:52 +0000)]
am
086bb382: Fix incorrect parameter types for locale funcs.
* commit '
086bb382db3de7459bc5fad6bb1c257ca331b0e8':
Fix incorrect parameter types for locale funcs.
Dan Albert [Wed, 24 Sep 2014 16:13:50 +0000 (16:13 +0000)]
am
fc5a93f7: Merge "Fix incorrect parameter types for locale funcs."
* commit '
fc5a93f7a2ea2be740f2c909e8a6a192fa65adc8':
Fix incorrect parameter types for locale funcs.
Dan Albert [Tue, 23 Sep 2014 22:32:24 +0000 (15:32 -0700)]
Fix incorrect parameter types for locale funcs.
strtoll(3), strtoull(3), wcstoll(3), and wcstoull(3) all take an _int_
as a base, not a size_t. This is an ABI compatibility issue.
Bug:
17628622
Change-Id: I17f8eead34ce2112005899fc30162067573023ec
(cherry picked from commit
3c5037f1b3b747e79d17a5f717d9f9c365132d33)
Dan Albert [Wed, 24 Sep 2014 16:00:06 +0000 (16:00 +0000)]
Merge "Fix incorrect parameter types for locale funcs."
Elliott Hughes [Wed, 24 Sep 2014 05:08:23 +0000 (05:08 +0000)]
am
ebf37e38: Merge "Switch to OpenBSD flags.c."
* commit '
ebf37e38861e376ae47c72d45ab8de6703dd18f0':
Switch to OpenBSD flags.c.
Elliott Hughes [Wed, 24 Sep 2014 04:50:44 +0000 (04:50 +0000)]
Merge "Switch to OpenBSD flags.c."
Christopher Ferris [Wed, 24 Sep 2014 04:15:16 +0000 (04:15 +0000)]
am
04643c18: Merge "Remove the unnecessary generic-neon code."
* commit '
04643c181c3256348a6fd78e54c8bc5527ad0b0a':
Remove the unnecessary generic-neon code.
Christopher Ferris [Wed, 24 Sep 2014 04:01:23 +0000 (04:01 +0000)]
Merge "Remove the unnecessary generic-neon code."
Elliott Hughes [Wed, 24 Sep 2014 03:02:42 +0000 (20:02 -0700)]
Switch to OpenBSD flags.c.
Change-Id: I0a35e5bd9f8edba27e0c73e5c8150636346d6a81
Elliott Hughes [Wed, 24 Sep 2014 02:10:59 +0000 (02:10 +0000)]
am
c57e5c82: Merge "CLOEXEC support in fdopen, freopen, and mkostemp/mkostemps."
* commit '
c57e5c828914714a283dd41f0a4adb064f6b8763':
CLOEXEC support in fdopen, freopen, and mkostemp/mkostemps.
Elliott Hughes [Wed, 24 Sep 2014 01:49:06 +0000 (01:49 +0000)]
Merge "CLOEXEC support in fdopen, freopen, and mkostemp/mkostemps."
Christopher Ferris [Wed, 24 Sep 2014 01:31:45 +0000 (18:31 -0700)]
Remove the unnecessary generic-neon code.
Change-Id: Ib75c33caafd76750ec1aca3a74dec5e4b881e965
Elliott Hughes [Wed, 24 Sep 2014 00:34:29 +0000 (17:34 -0700)]
CLOEXEC support in fdopen, freopen, and mkostemp/mkostemps.
Change-Id: I74ea88e0d4973d6ab3c57da7d8bb643c31592b14
Dan Albert [Tue, 23 Sep 2014 22:32:24 +0000 (15:32 -0700)]
Fix incorrect parameter types for locale funcs.
strtoll(3), strtoull(3), wcstoll(3), and wcstoull(3) all take an _int_
as a base, not a size_t. This is an ABI compatibility issue.
Bug:
17628622
Change-Id: I17f8eead34ce2112005899fc30162067573023ec
Elliott Hughes [Tue, 23 Sep 2014 22:12:57 +0000 (22:12 +0000)]
am
87b6906f: Merge "Pull in upstream fixes to reject invalid bases."
* commit '
87b6906f6e0c17b2541535be8e054324cc2fef4a':
Pull in upstream fixes to reject invalid bases.
Elliott Hughes [Tue, 23 Sep 2014 21:59:15 +0000 (21:59 +0000)]
Merge "Pull in upstream fixes to reject invalid bases."
Elliott Hughes [Tue, 23 Sep 2014 21:53:10 +0000 (14:53 -0700)]
Pull in upstream fixes to reject invalid bases.
Also add tests to make sure the full set works correctly.
Change-Id: I3e7f237f12c9c93e1185a97c9717803e7e55a73c
Elliott Hughes [Tue, 23 Sep 2014 21:48:00 +0000 (21:48 +0000)]
am
86421653: Merge "Sync with some upstream OpenBSD #include cleanup."
* commit '
8642165344217877b8a70811d19e09b584a0e10a':
Sync with some upstream OpenBSD #include cleanup.
Elliott Hughes [Tue, 23 Sep 2014 21:48:00 +0000 (21:48 +0000)]
am
0ab5fd9a: Merge "Switch to OpenBSD insque/remque/killpg."
* commit '
0ab5fd9a5af4cd00572e4881f46c1e6f974f657c':
Switch to OpenBSD insque/remque/killpg.
Elliott Hughes [Tue, 23 Sep 2014 21:27:28 +0000 (21:27 +0000)]
Merge "Sync with some upstream OpenBSD #include cleanup."
Elliott Hughes [Tue, 23 Sep 2014 21:26:27 +0000 (21:26 +0000)]
Merge "Switch to OpenBSD insque/remque/killpg."
Elliott Hughes [Tue, 23 Sep 2014 21:06:56 +0000 (14:06 -0700)]
Switch to OpenBSD insque/remque/killpg.
Change-Id: Ie02290ad3187b1c1596dd776fd1c8a743a55f7ef
Elliott Hughes [Tue, 23 Sep 2014 20:55:15 +0000 (13:55 -0700)]
Sync with some upstream OpenBSD #include cleanup.
Change-Id: Ibcd7adb19e9a6b9ad8c24d77e23935f19f56a144
Elliott Hughes [Tue, 23 Sep 2014 01:39:11 +0000 (01:39 +0000)]
am
93951cfa: Merge "Fix a couple more cases of missing CLOEXEC."
* commit '
93951cfa96c3c7504a78f94e7ec408936e5db9bf':
Fix a couple more cases of missing CLOEXEC.
Elliott Hughes [Tue, 23 Sep 2014 01:19:51 +0000 (01:19 +0000)]
Merge "Fix a couple more cases of missing CLOEXEC."
Elliott Hughes [Tue, 23 Sep 2014 00:43:09 +0000 (17:43 -0700)]
Fix a couple more cases of missing CLOEXEC.
The debuggerd case can probably never happen, because you're crashing at this
point anyway. The system property one seems possible though.
Change-Id: Idba6a4f1d68587ec5b320d1e25f0b6a987ea32a0
Elliott Hughes [Mon, 22 Sep 2014 23:47:29 +0000 (23:47 +0000)]
am
e8a95624: Merge "Test pthread_cleanup_push(3)/pthread_cleanup_pop(3)."
* commit '
e8a95624b6ee37f7ee85f0318f1fccd916292ebd':
Test pthread_cleanup_push(3)/pthread_cleanup_pop(3).
Elliott Hughes [Mon, 22 Sep 2014 23:28:32 +0000 (23:28 +0000)]
Merge "Test pthread_cleanup_push(3)/pthread_cleanup_pop(3)."
Elliott Hughes [Mon, 22 Sep 2014 23:01:26 +0000 (16:01 -0700)]
Test pthread_cleanup_push(3)/pthread_cleanup_pop(3).
Change-Id: I5a623fa1e1da55f11d51f3a9bdfa0627698c486f
Elliott Hughes [Mon, 22 Sep 2014 23:05:35 +0000 (23:05 +0000)]
am
b2da4562: Merge "Clean up fpathconf(3)/pathconf(3)."
* commit '
b2da45625353336452112e28872310903dc70a8f':
Clean up fpathconf(3)/pathconf(3).
Elliott Hughes [Mon, 22 Sep 2014 22:50:10 +0000 (22:50 +0000)]
Merge "Clean up fpathconf(3)/pathconf(3)."
Elliott Hughes [Mon, 22 Sep 2014 21:49:07 +0000 (14:49 -0700)]
Clean up fpathconf(3)/pathconf(3).
fpathconf(3) and pathconf(3) can share code. There's no such
header file as <pathconf.h>. glibc/POSIX and BSD disagree about where
the _POSIX_* definitions should go.
Change-Id: I4a67f1595c9f5fbb26700a131178eedebd6bf712
Elliott Hughes [Mon, 22 Sep 2014 22:08:38 +0000 (22:08 +0000)]
am
d9cb0ed2: Merge "Unit test for abort(3)."
* commit '
d9cb0ed281f0301ec2ca6828f0acc1ed08dceb8a':
Unit test for abort(3).
Elliott Hughes [Mon, 22 Sep 2014 21:46:55 +0000 (21:46 +0000)]
Merge "Unit test for abort(3)."
Elliott Hughes [Mon, 22 Sep 2014 21:41:30 +0000 (14:41 -0700)]
Unit test for abort(3).
Change-Id: I021604b977572801f228a193741624df26e76d72
Elliott Hughes [Mon, 22 Sep 2014 17:08:51 +0000 (17:08 +0000)]
am
9f423c55: Merge "Use the uapi fs magic in <sys/vfs.h>."
* commit '
9f423c554a0ffcee2e34472bf0bc1aef3621a822':
Use the uapi fs magic in <sys/vfs.h>.
Elliott Hughes [Mon, 22 Sep 2014 16:51:07 +0000 (16:51 +0000)]
Merge "Use the uapi fs magic in <sys/vfs.h>."
Elliott Hughes [Sat, 20 Sep 2014 03:36:03 +0000 (20:36 -0700)]
Use the uapi fs magic in <sys/vfs.h>.
Change-Id: I712b856a6d786bba400c9a8d08f596b826403731
Elliott Hughes [Sat, 20 Sep 2014 20:06:21 +0000 (20:06 +0000)]
am
413de5b0: Merge "Add semaphore tests, fix sem_destroy."
* commit '
413de5b0d4ddcf039aaef8b40a5f02d41dbb06e6':
Add semaphore tests, fix sem_destroy.
Elliott Hughes [Sat, 20 Sep 2014 01:34:11 +0000 (01:34 +0000)]
Merge "Add semaphore tests, fix sem_destroy."
Christopher Ferris [Sat, 20 Sep 2014 00:50:08 +0000 (00:50 +0000)]
am
e7160449: Merge "Remove references to MALLOC_LEAK_CHECK."
* commit '
e716044918d85cd3c34425779a09a24348f7f67a':
Remove references to MALLOC_LEAK_CHECK.
Elliott Hughes [Thu, 18 Sep 2014 23:11:59 +0000 (16:11 -0700)]
Add semaphore tests, fix sem_destroy.
Bug: https://code.google.com/p/android/issues/detail?id=76088
Change-Id: I4a0561b23e90312384d40a1c804ca64ee98f4066
Christopher Ferris [Sat, 20 Sep 2014 00:29:09 +0000 (00:29 +0000)]
Merge "Remove references to MALLOC_LEAK_CHECK."
Christopher Ferris [Fri, 19 Sep 2014 19:26:09 +0000 (12:26 -0700)]
Remove references to MALLOC_LEAK_CHECK.
This define isn't really used any more.
Bug:
17378595
Change-Id: I39722b83cd98955a3a2514577de34a239524617f
Elliott Hughes [Fri, 19 Sep 2014 18:23:59 +0000 (18:23 +0000)]
am
adc01348: Merge "Add greg_t for arm64."
* commit '
adc01348ee51a4ad678b1c277f85cbbed5c2e728':
Add greg_t for arm64.
Elliott Hughes [Fri, 19 Sep 2014 18:01:22 +0000 (18:01 +0000)]
Merge "Add greg_t for arm64."
Elliott Hughes [Fri, 19 Sep 2014 17:31:49 +0000 (10:31 -0700)]
Add greg_t for arm64.
This was already present for the other architectures. I think we skipped
this because glibc seems to have an incorrect definition (int rather than
long), but the kernel has the sane definition (just not in a uapi header).
Change-Id: I0d47a424b505804389853dd8632693dad55a3907
Dan Albert [Fri, 19 Sep 2014 00:05:23 +0000 (00:05 +0000)]
am
13d6023a: Merge "Exclude libstdc++ from linked libraries."
* commit '
13d6023aac62091a7d1df1c1afa1e228515832cb':
Exclude libstdc++ from linked libraries.
Dan Albert [Thu, 18 Sep 2014 23:43:24 +0000 (23:43 +0000)]
Merge "Exclude libstdc++ from linked libraries."
Christopher Ferris [Thu, 18 Sep 2014 21:48:49 +0000 (21:48 +0000)]
am
d5e1c583: Merge "Move to v3.16.3 kernel headers."
* commit '
d5e1c583a66a821c7d7e8f43e1238a4569981b90':
Move to v3.16.3 kernel headers.
Elliott Hughes [Thu, 18 Sep 2014 21:48:49 +0000 (21:48 +0000)]
am
fb8d60f7: Merge "Fix lgamma_r/lgammaf_r/lgammal_r for -0."
* commit '
fb8d60f7436d8f90f951fb2efc27449c3aee8046':
Fix lgamma_r/lgammaf_r/lgammal_r for -0.
Christopher Ferris [Thu, 18 Sep 2014 21:34:42 +0000 (21:34 +0000)]
Merge "Move to v3.16.3 kernel headers."
Elliott Hughes [Thu, 18 Sep 2014 21:28:35 +0000 (21:28 +0000)]
Merge "Fix lgamma_r/lgammaf_r/lgammal_r for -0."
Christopher Ferris [Thu, 18 Sep 2014 20:14:58 +0000 (13:14 -0700)]
Move to v3.16.3 kernel headers.
Change-Id: Ife491bd7630b853a78532dd74e4644438256a3a1
Elliott Hughes [Thu, 18 Sep 2014 18:23:58 +0000 (11:23 -0700)]
Fix lgamma_r/lgammaf_r/lgammal_r for -0.
Upstream has implemented lgammal/lgammal_r for ld128, and fixed the
sign problem we reported with all the lgamma*_r functions and -0.
Bug:
17471883
Change-Id: Ibb175d9cab67efae75f1010796fd44c9ba6ce4fc
Elliott Hughes [Thu, 18 Sep 2014 16:11:30 +0000 (16:11 +0000)]
am
82e71085: Merge "The nextafter functions use the wrong next representable value"
* commit '
82e71085c23d11030e9950d8d08e30ef249fd73b':
The nextafter functions use the wrong next representable value
Elliott Hughes [Thu, 18 Sep 2014 16:11:30 +0000 (16:11 +0000)]
am
6ced0051: Merge "Stack unwinding unit tests."
* commit '
6ced005123aaedeed7cd653d0baab3fbd511a492':
Stack unwinding unit tests.
Elliott Hughes [Thu, 18 Sep 2014 15:51:45 +0000 (15:51 +0000)]
Merge "The nextafter functions use the wrong next representable value"
Jingwei Zhang [Thu, 18 Sep 2014 16:50:00 +0000 (00:50 +0800)]
The nextafter functions use the wrong next representable value
From C99 standard: “The nextafter functions determine the next representable value, in the type of the function,
after x in the direction of y, where x and y are first converted to the type of the function”.
The next representable value of 0.0 in direction of -1.0 is -4.
9406564584124654e-324, not 0.0.
Similar thing holds for nextafterf, nextafterl, nexttowardf, nexttoward, and nexttowardl.
The tests pass either way, since the error is within the tolerance, but how it is written is wrong.
Change-Id: I1338eeffe3de8031a48f46e1b07146bc07dc2f0a
Signed-off-by: Jingwei Zhang <jingwei.zhang@intel.com>
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
Elliott Hughes [Thu, 18 Sep 2014 15:49:30 +0000 (15:49 +0000)]
Merge "Stack unwinding unit tests."
Elliott Hughes [Thu, 18 Sep 2014 00:21:20 +0000 (17:21 -0700)]
Stack unwinding unit tests.
Bug:
17436734
Change-Id: I1e98da7eaeab646b448fb3f2b683973dddc319b0
Christopher Ferris [Thu, 18 Sep 2014 00:41:24 +0000 (00:41 +0000)]
am
0bd28a43: Merge "Update kernel uapi headers to v3.16.1."
* commit '
0bd28a43dae87c808f6af61ad3dba042b35be7e7':
Update kernel uapi headers to v3.16.1.
Christopher Ferris [Thu, 18 Sep 2014 00:18:46 +0000 (00:18 +0000)]
Merge "Update kernel uapi headers to v3.16.1."
Dmitriy Ivanov [Thu, 18 Sep 2014 00:16:52 +0000 (00:16 +0000)]
am
6a310f4a: Merge "Temporary disable DL_WARNs for unused DT_*"
* commit '
6a310f4ad6c06b6f513d6dd9784ce0377f94f9bd':
Temporary disable DL_WARNs for unused DT_*
Christopher Ferris [Thu, 4 Sep 2014 02:56:49 +0000 (19:56 -0700)]
Update kernel uapi headers to v3.16.1.
Other changes to support the new headers:
- Remove the flock64 structure it is defined in the new headers.
- Update the syscalls to correspond with the headers.
Change-Id: I49a6b07e8b2bfffb67be71b07b58e4e6848fcc09
Dmitriy Ivanov [Wed, 17 Sep 2014 23:56:44 +0000 (23:56 +0000)]
Merge "Temporary disable DL_WARNs for unused DT_*"
Dmitriy Ivanov [Wed, 17 Sep 2014 23:46:40 +0000 (16:46 -0700)]
Temporary disable DL_WARNs for unused DT_*
Bug:
17552334
Change-Id: I2f7b5e4b4d1db96e812a7f86adc929e113d4c11a
Dmitriy Ivanov [Wed, 17 Sep 2014 23:20:01 +0000 (23:20 +0000)]
am
77784cb9: Merge "Add Android*.mk files to additional dependencies"
* commit '
77784cb9b7bad354601a3f965c3eaffecf6798ca':
Add Android*.mk files to additional dependencies
Dmitriy Ivanov [Wed, 17 Sep 2014 23:01:49 +0000 (23:01 +0000)]
Merge "Add Android*.mk files to additional dependencies"
Dmitriy Ivanov [Wed, 17 Sep 2014 22:55:01 +0000 (15:55 -0700)]
Add Android*.mk files to additional dependencies
Bug:
17548097
Change-Id: Ie0d9c8f33459320008f561217c54eba42d283b47
Elliott Hughes [Wed, 17 Sep 2014 22:37:18 +0000 (22:37 +0000)]
am
03fef1f5: Merge "Fix some 32-bit-isms in <stdio.h>."
* commit '
03fef1f51179de5cb65eafd9b57ea05c8e061542':
Fix some 32-bit-isms in <stdio.h>.
Elliott Hughes [Wed, 17 Sep 2014 22:37:17 +0000 (22:37 +0000)]
am
2f5cf100: Merge "Pull input.h from v3.16.1 kernel headers."
* commit '
2f5cf100a8cfaf51296fda69d31ef9e59c6d1da3':
Pull input.h from v3.16.1 kernel headers.
Elliott Hughes [Wed, 17 Sep 2014 22:25:35 +0000 (15:25 -0700)]
Fix an unintended difference between aosp/master and lmp-dev-plus-aosp.
Whitespace difference presumably introduced while fixing a merge conflict.
Bug:
17549448
Change-Id: If688330bf1dbaed23ba687d843d9744d6261023b
Elliott Hughes [Wed, 17 Sep 2014 22:22:32 +0000 (22:22 +0000)]
Merge "Fix some 32-bit-isms in <stdio.h>."
Elliott Hughes [Wed, 20 Aug 2014 19:14:21 +0000 (12:14 -0700)]
Fix some 32-bit-isms in <stdio.h>.
(cherry-pick of
2d80400a9e8454038a3ec29959436184be0c4c65.)
Bug:
17157793
Change-Id: I8290e240b92e5617f4c12c0eacad6e622e677b6a
Elliott Hughes [Wed, 17 Sep 2014 22:18:47 +0000 (22:18 +0000)]
Merge "Pull input.h from v3.16.1 kernel headers."
Christopher Ferris [Sun, 14 Sep 2014 19:08:37 +0000 (12:08 -0700)]
Pull input.h from v3.16.1 kernel headers.
(cherry-pick of
027d2717d067c3706f22bf84dc1226ede7c1566d.)
Bug:
17407564
Change-Id: Idcfc40a7254605280e3d5474c61ae1ab7b2b7b51
Elliott Hughes [Tue, 26 Aug 2014 23:20:59 +0000 (16:20 -0700)]
More cases where libc should use O_CLOEXEC.
Change-Id: Idfa111aeebc5deca2399dae919e8b72eb54c23c0
(cherry picked from commit
f73183f1a34df22b62a3d0bbf82e18d5797c9cde)
Dan Albert [Wed, 13 Aug 2014 18:25:01 +0000 (11:25 -0700)]
Hide ScopedTrace.
(cherry-pick of
f2c1e7ee78a167ff323b9f45d20532d064d6778d.)
Bug:
11156955
Change-Id: I6cddc868d1c6503e30f1ffcf460f45670631d64a
Elliott Hughes [Wed, 17 Sep 2014 21:59:24 +0000 (14:59 -0700)]
Revert "Revert "Added a bionic systrace class and tracing to pthread_mutex.cpp.""
This reverts commit
26c1420fbb68916d66a8621b5efe8bb25cfdad7b.
Dan Albert [Tue, 16 Sep 2014 17:10:25 +0000 (10:10 -0700)]
Exclude libstdc++ from linked libraries.
Also explicitly add libstdc++ includes for necessary targets.
Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
Elliott Hughes [Wed, 17 Sep 2014 17:17:14 +0000 (17:17 +0000)]
am
36a5aa05: Merge "Use the kernel\'s sa_restorer for aarch64."
* commit '
36a5aa057cf1738577754a3fc16a14a5f817109f':
Use the kernel's sa_restorer for aarch64.
Elliott Hughes [Wed, 17 Sep 2014 17:04:40 +0000 (17:04 +0000)]
Merge "Use the kernel's sa_restorer for aarch64."
Elliott Hughes [Wed, 17 Sep 2014 17:00:39 +0000 (17:00 +0000)]
am
56433ee2: Merge "Clean up the architecture-specific makefiles."
* commit '
56433ee2a2ccc097ac3ad753168722b0fc76f3b1':
Clean up the architecture-specific makefiles.
Elliott Hughes [Wed, 17 Sep 2014 16:36:46 +0000 (16:36 +0000)]
Merge "Clean up the architecture-specific makefiles."