Nick Kralevich
2317275f85
Merge "libc: delete x86 memchr.S"
2013-05-24 17:27:47 +00:00
Nick Kralevich
615684c256
libc: delete x86 memchr.S
...
This file is never used.
Change-Id: Ief08ad176713b5194048852609613801969e1364
2013-05-24 08:52:04 -07:00
David 'Digit' Turner
25a87f7641
Fix declaration of malloc_usable_size()
...
The function should take a 'const void*' parameter, instead of 'void*'.
Note that the implementation in upstream-dlmalloc/malloc.c already does
this.
For context, see http://b.android.com/55725
Change-Id: Iefd55cdb8996699189e0545f9195972490306227
2013-05-23 10:02:02 +02:00
Brian Carlstrom
47b2e046cd
am 46bf467a
: am f5f29de6
: Merge "Fix bionic linker to support segments with zero p_filesz"
...
* commit '46bf467a151eafaf37f6e3578d8d9bad705b8e44':
Fix bionic linker to support segments with zero p_filesz
2013-05-21 17:28:40 -07:00
Brian Carlstrom
46bf467a15
am f5f29de6
: Merge "Fix bionic linker to support segments with zero p_filesz"
...
* commit 'f5f29de6ae5a0b74234f111b5691a1e5588671cb':
Fix bionic linker to support segments with zero p_filesz
2013-05-21 17:23:09 -07:00
Brian Carlstrom
f5f29de6ae
Merge "Fix bionic linker to support segments with zero p_filesz"
2013-05-21 23:59:52 +00:00
Brian Carlstrom
82dcc7910d
Fix bionic linker to support segments with zero p_filesz
...
(cherry picked from commit 96362fb9d11beef6233aa03db396f25688e70860)
Change-Id: Ib075a6dfc45d5d0746d8b278f317dd9b8d772f2a
2013-05-21 16:57:55 -07:00
Erik Gilling
d5234a3b08
am 4c8eba6f
: am 2e317075
: Merge "libc/arm: add cortex-a8 cpu variant"
...
* commit '4c8eba6f2aaf351e29881ca4dc2ec47fc0246446':
libc/arm: add cortex-a8 cpu variant
2013-05-16 13:20:53 -07:00
Erik Gilling
4c8eba6f2a
am 2e317075
: Merge "libc/arm: add cortex-a8 cpu variant"
...
* commit '2e317075b044e94fc75e36d08bec8a7eb5fc31ae':
libc/arm: add cortex-a8 cpu variant
2013-05-16 13:19:07 -07:00
Erik Gilling
2e317075b0
Merge "libc/arm: add cortex-a8 cpu variant"
2013-05-16 19:57:28 +00:00
The Android Open Source Project
0ae3304f83
am 5b75f3bf
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '5b75f3bfa1a8f380ce213a0088afec7a7901a25b':
2013-05-16 05:44:28 -07:00
The Android Open Source Project
5b75f3bfa1
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I0839dac295b83f3c5d53d0bb81925b44e3ec17cc
2013-05-16 05:42:53 -07:00
Rom Lemarchand
22bda4bd67
libc/arm: add cortex-a8 cpu variant
...
Change-Id: I30e8dd6d4b2e7889aea8f5ed21182a5941bfb489
2013-05-15 20:13:28 -07:00
Elliott Hughes
217c816480
am 0a7fe991
: am 5217fb52
: Merge "Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX."
...
* commit '0a7fe991530308fbae9ca033c0045bfc27a7f4c1':
Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX.
2013-05-14 18:11:57 -07:00
Elliott Hughes
0a7fe99153
am 5217fb52
: Merge "Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX."
...
* commit '5217fb528ca40ece0dbb459dedf7d6fae81dde68':
Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX.
2013-05-14 18:10:45 -07:00
Elliott Hughes
5217fb528c
Merge "Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX."
2013-05-15 00:56:06 +00:00
Elliott Hughes
d35106fd55
Fix sysconf(3) for _SC_GETGR_R_SIZE_MAX and _SC_GETPW_R_SIZE_MAX.
...
Change-Id: Ie16cb21c1a5a2bdce8502b5974e2c4dbb1d679ce
2013-05-14 17:20:34 -07:00
Elliott Hughes
543f3f0ec4
am 975d4464
: am 6f502bc7
: Merge "Add more __restricts, clean up __format__ attributes."
...
* commit '975d4464cef774768cf99a68f3537cfc0678e3f7':
Add more __restricts, clean up __format__ attributes.
2013-05-14 16:59:34 -07:00
Elliott Hughes
975d4464ce
am 6f502bc7
: Merge "Add more __restricts, clean up __format__ attributes."
...
* commit '6f502bc74374804766639e6b1515644875810bda':
Add more __restricts, clean up __format__ attributes.
2013-05-14 16:56:49 -07:00
Elliott Hughes
6f502bc743
Merge "Add more __restricts, clean up __format__ attributes."
2013-05-14 23:45:49 +00:00
Elliott Hughes
940e30cf34
am 20516923
: am 349ef893
: Merge "Pull upstream FreeBSD revision 249810."
...
* commit '20516923f59b859f8ca1bfdb3927bc23819ecdb3':
Pull upstream FreeBSD revision 249810.
2013-05-14 16:26:42 -07:00
Elliott Hughes
20516923f5
am 349ef893
: Merge "Pull upstream FreeBSD revision 249810."
...
* commit '349ef893e82f37632a705f39efc47c0d440f63c7':
Pull upstream FreeBSD revision 249810.
2013-05-14 16:25:49 -07:00
Elliott Hughes
d04c183979
Add more __restricts, clean up __format__ attributes.
...
Change-Id: I7e2d270cc722d339d221eaea92747eaff3b51403
2013-05-14 16:08:43 -07:00
Elliott Hughes
349ef893e8
Merge "Pull upstream FreeBSD revision 249810."
2013-05-14 23:06:34 +00:00
Elliott Hughes
b2e1abda05
Pull upstream FreeBSD revision 249810.
...
Fix license clause numbering.
Convert libc/stdio from K&R to ANSI C.
And add '__restrict' where it appeared in the header prototypes.
Change-Id: I5fdb22f79d3effa2298d03f9aa8412b4b087da04
Upstream: http://svnweb.freebsd.org/base?view=revision&revision=249810
2013-05-14 15:02:16 -07:00
Elliott Hughes
0128b2c752
am 01678789
: am 5b7b2809
: Merge "epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events"
...
* commit '01678789bca18d1a4894ae7f987f847b5ae0ce62':
epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events
2013-05-14 15:01:33 -07:00
Elliott Hughes
7c7f098995
am 562804ff
: am f0f4fa3f
: Merge "libc: add timerfd calls"
...
* commit '562804ff878ede5d0ce0cb0c79ffb9b26777bf76':
libc: add timerfd calls
2013-05-14 15:01:32 -07:00
Elliott Hughes
d3d014da91
am 31366236
: am e1c58ab5
: Merge "libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR"
...
* commit '3136623600a9488859ed7c1681b084ea8315ed50':
libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR
2013-05-14 15:01:32 -07:00
Elliott Hughes
47e46ed157
am 91cc8014
: am 7cb82791
: Merge "libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM"
...
* commit '91cc8014e8cbc5ebfa90708f77f4f319e553a904':
libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
2013-05-14 15:01:31 -07:00
Elliott Hughes
01678789bc
am 5b7b2809
: Merge "epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events"
...
* commit '5b7b2809a2110dad1b2434f1070e13a08085d94b':
epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events
2013-05-14 14:59:16 -07:00
Elliott Hughes
562804ff87
am f0f4fa3f
: Merge "libc: add timerfd calls"
...
* commit 'f0f4fa3fb1ea8623b1e1bc59f7967e0470c8e532':
libc: add timerfd calls
2013-05-14 14:59:16 -07:00
Elliott Hughes
3136623600
am e1c58ab5
: Merge "libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR"
...
* commit 'e1c58ab5bb6284b3e3a2d0e54c295a93780b3f70':
libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR
2013-05-14 14:59:15 -07:00
Elliott Hughes
91cc8014e8
am 7cb82791
: Merge "libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM"
...
* commit '7cb82791cada0283648fedc316171cbffda79af7':
libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
2013-05-14 14:59:15 -07:00
Elliott Hughes
5b7b2809a2
Merge "epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events"
2013-05-14 21:49:09 +00:00
Todd Poynor
b0a2fc35d6
epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events
...
(cherry-pick of d1ad4f6dab06189d4d3dcfa19ae4bc301481eb3f.)
Change-Id: I4a8476bff068951533d4188de94097c8b84bc489
2013-05-14 14:48:43 -07:00
Elliott Hughes
f0f4fa3fb1
Merge "libc: add timerfd calls"
2013-05-14 21:45:29 +00:00
Todd Poynor
4200e6203a
libc: add timerfd calls
...
(cherry-pick of 04c0ac14a49e0969333008a9522b64046d58fbdc.)
Change-Id: I06d0b6c2a8781602362b81f48faf1cca76b9ec05
2013-05-14 14:45:02 -07:00
Elliott Hughes
e1c58ab5bb
Merge "libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR"
2013-05-14 21:44:28 +00:00
Todd Poynor
5c4340b2ab
libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR
...
Add CLOCK_MONOTONIC_RAW, CLOCK_REALTIME_COARSE, and CLOCK_MONOTONIC_COARSE
as supported by recent linux kernels.
(cherry-pick of 60e5144ca312b210b54ac8e6966108da0c97ff80.)
Bug: 8895727
Change-Id: If79a4d05d1301108f49a37588f9416c4be19277a
2013-05-14 14:43:59 -07:00
Elliott Hughes
7cb82791ca
Merge "libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM"
2013-05-14 21:43:37 +00:00
Todd Poynor
23b9fd2c1d
libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
...
(cherry-pick of b928bda83d4413b703329f607e2706602f15293f.)
Change-Id: Ica6aad84299819ffc5e57ae4891e057d2e401fa1
2013-05-14 14:43:09 -07:00
Elliott Hughes
ff5fb5cc4b
am 509fc806
: am d8a9cccb
: Merge "Fix all printf warnings in res_send.c."
...
* commit '509fc8069757aa6091e044f659f76da0bf59723c':
Fix all printf warnings in res_send.c.
2013-05-14 11:13:39 -07:00
Elliott Hughes
509fc80697
am d8a9cccb
: Merge "Fix all printf warnings in res_send.c."
...
* commit 'd8a9cccb4d77eecc36425c9240a12bd305031ee3':
Fix all printf warnings in res_send.c.
2013-05-14 11:10:23 -07:00
Elliott Hughes
d8a9cccb4d
Merge "Fix all printf warnings in res_send.c."
2013-05-14 17:10:21 +00:00
Kito Cheng
bb0b09cad6
Fix all printf warnings in res_send.c.
...
Change-Id: I4bf959140b5a5475897bd80704e64e3c4645fc3f
2013-05-14 10:09:23 -07:00
Todd Poynor
d1ad4f6dab
epoll: add EPOLLRDHUP, EPOLLWAKEUP, and EPOLLONESHOT events
...
Change-Id: I4a579fc4a74adaee57911b3974ec2f93d9321e8b
2013-05-13 12:06:36 -07:00
Todd Poynor
04c0ac14a4
libc: add timerfd calls
...
Change-Id: Id63b907266d5b87c7422a51d393a1430551ca33d
2013-05-13 12:06:15 -07:00
Todd Poynor
60e5144ca3
libc: remove obsolete CLOCK_REALTIME_HR and CLOCK_MONOTONIC_HR
...
Add CLOCK_MONOTONIC_RAW, CLOCK_REALTIME_COARSE, and CLOCK_MONOTONIC_COARSE
as supported by recent linux kernels.
Bug: 8895727
Change-Id: I3d415a2edbcf2928dd855e876337bf2239ac134a
2013-05-13 11:00:07 -07:00
Todd Poynor
b928bda83d
libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
...
Change-Id: I3bf934ab207e39b435e6b41a5fbe7eb318496dc0
2013-05-13 11:00:06 -07:00
The Android Automerger
d146e8e4e9
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-13 05:55:12 -07:00