OSDN Git Service
Elliott Hughes [Mon, 28 Jul 2014 19:24:22 +0000 (12:24 -0700)]
syscall(3)'s return type should be long.
This doesn't require us to change any of the syscall implementations
because (a) the LP32 ones have sizeof(int) == sizeof(long) anyway,
which is how we never noticed this bug before and (b) the LP64 ones
all use a 64-bit register for the result (and for the syscall number
too).
Bug: https://code.google.com/p/android/issues/detail?id=73952
Bug:
16568314
(cherry picked from commit
21972b61ec0572395c5684eebc6cc7b3a4c9e3be)
Change-Id: Ifbc424be29e5650ec72a24df25dd35f24fdd5b3c
Elliott Hughes [Sat, 26 Jul 2014 03:31:47 +0000 (20:31 -0700)]
Use vsnprintf(3) in syslog(3).
It seemed like a clever trick to use the internal log message formatting
code in syslog(3), but on reflection that means you can't (for example)
format floating point numbers. This patch switches us over to using good
old vsnprintf(3), even though that requires us to jump through a few hoops.
There's no obvious way to unit test this, so I wrote a little program and
ran that.
Bug:
14292866
Change-Id: I9c83500ba9cbb209b6f496067a91bf69434eeef5
Elliott Hughes [Fri, 25 Jul 2014 22:50:31 +0000 (15:50 -0700)]
Remove localtime_tz and strftime_tz.
This also brings our copy of strftime.c much closer to upstream, though
we still have several GNU extensions and hacks to deal with Android32's
broken time_t.
Bug:
15765976
(cherry picked from commit
39d903aea901cd29a4eef3a82c2dbda59b5bc292)
Change-Id: Ie278d3e976b7adc77bad5ce795dd4899cfbf3648
Elliott Hughes [Fri, 25 Jul 2014 18:55:59 +0000 (11:55 -0700)]
Start hiding "private/bionic_time.h".
Bug:
15765976
(cherry picked from commit
905e6d58aaf515bf237e62078f8a321920fe4c6b)
Change-Id: Ic7435308e8b521886f42ac7bf59531924921ea67
Dmitriy Ivanov [Thu, 24 Jul 2014 22:33:25 +0000 (15:33 -0700)]
Fix global variable initialization for linker
Linker now calls init functions for itself.
(cherry picked from commit
4151ea73b75e274d1ff80b42d9d457a783208516)
Change-Id: I3300fe22de8ad8466a5b1c2d551429769a42852d
Raghu Gandham [Thu, 24 Jul 2014 22:56:51 +0000 (15:56 -0700)]
[MIPS] Fix atomic_is_lock_free test for mips32.
On 32-bit MIPS, 64-bit atomic ops are achieved through locks.
So allow the test to fail for atomic_intmax_t on 32-bit MIPS.
(cherry picked from commit
f1837377d215a6eda294b6ac7552b226deee91ce)
Change-Id: I973d999c31c9ab89b5a7b709beff6486b93408f2
Elliott Hughes [Wed, 23 Jul 2014 23:02:26 +0000 (16:02 -0700)]
Implement twalk(3), add unit tests.
I've also added insque(3) and remque(3) (from NetBSD because the OpenBSD
ones are currently broken for non-circular lists).
I've not added the three hash table functions that should be in this header
because they operate on a single global hash table and thus aren't likely
to be useful.
Bug: https://code.google.com/p/android/issues/detail?id=73719
(cherry picked from commit
3e424d0a241f8ae5194514dabc4ad899f5a5416d)
Change-Id: I5882a6b48c80fea8ac6b9c27e7b9de10b202b4ff
Duane Sand [Thu, 24 Jul 2014 17:56:54 +0000 (10:56 -0700)]
[MIPS] Drop soft-fp targets
(cherry picked from commit
ba23bd0a409bb0e43c57dabee96b2ae52481d5b7)
Change-Id: Ica09192c2760d38ceebc14e23a5d3ba94c20764c
Duane Sand [Mon, 14 Jul 2014 22:30:14 +0000 (15:30 -0700)]
[MIPSR6] setjmp supports mips32r6 and FP64A/FPXX reg models
Save and restore floating point registers via 64-bit
load/stores when possible. Use assembler's builtin macro
ops to generate pairs of 32-bit load/stores on Mips I cpus.
Some cpus or FR modes have only 16 even-numbered dp fp regs.
This is exposed by _MIPS_FPSET, defined by existing compilers.
(cherry picked from commit
dd37251c473e1483faba0fd5aaf30e7a55582e8a)
Change-Id: Ibd43653701a363a77af85121d3cbd229d132a06a
Christopher Ferris [Thu, 24 Jul 2014 01:05:58 +0000 (18:05 -0700)]
HACK: Disable syslog going to android log.
Bug:
14292866
Change-Id: I3adc448dbacfeecd32508ddccf27be3aa653e466
Nick Kralevich [Wed, 23 Jul 2014 20:56:23 +0000 (13:56 -0700)]
debuggerd: if PR_GET_DUMPABLE=0, don't ask for dumping
PR_GET_DUMPABLE is used by an application to indicate whether or
not core dumps / PTRACE_ATTACH should work.
Security sensitive applications often set PR_SET_DUMPABLE to 0 to
disable core dumps, to avoid leaking sensitive memory to persistent
storage. Similarly, they also set PR_SET_DUMPABLE to zero to prevent
PTRACE_ATTACH from working, again to avoid leaking the contents
of sensitive memory.
Honor PR_GET_DUMPABLE when connecting to debuggerd. If an application
has said it doesn't want its memory dumped, then we shouldn't
ask debuggerd to dump memory on its behalf.
FORTIFY_SOURCE tests: Modify the fortify_source tests to set
PR_SET_DUMPABLE=0. This reduces the total runtime of
/data/nativetest/bionic-unit-tests/bionic-unit-tests32 from approx
53 seconds to 25 seconds. There's no need to connect to debuggerd
when running these tests.
Bug:
16513137
(cherry picked from commit
be0e43b77676338fd5e6a82c9cc2b6302d579de2)
Change-Id: I6e1a9bce564e94fc19893d639b15f38c549cabfa
Colin Cross [Wed, 23 Jul 2014 21:43:44 +0000 (14:43 -0700)]
HACK: remove %m support from printf.
The change that added this support causes a cpu hard lock on one
device. This code clearly isn't at fault, but disabling it to
unblock until we can find a real fix.
Bug:
16484311
Change-Id: I33834dc49d959ae403b10d2c7cad12ae2950f772
Elliott Hughes [Wed, 23 Jul 2014 18:38:38 +0000 (11:38 -0700)]
Fix belated review comments on syslog change.
Bug:
14292866
(cherry picked from commit
afe6360627ef3f0e9bc8f45535fbfae3354f3ae0)
Change-Id: I8e3cc6b37b2539e51a27261ffb5d6e58266ce11d
Elliott Hughes [Wed, 23 Jul 2014 18:10:48 +0000 (11:10 -0700)]
Fix generate-NOTICE to cope better with BSD __COPYRIGHT macros.
(cherry picked from commit
5d2f86f36341b76f84770d8966d7686a59555ae9)
Change-Id: Iddf22c8d9ff7a4d1205d37bb58c6235af681d795
Elliott Hughes [Wed, 23 Jul 2014 04:24:47 +0000 (21:24 -0700)]
Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files.
(cherry picked from commit
3758a244cf758046b40f630a11aed41e68c9cfc2)
Change-Id: I6ffb83b4a7b7746b095205c664cf025a72ead179
Elliott Hughes [Wed, 23 Jul 2014 03:21:31 +0000 (20:21 -0700)]
Remove the unused swab.S.
(cherry picked from commit
ca70453e84a88405d30f64d603f9a9b5f53f1243)
Change-Id: I4dc13de0bdeb7abb3bd47b0397546ad7d1f11d49
Duane Sand [Wed, 16 Jul 2014 19:29:34 +0000 (12:29 -0700)]
[MIPS] Allow united mipsel and mips64el gcc toolchain
Explicitly tell 32-bit links that they are doing 32-bit links.
This is needed when using united 32-bit and 64-bit toolchains.
This is harmless when using older separate 32-only toolchains.
(cherry picked from commit
f541650828f75b3dab22c9c0caab845be78b80fc)
Change-Id: I8df0ee7d36c6409458e18bea4e0e8b132edf77dc
Sreeram Ramachandran [Sun, 20 Jul 2014 21:10:45 +0000 (14:10 -0700)]
Cleanup: Delete dead code.
Bug:
15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
Elliott Hughes [Fri, 18 Jul 2014 22:57:41 +0000 (15:57 -0700)]
Use upstream OpenBSD's arc4random.
The getentropy_linux.c is lightly modified to build on Android, but we're now
completely in sync with upstream OpenBSD's arc4random implementation.
(cherry picked from commit
2b67d7dee09852789d9ac7d8972ed6cdb2c18430)
Change-Id: Icc939b5fa2fcac3e15ff93735d2d34f67e9bb149
Elliott Hughes [Mon, 21 Jul 2014 23:35:24 +0000 (16:35 -0700)]
Rewrite syslog(3) to use Android logging.
Since we don't have syslogd on Android and you can't run one on a non-rooted
device, it's more useful if syslog output just goes to the regular Android
logging system.
Bug:
14292866
(cherry picked from commit
3ad8ecb64e9dd5614169232b84a93eb3b8aa32d7)
Change-Id: I3038855ca4f22532bf6d2c45d3f8028b866975f9
Hans Boehm [Wed, 16 Jul 2014 18:33:48 +0000 (11:33 -0700)]
Define atomic_charN_t only if charN_t is supported.
Some platform code is apparently compiled with switches that do
not support char16_t and char32_t. This caused stdatomic.h to fail
to compile. This CL makes stdatomic.h usable in those environments.
(cherry picked from commit
8b002362d996859ebfc8588d6859a9a79203dc27)
Change-Id: Ie5a17f20b8b545c97128d00605b4eabd2a6bfe3e
Christopher Ferris [Wed, 16 Jul 2014 02:09:07 +0000 (19:09 -0700)]
Make sure not to construct illegal property names.
(cherry picked from commit
53531ccebbaf103d80516ff74874482ca3ee31fc)
Change-Id: I7e988c335ef32b61b2ac34f34509274623dbed69
Elliott Hughes [Fri, 18 Jul 2014 23:58:18 +0000 (23:58 +0000)]
Merge "Clean up some misinformation around prctl." into lmp-dev
Elliott Hughes [Fri, 18 Jul 2014 22:55:41 +0000 (15:55 -0700)]
Clean up some misinformation around prctl.
prctl shouldn't be in <unistd.h>.
(cherry picked from commit
9c07aee83b4ebbf2dba8e23d6896683187b9724e)
Change-Id: I70cda886fbf4d58d82dc70adaa981506ebff9949
Elliott Hughes [Fri, 18 Jul 2014 00:10:02 +0000 (17:10 -0700)]
Remove SIOCKILLADDR from <sys/socket.h>.
(cherry picked from commit
8a3d1ca183e19d849728318fe8b0d36856fa000f)
Change-Id: Idb5cc4cff3ece7fa8740db12a19438d1a1c9a6a8
Elliott Hughes [Fri, 18 Jul 2014 00:12:35 +0000 (17:12 -0700)]
Remove PR_SET_TIMERSLACK_PID from <sys/prctl.h>.
(cherry picked from commit
9f165d24f00c3bd4337ef719105bfb36bfa00a8b)
Change-Id: I009d3742cefbf36115f09824f267a0265ae215bf
Christopher Ferris [Fri, 18 Jul 2014 19:26:45 +0000 (12:26 -0700)]
Use the mmap/munmap for allocation routines.
To avoid any issues calling malloc related routines, use mmap/munmap.
Specifically, this avoids any problems when this is compiled into a
malloc debug shared library.
(cherry picked from commit
6425327c3278137d153b8a7505f97d2f5f058d49)
Change-Id: If43d12b2c588c9abcbfbbd2c53702cdac7695a73
Elliott Hughes [Thu, 17 Jul 2014 22:09:17 +0000 (15:09 -0700)]
Fix private/bionic_name_mem.h build breakage.
(cherry picked from commit
2f9c6e38b8f59ea6e53e95e062e04dc987ac67f3)
Change-Id: Ia8e96da98802d312011df866ac1baaa48f97811c
Elliott Hughes [Thu, 17 Jul 2014 21:26:33 +0000 (14:26 -0700)]
Remove non-standard prctl constants from <sys/prctl.h>.
Also remove __bionic_name_mem which has exactly one caller, and is only
ever expected to be used in this one place.
(cherry picked from commit
d7453860a6b06e7d4a960c20792ce6f0b6cc5f3a)
Change-Id: I26b7638609e9d4eaf4f21ae29721ea27d4176702
Christopher Ferris [Fri, 18 Jul 2014 23:57:54 +0000 (23:57 +0000)]
Merge "Add gen syscalls step to instructions." into lmp-dev
Christopher Ferris [Wed, 16 Jul 2014 02:02:33 +0000 (19:02 -0700)]
Add gen syscalls step to instructions.
Also, fix incorrect path to some tools.
(cherry picked from commit
ea271fdf2671707ed29bc6b564f544d2489115ff)
Change-Id: Ie93cbc84b9a46d622b0b462a33bed0ee129992cb
Elliott Hughes [Wed, 16 Jul 2014 22:18:54 +0000 (15:18 -0700)]
ptrace(3) should be varargs.
Bug:
16352070
(cherry picked from commit
98b088dce70a2625d5cfa1872e427af5f06bfd99)
Change-Id: I6193ef44df9a5668020916eaca90b47fc4c8ab77
Elliott Hughes [Tue, 15 Jul 2014 23:53:13 +0000 (16:53 -0700)]
Use VDSO for clock_gettime(2) and gettimeofday(2).
Bug:
15387103
(cherry picked from commit
625993dfbb085a3cde7492eda8ec1cdc1ee39a78)
Change-Id: I0e156d7049ba1495902259071a96936592e74025
Dan Albert [Wed, 16 Jul 2014 15:56:14 +0000 (15:56 +0000)]
Merge "Remove isascii_l(3)." into lmp-dev
Elliott Hughes [Wed, 16 Jul 2014 01:39:27 +0000 (18:39 -0700)]
Regenerate the syscalls list after the uapi update.
(cherry picked from commit
3fa60e10bcbfb8c7d94aeefc427640371683c920)
Change-Id: Id545a5b0b0953967effd819177f0dadb134f2011
Dan Albert [Mon, 14 Jul 2014 22:48:02 +0000 (15:48 -0700)]
Remove isascii_l(3).
Had intended to remove this one before submitting the locale changes,
but forgot. It isn't a standard ctype function, so we don't need it.
Change-Id: Ie9c09fa6c61b1101b5992fa06da30e373a0c6bf7
Christopher Ferris [Tue, 15 Jul 2014 01:47:23 +0000 (18:47 -0700)]
Fix BIONIC_ROUND_UP_POWER_OF_2 for 64 bit.
There were two bugs here:
- For 64 bit values, this did not properly round up.
- The macro rounded to the power of 2 less than value, not to the power
of 2 greater than value.
(cherry picked from commit
27047faf283cb9d3d025a984cd9934fd2c404407)
Change-Id: Idf1ec67854e1eb423704e599ae1c6b674d36618d
Elliott Hughes [Mon, 14 Jul 2014 21:41:47 +0000 (14:41 -0700)]
Fix visibility for a bunch more symbols.
Bug:
11156955
Bug:
15291317
(cherry picked from commit
a167eef5482d4a89d4277ec74f57adbe38052813)
Change-Id: Ib038ad34ef59631f7b4ed6dff2b7956001b8b159
Elliott Hughes [Mon, 14 Jul 2014 18:57:03 +0000 (11:57 -0700)]
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
(cherry picked from commit
76c241b091b4d9d9a9237d40e814e52ce2917f47)
Change-Id: If721b3f16efdb21cb67df5ec5034c0ba905bd029
Elliott Hughes [Mon, 14 Jul 2014 18:22:59 +0000 (11:22 -0700)]
Sync upstream-openbsd.
(cherry picked from commit
4f0b67a8dbf0e1d8b1dae42358553fb8d14456d4)
Change-Id: I8753959853312ab978bc4eb1bbbcdc7d1b007b95
Dmitriy Ivanov [Fri, 11 Jul 2014 19:59:16 +0000 (12:59 -0700)]
Upstream atexit
Change-Id: Ia454a2181b5058ed9783dc02b6b1805d0e4d2715
(cherry picked from commit
53c3c271dc9927dd280981fc23409af60f460007)
Elliott Hughes [Sat, 12 Jul 2014 13:08:44 +0000 (13:08 +0000)]
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.
Elliott Hughes [Sat, 12 Jul 2014 12:59:27 +0000 (12:59 +0000)]
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.
Elliott Hughes [Sat, 12 Jul 2014 04:10:15 +0000 (21:10 -0700)]
Define SIOCKILLADDR which isn't in the common kernel uapi headers.
(cherry picked from commit
2ba2888cac2f04daff7bbaf032d0df7a095b00c3)
Change-Id: I3845871bb44dae94d9a0428af0f562ddfb8bd660
Elliott Hughes [Sat, 12 Jul 2014 03:15:29 +0000 (03:15 +0000)]
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.
Elliott Hughes [Sat, 12 Jul 2014 03:10:36 +0000 (03:10 +0000)]
am
57a5b338: Merge "Define three prctl constants that went missing from uapi."
* commit '
57a5b3380a8834ecb4a32d01433a3127454443d7':
Define three prctl constants that went missing from uapi.
Elliott Hughes [Sat, 12 Jul 2014 02:06:38 +0000 (02:06 +0000)]
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.
Christopher Ferris [Sat, 12 Jul 2014 02:06:37 +0000 (02:06 +0000)]
am
efdf7862: am
385bb1ed: Merge "Add optimized memchr implementation from newlib"
* commit '
efdf7862be41b2dfd8d013e2495af9a2db5286f5':
Add optimized memchr implementation from newlib
Christopher Ferris [Sat, 12 Jul 2014 02:06:37 +0000 (02:06 +0000)]
am
55230dd0: am
96502e27: Merge "Make jemalloc the default choice."
* commit '
55230dd048d8c93af67611c30fd6563e24ef23c5':
Make jemalloc the default choice.
Christopher Ferris [Sat, 12 Jul 2014 02:06:36 +0000 (02:06 +0000)]
am
18a25078: am
c6bc0017: Merge "Update kernel headers to v3.14."
* commit '
18a25078f0cc0aa9842f6397e3c24a5ae8686de5':
Update kernel headers to v3.14.
Elliott Hughes [Sat, 12 Jul 2014 02:06:36 +0000 (02:06 +0000)]
am
ce1422b9: am
040e1187: Merge "Enable building libc with clang."
* commit '
ce1422b985383c4cbb485b3ec121eb8d01af12b8':
Enable building libc with clang.
Dan Albert [Sat, 12 Jul 2014 02:06:35 +0000 (02:06 +0000)]
am
c0afc23e: am
37f09d6d: Merge "Revert "Revert "Add locale aware APIs."""
* commit '
c0afc23e26ca0a591dd8fb5fcddf1cb616bd5e43':
Revert "Revert "Add locale aware APIs.""
Elliott Hughes [Sat, 12 Jul 2014 02:06:35 +0000 (02:06 +0000)]
am
d19f2d85: am
76df69d1: Merge "The err family allow null format strings."
* commit '
d19f2d859f744ded5a70cf0d8a23427eac7ec817':
The err family allow null format strings.
Elliott Hughes [Sat, 12 Jul 2014 02:06:34 +0000 (02:06 +0000)]
am
696c48df: am
eba7c15b: Merge "Revert "Switch libm to building with clang.""
* commit '
696c48df69a0841e8e179e313302c01155df5e85':
Revert "Switch libm to building with clang."
Elliott Hughes [Sat, 12 Jul 2014 02:06:33 +0000 (02:06 +0000)]
am
37ab54fd: am
5df23dc8: Merge "Switch libm to building with clang."
* commit '
37ab54fd88f2bc579f7d5b931d6e3c40ad4e1f05':
Switch libm to building with clang.
Elliott Hughes [Sat, 12 Jul 2014 02:06:33 +0000 (02:06 +0000)]
am
35805377: am
9b491470: Merge "Slim down static binaries by avoiding stdio."
* commit '
35805377f91f0057704ee38687e0d9bf22d9d528':
Slim down static binaries by avoiding stdio.
Elliott Hughes [Sat, 12 Jul 2014 02:06:32 +0000 (02:06 +0000)]
am
7d9f1cc5: am
f0f8cd1f: Merge "Remove the global lock around thread stack creation."
* commit '
7d9f1cc55c1f3641431e4ec8cf88d374025c5f39':
Remove the global lock around thread stack creation.
Elliott Hughes [Sat, 12 Jul 2014 02:06:31 +0000 (02:06 +0000)]
am
12ce9115: am
cd23370c: Merge "Remove the obsolete _thread_created_hook."
* commit '
12ce91157a40785182a3424af2890fcad032f9c6':
Remove the obsolete _thread_created_hook.
Calin Juravle [Sat, 12 Jul 2014 02:06:31 +0000 (02:06 +0000)]
am
9712d913: am
02459d34: Merge "Move __cmsg_nxthdr to its proper file."
* commit '
9712d913eba352d108116595d9be8bd0c96f24f6':
Calin Juravle [Sat, 12 Jul 2014 02:06:30 +0000 (02:06 +0000)]
am
cd061f6e: am
8a71a745: Merge "Removed obsolete symbol cmsg_nxthdr."
* commit '
cd061f6e434a28e979346b14cfe29a953ab9181f':
Christopher Ferris [Sat, 12 Jul 2014 02:06:29 +0000 (02:06 +0000)]
am
4306b0f8: am
25fba981: Merge "Do not include libc_common in malloc debug code."
* commit '
4306b0f82b236acb10e1f42e7d850e4edd37fb78':
Elliott Hughes [Sat, 12 Jul 2014 02:06:29 +0000 (02:06 +0000)]
am
96d7251c: am
d028b620: Merge "Added a __system_property_serial benchmark."
* commit '
96d7251cfc4d8134b864110908327880aa9ff8fd':
Elliott Hughes [Sat, 12 Jul 2014 02:06:28 +0000 (02:06 +0000)]
am
1cad0226: am
84f0c7c2: Merge "update-tzdata.py needs to know where to find icu."
* commit '
1cad0226f5b0b7346516132bb45f09dafdffb91f':
Dan Albert [Sat, 12 Jul 2014 02:06:27 +0000 (02:06 +0000)]
am
ea04b5a6: am
7a85d9a1: Merge "Revert "Add locale aware APIs.""
* commit '
ea04b5a6d9fbbc3877446f47a50b3070da1e036e':
Dan Albert [Sat, 12 Jul 2014 02:06:27 +0000 (02:06 +0000)]
Elliott Hughes [Sat, 12 Jul 2014 02:06:26 +0000 (02:06 +0000)]
am
94560b5b: am
4c199170: Merge "Added __system_propery_read benchmark."
* commit '
94560b5b9f43e106cce86916d99b86dd5e58d07b':
Elliott Hughes [Sat, 12 Jul 2014 02:06:25 +0000 (02:06 +0000)]
am
8d11fb18: am
3139f6fd: Merge "Remove __CTOR_LIST__ from mips/mips64."
* commit '
8d11fb187dd7aca49e89c6e90aa2e79afa68780d':
Elliott Hughes [Sat, 12 Jul 2014 02:06:25 +0000 (02:06 +0000)]
am
986fb565: am
c4c67893: Merge "Don\'t zero r1 on entry to the dynamic linker."
* commit '
986fb5657919bde859b4dc618169c3178bc86b3b':
Ying Wang [Sat, 12 Jul 2014 02:06:24 +0000 (02:06 +0000)]
am
6ee2f321: am
6cdd0cfd: Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to /nativetest64 in 64-bit target"
* commit '
6ee2f321d46b807e7a1ba4e08f2174265de3ea66':
Dmitriy Ivanov [Sat, 12 Jul 2014 02:06:23 +0000 (02:06 +0000)]
am
ab164750: am
3c12ae56: Merge "Add test for constructor function."
* commit '
ab16475066c4b2792601bfd41a2a7107c5a98b24':
Elliott Hughes [Sat, 12 Jul 2014 01:41:51 +0000 (01:41 +0000)]
am
b8e82b5e: Merge "EM_ARM and EM_AARCH64 are now in the uapi header."
* commit '
b8e82b5e729a1f6e30ee9593b2dbcbb3ad623874':
EM_ARM and EM_AARCH64 are now in the uapi header.
Christopher Ferris [Sat, 12 Jul 2014 01:41:51 +0000 (01:41 +0000)]
am
385bb1ed: Merge "Add optimized memchr implementation from newlib"
* commit '
385bb1ededa734e88bafb8aaf817e9a984bf0d18':
Add optimized memchr implementation from newlib
Christopher Ferris [Sat, 12 Jul 2014 01:41:51 +0000 (01:41 +0000)]
am
96502e27: Merge "Make jemalloc the default choice."
* commit '
96502e273eea49c95899af57fa578c8055b9618c':
Make jemalloc the default choice.
Christopher Ferris [Sat, 12 Jul 2014 01:41:50 +0000 (01:41 +0000)]
am
c6bc0017: Merge "Update kernel headers to v3.14."
* commit '
c6bc001776931fd1c8583df2b8948dcb8bf61007':
Update kernel headers to v3.14.
Elliott Hughes [Sat, 12 Jul 2014 01:41:50 +0000 (01:41 +0000)]
am
040e1187: Merge "Enable building libc with clang."
* commit '
040e11877d19f2fdd7a9c730d33056e88f43a760':
Enable building libc with clang.
Dan Albert [Sat, 12 Jul 2014 01:41:50 +0000 (01:41 +0000)]
am
37f09d6d: Merge "Revert "Revert "Add locale aware APIs."""
* commit '
37f09d6d2ea329984a3182b99a38f170dc86661d':
Revert "Revert "Add locale aware APIs.""
Elliott Hughes [Sat, 12 Jul 2014 01:41:49 +0000 (01:41 +0000)]
am
76df69d1: Merge "The err family allow null format strings."
* commit '
76df69d1f5cbbc8a2c1e899bc1ad5ada8b083e1e':
The err family allow null format strings.
Elliott Hughes [Sat, 12 Jul 2014 01:41:49 +0000 (01:41 +0000)]
am
eba7c15b: Merge "Revert "Switch libm to building with clang.""
* commit '
eba7c15b69010441e914b946006dc235e1472c96':
Revert "Switch libm to building with clang."
Elliott Hughes [Sat, 12 Jul 2014 01:41:49 +0000 (01:41 +0000)]
am
5df23dc8: Merge "Switch libm to building with clang."
* commit '
5df23dc85e459ef7271ad09b725631a3ad2d0ce4':
Switch libm to building with clang.
Elliott Hughes [Sat, 12 Jul 2014 01:41:49 +0000 (01:41 +0000)]
am
9b491470: Merge "Slim down static binaries by avoiding stdio."
* commit '
9b491470ac65a11775e52631ef5e655af9eb2a85':
Slim down static binaries by avoiding stdio.
Elliott Hughes [Sat, 12 Jul 2014 01:41:48 +0000 (01:41 +0000)]
am
f0f8cd1f: Merge "Remove the global lock around thread stack creation."
* commit '
f0f8cd1ff3e7f7124cab8a687370b51df4ec93de':
Remove the global lock around thread stack creation.
Elliott Hughes [Sat, 12 Jul 2014 01:41:48 +0000 (01:41 +0000)]
am
cd23370c: Merge "Remove the obsolete _thread_created_hook."
* commit '
cd23370ca737dffc49166f8aacd19a025e72266f':
Remove the obsolete _thread_created_hook.
Calin Juravle [Sat, 12 Jul 2014 01:41:48 +0000 (01:41 +0000)]
am
02459d34: Merge "Move __cmsg_nxthdr to its proper file."
* commit '
02459d34c9b82741155fbbb32850a7987eb7abaf':
Move __cmsg_nxthdr to its proper file.
Calin Juravle [Sat, 12 Jul 2014 01:41:48 +0000 (01:41 +0000)]
am
8a71a745: Merge "Removed obsolete symbol cmsg_nxthdr."
* commit '
8a71a745cb2a1eb573c6dc41e30c2f94a3a99db7':
Removed obsolete symbol cmsg_nxthdr.
Christopher Ferris [Sat, 12 Jul 2014 01:41:47 +0000 (01:41 +0000)]
am
25fba981: Merge "Do not include libc_common in malloc debug code."
* commit '
25fba981a17c51df6cf88d5ace7ffe3c5a5766e4':
Do not include libc_common in malloc debug code.
Elliott Hughes [Sat, 12 Jul 2014 01:41:47 +0000 (01:41 +0000)]
am
d028b620: Merge "Added a __system_property_serial benchmark."
* commit '
d028b6209cde7929e6d0613cbd92cc7b766d3d09':
Added a __system_property_serial benchmark.
Elliott Hughes [Sat, 12 Jul 2014 01:41:47 +0000 (01:41 +0000)]
am
84f0c7c2: Merge "update-tzdata.py needs to know where to find icu."
* commit '
84f0c7c258b3a72eed8737662bb5a730d6d9f5e2':
update-tzdata.py needs to know where to find icu.
Dan Albert [Sat, 12 Jul 2014 01:41:47 +0000 (01:41 +0000)]
am
7a85d9a1: Merge "Revert "Add locale aware APIs.""
* commit '
7a85d9a1de7f0970af19eca5f3ca6938cbc2ce95':
Revert "Add locale aware APIs."
Dan Albert [Sat, 12 Jul 2014 01:41:46 +0000 (01:41 +0000)]
am
430d5f93: Merge "Add locale aware APIs."
* commit '
430d5f93ceea2e5172144a05885c295dca51b876':
Add locale aware APIs.
Elliott Hughes [Sat, 12 Jul 2014 01:41:46 +0000 (01:41 +0000)]
am
4c199170: Merge "Added __system_propery_read benchmark."
* commit '
4c199170a84e725a56b7d40c113c9d76a75d89ab':
Added __system_propery_read benchmark.
Elliott Hughes [Sat, 12 Jul 2014 01:41:46 +0000 (01:41 +0000)]
am
3139f6fd: Merge "Remove __CTOR_LIST__ from mips/mips64."
* commit '
3139f6fdd7f9bec3b53be3da62314ae8ba24ceb4':
Remove __CTOR_LIST__ from mips/mips64.
Elliott Hughes [Sat, 12 Jul 2014 01:41:46 +0000 (01:41 +0000)]
am
c4c67893: Merge "Don\'t zero r1 on entry to the dynamic linker."
* commit '
c4c6789362b82150e3f16cd655032f7ab2a1b6d6':
Don't zero r1 on entry to the dynamic linker.
Ying Wang [Sat, 12 Jul 2014 01:41:46 +0000 (01:41 +0000)]
am
6cdd0cfd: Merge "TARGET_OUT_DATA_NATIVE_TESTS now points to /nativetest64 in 64-bit target"
* commit '
6cdd0cfd2f279dfb20b9f7cccc963eb9ee91c666':
TARGET_OUT_DATA_NATIVE_TESTS now points to $(TARGET_OUT_DATA)/nativetest64 in 64-bit target
Dmitriy Ivanov [Sat, 12 Jul 2014 01:41:45 +0000 (01:41 +0000)]
am
3c12ae56: Merge "Add test for constructor function."
* commit '
3c12ae56f402744d1a446ceef7d20f5ea01025c3':
Add test for constructor function.
Dmitriy Ivanov [Fri, 11 Jul 2014 17:52:23 +0000 (17:52 +0000)]
am
ca673e73: am
b9c5d606: am
006e0770: Merge "Change android_dlextinfo flags to uint64_t"
* commit '
ca673e7300b361bbf49c2b7ea1012441d62b1995':
Elliott Hughes [Fri, 11 Jul 2014 17:52:22 +0000 (17:52 +0000)]
am
7e43f0d4: resolved conflicts for merge of
aedc14b1 to lmp-dev
* commit '
7e43f0d40d3189ca219c6758f61ffe2a2d411ee2':
Dmitriy Ivanov [Fri, 11 Jul 2014 17:28:53 +0000 (17:28 +0000)]
am
b9c5d606: am
006e0770: Merge "Change android_dlextinfo flags to uint64_t"
* commit '
b9c5d606aab6c1a21e3785d155613c35c276eb18':
Change android_dlextinfo flags to uint64_t
Elliott Hughes [Fri, 11 Jul 2014 17:03:35 +0000 (10:03 -0700)]
resolved conflicts for merge of
aedc14b1 to lmp-dev
Change-Id: I36d3a6ca42778686f1f2971ae72cd3b7b156a3da
Elliott Hughes [Sat, 12 Jul 2014 04:12:09 +0000 (04:12 +0000)]
Merge "Define SIOCKILLADDR which isn't in the common kernel uapi headers."
Elliott Hughes [Sat, 12 Jul 2014 04:10:15 +0000 (21:10 -0700)]
Define SIOCKILLADDR which isn't in the common kernel uapi headers.
Change-Id: I8760950d13a9625aa543e76bc9d6cd86ac782c2e