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
Elliott Hughes
a28cb8bd35
am 30d7485d
: am 738370d9
: Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
...
* commit '30d7485dd30a06e2fb7b8134b6e1a3ecb0ac7ba7':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
2013-05-10 03:06:52 -07:00
Elliott Hughes
30d7485dd3
am 738370d9
: Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
...
* commit '738370d9387396922c10910edb61272e585be107':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
2013-05-09 23:40:47 -07:00
Elliott Hughes
a74e6c21e7
am 58f3dbda
: am 98f7659d
: Merge "Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors."
...
* commit '58f3dbdacd496838661affce358518e0b3a4f7f6':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
2013-05-09 17:56:31 -07:00
Elliott Hughes
58f3dbdacd
am 98f7659d
: Merge "Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors."
...
* commit '98f7659d7e3a7d75c68a41299f6ee55d7d35c27b':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
2013-05-09 17:53:38 -07:00
Elliott Hughes
738370d938
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
...
The GNU dynamic linker silently ignores a DT_PREINIT_ARRAY section
in a shared library. We had ineffectual code that tried to report
an error, which I tried to fix but got wrong --- my version still
wouldn't report the error to the caller, but would prevent us from
continuing to call constructors.
Bug: 8825226
(cherry picked from commit 8147d3c284
)
Change-Id: Iad8e7e3743d1a5e6bd1d44ef40b1ab3499cb64f2
2013-05-09 15:53:30 -07:00
Elliott Hughes
98f7659d7e
Merge "Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors."
2013-05-09 22:30:21 +00:00
Elliott Hughes
8147d3c284
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
...
The GNU dynamic linker silently ignores a DT_PREINIT_ARRAY section
in a shared library. We had ineffectual code that tried to report
an error, which I tried to fix but got wrong --- my version still
wouldn't report the error to the caller, but would prevent us from
continuing to call constructors.
Bug: 8825226
Change-Id: I4fd8450ecc44d8767a1cb808aeecfbfbfc77c070
2013-05-09 15:29:54 -07:00
Ben Cheng
3c2ab6ffbb
am ca54ae44
: am 262b7384
: Adjust PC value in ARM stack trace.
...
* commit 'ca54ae44a4c8764028b3092f9f1cfdd619a94fa6':
Adjust PC value in ARM stack trace.
2013-05-09 09:41:18 -07:00
Ben Cheng
ca54ae44a4
am 262b7384
: Adjust PC value in ARM stack trace.
...
* commit '262b7384e4e691d42070a57472ecc64cf668c480':
Adjust PC value in ARM stack trace.
2013-05-09 09:37:50 -07:00
Ben Cheng
a078f9dcf0
am 49f6e970
: am ff220f70
: Merge "Remove a spurious FIXME and unnecessary type cast."
...
* commit '49f6e9706202b5caef3a68690153a96baa14cab1':
Remove a spurious FIXME and unnecessary type cast.
2013-05-08 15:04:56 -07:00
Ben Cheng
77a2932836
am 3353e653
: am b9256ada
: Merge "Adjust PC value in ARM stack trace."
...
* commit '3353e6535a6964c92c280c36c99e1493befa9dc0':
Adjust PC value in ARM stack trace.
2013-05-08 15:04:56 -07:00
Nick Kralevich
f8867a5632
am 37cd8800
: am d541ba17
: Merge "Use restrict pointers for various libc functions."
...
* commit '37cd8800d532e5901cc3b332bc39d8580f2ba9ab':
Use restrict pointers for various libc functions.
2013-05-08 15:04:55 -07:00
Ben Cheng
49f6e97062
am ff220f70
: Merge "Remove a spurious FIXME and unnecessary type cast."
...
* commit 'ff220f70036178aa0d7dcf1cbc4825085a84441e':
Remove a spurious FIXME and unnecessary type cast.
2013-05-08 13:26:12 -07:00
Ben Cheng
3353e6535a
am b9256ada
: Merge "Adjust PC value in ARM stack trace."
...
* commit 'b9256adab3aa7e7628d7bbd015132a511de7a43d':
Adjust PC value in ARM stack trace.
2013-05-08 13:26:11 -07:00
Nick Kralevich
37cd8800d5
am d541ba17
: Merge "Use restrict pointers for various libc functions."
...
* commit 'd541ba17197fd3ef1f60462e51261c4340369218':
Use restrict pointers for various libc functions.
2013-05-08 13:26:11 -07:00
Ben Cheng
262b7384e4
Adjust PC value in ARM stack trace.
...
-2 for Thumb BLX(2) or -4 for the rest.
Change-Id: Ie59351a0012c2267309f63f0462fdba4698846fe
2013-05-08 11:21:53 -07:00
Ben Cheng
ff220f7003
Merge "Remove a spurious FIXME and unnecessary type cast."
2013-05-07 23:56:11 +00:00
Ben Cheng
63dd03cced
Remove a spurious FIXME and unnecessary type cast.
...
Change-Id: I05dcefdec7f047bef7eef5c5ceb7453992d56c24
2013-05-07 16:53:33 -07:00