Ying Wang
af47a46d38
am 4fae7675
: am 6ee2f321
: am 6cdd0cfd
: Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to /nativetest64 in 64-bit target"
...
* commit '4fae7675103463a8322a04da707ba1f2d90ca9bb':
2014-07-14 19:09:50 +00:00
Dmitriy Ivanov
3dd6e3d880
am e245060c
: am ab164750
: am 3c12ae56
: Merge "Add test for constructor function."
...
* commit 'e245060c6d1d0ed4a45909b50fe6bd04de068aa3':
2014-07-14 19:09:50 +00:00
Dmitriy Ivanov
065abed9a5
am 30e596e9
: am ca673e73
: am b9c5d606
: am 006e0770
: Merge "Change android_dlextinfo flags to uint64_t"
...
* commit '30e596e9ead5bd7cfd9599b0e3d5e8bd4f6c1353':
2014-07-14 19:09:49 +00:00
Elliott Hughes
0ec257dc20
am a3eead96
: am 7e43f0d4
: resolved conflicts for merge of aedc14b1
to lmp-dev
...
* commit 'a3eead96b9f1000d403541dad0f086c3b175900a':
2014-07-14 19:09:48 +00:00
Calin Juravle
37eca3d325
am 3b0f3112
: am f11e7c74
: am 02459d34
: Merge "Move __cmsg_nxthdr to its proper file."
...
* commit '3b0f3112d0fed5cf30e2ad3fc6500810b760b35d':
2014-07-14 19:09:48 +00:00
Calin Juravle
b94d029403
am e8ce76c2
: am 1d63dd90
: am 8a71a745
: Merge "Removed obsolete symbol cmsg_nxthdr."
...
* commit 'e8ce76c26e0bae90b50ece7f8fa3d3f2fefc2476':
2014-07-14 19:09:47 +00:00
Christopher Ferris
c743b18961
am 0f8d5a06
: am c04e73a6
: am 25fba981
: Merge "Do not include libc_common in malloc debug code."
...
* commit '0f8d5a0664f6b21e4ebde63aa76ee2518bae9114':
2014-07-14 19:09:46 +00:00
Elliott Hughes
5252514d65
am 05916dda
: am cf53885b
: am d028b620
: Merge "Added a __system_property_serial benchmark."
...
* commit '05916dda8a9a48ce491ea33b9d196741125fe957':
2014-07-14 19:09:45 +00:00
Elliott Hughes
e4a1004d87
am 42775b51
: am feccec68
: am 84f0c7c2
: Merge "update-tzdata.py needs to know where to find icu."
...
* commit '42775b512fa6f39a93c130513f1c44cebfdb9c8c':
2014-07-14 19:09:45 +00:00
Dan Albert
5b41373d49
am 293006c9
: am 418fdef2
: am 7a85d9a1
: Merge "Revert "Add locale aware APIs.""
...
* commit '293006c91b22105419e446268dee3b9b6d6e7dac':
2014-07-14 19:09:44 +00:00
Dan Albert
a0ce997e1b
am 16dd7fd5
: am 43e79dab
: am 430d5f93
: Merge "Add locale aware APIs."
...
* commit '16dd7fd5d293ad1fa5d812743cbbbddad20055ae':
2014-07-14 19:09:43 +00:00
Elliott Hughes
6c804ab1ea
am e2bcc8bb
: am 748d8708
: am 4c199170
: Merge "Added __system_propery_read benchmark."
...
* commit 'e2bcc8bbe5b426e627395e88bb1748a3f33ccd98':
2014-07-14 19:09:43 +00:00
Elliott Hughes
7ad8adbe51
am 48ad92a4
: am 742fce7b
: am 3139f6fd
: Merge "Remove __CTOR_LIST__ from mips/mips64."
...
* commit '48ad92a4b1e3d7a3611eba3bc067989a138802b4':
2014-07-14 19:09:42 +00:00
Elliott Hughes
f7fe077902
am dc0b68e5
: am b9d95b5d
: am c4c67893
: Merge "Don\'t zero r1 on entry to the dynamic linker."
...
* commit 'dc0b68e5ee7f730adf2864c9c16a38b7ab8c8432':
2014-07-14 19:09:42 +00:00
Ying Wang
de78c2c451
am 76171b2d
: am 02406f68
: am 6cdd0cfd
: Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to /nativetest64 in 64-bit target"
...
* commit '76171b2d583ee21c1292f402f109e800120f9907':
2014-07-14 19:09:41 +00:00
Dmitriy Ivanov
994faff209
am 4e37e7b1
: am b9247ada
: am 3c12ae56
: Merge "Add test for constructor function."
...
* commit '4e37e7b1e89c3c9f734a3593838b6ba9b0e0e855':
2014-07-14 19:09:40 +00:00
Dmitriy Ivanov
49b590136a
am 4c632335
: am b9c5d606
: am 006e0770
: Merge "Change android_dlextinfo flags to uint64_t"
...
* commit '4c632335112a9cedee8bb09be7ca56b132ef21ee':
2014-07-14 19:09:40 +00:00
Elliott Hughes
f40424d38f
am ddf9066e
: resolved conflicts for merge of aedc14b1
to master
...
* commit 'ddf9066e2e850a1e0dc936a731994ec831581807':
2014-07-14 19:09:39 +00:00
Elliott Hughes
673bff01ae
Merge "Implement rand/srand in terms of random/srandom."
2014-07-14 17:20:33 +00:00
Elliott Hughes
76c241b091
Implement rand/srand in terms of random/srandom.
...
Code developed for glibc or older versions of bionic might expect more
randomness than the BSD implementation provides.
Bug: 15829381
Change-Id: Ia5a908a816e0a5f0639f514107a6384a51ec157e
2014-07-14 12:02:22 -07:00
Dmitriy Ivanov
91f2074e5f
Merge "Upstream atexit"
2014-07-14 17:20:33 +00:00
Dmitriy Ivanov
53c3c271dc
Upstream atexit
...
Change-Id: Ia454a2181b5058ed9783dc02b6b1805d0e4d2715
2014-07-14 12:05:16 -07:00
Elliott Hughes
4ae938698c
Merge "Sync upstream-openbsd."
2014-07-14 17:15:23 +00:00
Elliott Hughes
4f0b67a8db
Sync upstream-openbsd.
...
Change-Id: I5b9961a57e2ff05f63bd218c130bf8347850b9be
2014-07-14 11:22:59 -07:00
Elliott Hughes
ee3608f9d3
Merge "Fix visibility for a bunch more symbols."
2014-07-14 17:01:21 +00:00
Elliott Hughes
a167eef548
Fix visibility for a bunch more symbols.
...
Bug: 11156955
Bug: 15291317
Change-Id: I664f25cce7c17085a101d6593d8e01525a1f6a90
2014-07-14 15:13:30 -07:00
Elliott Hughes
3b318a5b3d
am e2b177a5
: am 83ce99d8
: Merge "Define SIOCKILLADDR which isn\'t in the common kernel uapi headers."
...
* commit 'e2b177a5d1384ebbb82d576637364e5b24450beb':
Define SIOCKILLADDR which isn't in the common kernel uapi headers.
2014-07-12 13:08:44 +00:00
Elliott Hughes
e2b177a5d1
am 83ce99d8
: Merge "Define SIOCKILLADDR which isn\'t in the common kernel uapi headers."
...
* commit '83ce99d8b7e2b15b2169e6e6e18e871ad35abb6c':
Define SIOCKILLADDR which isn't in the common kernel uapi headers.
2014-07-12 12:59:27 +00:00
Elliott Hughes
f6968e3c08
Define SIOCKILLADDR which isn't in the common kernel uapi headers.
...
(cherry picked from commit 2ba2888cac
)
Change-Id: I3845871bb44dae94d9a0428af0f562ddfb8bd660
2014-07-11 22:37:13 -07:00
Elliott Hughes
bae7c20672
am b962ab81
: am 57a5b338
: Merge "Define three prctl constants that went missing from uapi."
...
* commit 'b962ab81fc37fc8b4b8cfd45d3538b641dd6fd13':
Define three prctl constants that went missing from uapi.
2014-07-12 03:15:29 +00:00
Elliott Hughes
b962ab81fc
am 57a5b338
: Merge "Define three prctl constants that went missing from uapi."
...
* commit '57a5b3380a8834ecb4a32d01433a3127454443d7':
Define three prctl constants that went missing from uapi.
2014-07-12 03:10:36 +00:00
Elliott Hughes
f65d552b3d
am 0594b9dd
: am b8e82b5e
: Merge "EM_ARM and EM_AARCH64 are now in the uapi header."
...
* commit '0594b9ddded7d832b786c209dd7cd4e26ee32eb8':
EM_ARM and EM_AARCH64 are now in the uapi header.
2014-07-12 02:06:38 +00:00
Christopher Ferris
8832cfb2fe
am efdf7862
: am 385bb1ed
: Merge "Add optimized memchr implementation from newlib"
...
* commit 'efdf7862be41b2dfd8d013e2495af9a2db5286f5':
Add optimized memchr implementation from newlib
2014-07-12 02:06:37 +00:00
Christopher Ferris
d92a6d0669
am 55230dd0
: am 96502e27
: Merge "Make jemalloc the default choice."
...
* commit '55230dd048d8c93af67611c30fd6563e24ef23c5':
Make jemalloc the default choice.
2014-07-12 02:06:37 +00:00
Christopher Ferris
d389809de7
am 18a25078
: am c6bc0017
: Merge "Update kernel headers to v3.14."
...
* commit '18a25078f0cc0aa9842f6397e3c24a5ae8686de5':
Update kernel headers to v3.14.
2014-07-12 02:06:36 +00:00
Elliott Hughes
9c98443e2b
am ce1422b9
: am 040e1187
: Merge "Enable building libc with clang."
...
* commit 'ce1422b985383c4cbb485b3ec121eb8d01af12b8':
Enable building libc with clang.
2014-07-12 02:06:36 +00:00
Dan Albert
405fd491bc
am c0afc23e
: am 37f09d6d
: Merge "Revert "Revert "Add locale aware APIs."""
...
* commit 'c0afc23e26ca0a591dd8fb5fcddf1cb616bd5e43':
Revert "Revert "Add locale aware APIs.""
2014-07-12 02:06:35 +00:00
Elliott Hughes
210a842354
am d19f2d85
: am 76df69d1
: Merge "The err family allow null format strings."
...
* commit 'd19f2d859f744ded5a70cf0d8a23427eac7ec817':
The err family allow null format strings.
2014-07-12 02:06:35 +00:00
Elliott Hughes
d54994a45f
am 696c48df
: am eba7c15b
: Merge "Revert "Switch libm to building with clang.""
...
* commit '696c48df69a0841e8e179e313302c01155df5e85':
Revert "Switch libm to building with clang."
2014-07-12 02:06:34 +00:00
Elliott Hughes
2545bf7b41
am 37ab54fd
: am 5df23dc8
: Merge "Switch libm to building with clang."
...
* commit '37ab54fd88f2bc579f7d5b931d6e3c40ad4e1f05':
Switch libm to building with clang.
2014-07-12 02:06:33 +00:00
Elliott Hughes
3ea96e7b86
am 35805377
: am 9b491470
: Merge "Slim down static binaries by avoiding stdio."
...
* commit '35805377f91f0057704ee38687e0d9bf22d9d528':
Slim down static binaries by avoiding stdio.
2014-07-12 02:06:33 +00:00
Elliott Hughes
a9e847fdea
am 7d9f1cc5
: am f0f8cd1f
: Merge "Remove the global lock around thread stack creation."
...
* commit '7d9f1cc55c1f3641431e4ec8cf88d374025c5f39':
Remove the global lock around thread stack creation.
2014-07-12 02:06:32 +00:00
Elliott Hughes
b2ddd728c3
am 12ce9115
: am cd23370c
: Merge "Remove the obsolete _thread_created_hook."
...
* commit '12ce91157a40785182a3424af2890fcad032f9c6':
Remove the obsolete _thread_created_hook.
2014-07-12 02:06:31 +00:00
Calin Juravle
9899217adb
am 9712d913
: am 02459d34
: Merge "Move __cmsg_nxthdr to its proper file."
...
* commit '9712d913eba352d108116595d9be8bd0c96f24f6':
2014-07-12 02:06:31 +00:00
Calin Juravle
b89ef57d09
am cd061f6e
: am 8a71a745
: Merge "Removed obsolete symbol cmsg_nxthdr."
...
* commit 'cd061f6e434a28e979346b14cfe29a953ab9181f':
2014-07-12 02:06:30 +00:00
Christopher Ferris
a35ae1bcaa
am 4306b0f8
: am 25fba981
: Merge "Do not include libc_common in malloc debug code."
...
* commit '4306b0f82b236acb10e1f42e7d850e4edd37fb78':
2014-07-12 02:06:29 +00:00
Elliott Hughes
4c28373da6
am 96d7251c
: am d028b620
: Merge "Added a __system_property_serial benchmark."
...
* commit '96d7251cfc4d8134b864110908327880aa9ff8fd':
2014-07-12 02:06:29 +00:00
Elliott Hughes
4f459ec6bd
am 1cad0226
: am 84f0c7c2
: Merge "update-tzdata.py needs to know where to find icu."
...
* commit '1cad0226f5b0b7346516132bb45f09dafdffb91f':
2014-07-12 02:06:28 +00:00
Dan Albert
d0a7157c97
am ea04b5a6
: am 7a85d9a1
: Merge "Revert "Add locale aware APIs.""
...
* commit 'ea04b5a6d9fbbc3877446f47a50b3070da1e036e':
2014-07-12 02:06:27 +00:00
Dan Albert
1e46158e64
am f6b95993
: am 430d5f93
: Merge "Add locale aware APIs."
...
* commit 'f6b95993486005afb1d53677b321a85870c3b0c3':
2014-07-12 02:06:27 +00:00