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
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
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
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
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
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
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
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
Ben Cheng
b9256adab3
Merge "Adjust PC value in ARM stack trace."
2013-05-07 22:45:42 +00:00
Ben Cheng
52171b9bdc
Adjust PC value in ARM stack trace.
...
-2 for Thumb BLX(2) or -4 for the rest.
Change-Id: I804fdabfa1db4709bede222d4b432e8d42d53167
2013-05-07 15:44:13 -07:00
Nick Kralevich
d541ba1719
Merge "Use restrict pointers for various libc functions."
2013-05-07 17:37:48 +00:00
Nick Kralevich
1c462b7a04
Use restrict pointers for various libc functions.
...
All the cool kids say this is the best thing since sliced bread.
http://cellperformance.beyond3d.com/articles/2006/05/demystifying-the-restrict-keyword.html
For the most part, these changes match what glibc does.
Change-Id: I176268f27f82800162fe5f2515b08d5469ea2dfe
2013-05-07 10:00:21 -07:00
Nick Kralevich
c9757ac81e
am b01f7afd
: Merge "Use __predict_false on some fortify methods."
...
* commit 'b01f7afd5fd5df5f8fe925b4fe493269191b62a2':
Use __predict_false on some fortify methods.
2013-05-02 14:56:37 -07:00
Nick Kralevich
b01f7afd5f
Merge "Use __predict_false on some fortify methods."
2013-05-02 21:52:19 +00:00
Nick Kralevich
532d6f09b1
Use __predict_false on some fortify methods.
...
Give the compiler some hints that these error conditions
are unlikely to occur in practice.
Change-Id: Ifaf7322a12120ef663c8315c1a18c2dcbe4bda23
2013-05-02 14:31:51 -07:00
Nick Kralevich
4f614a7036
am e4ac8feb
: Merge "libc: cleanup strchr"
...
* commit 'e4ac8feb58ed1f963db9a1f32fa74a06a1f594f2':
libc: cleanup strchr
2013-05-02 14:25:42 -07:00
Nick Kralevich
e4ac8feb58
Merge "libc: cleanup strchr"
2013-05-02 21:17:16 +00:00
Nick Kralevich
4f40e511b0
libc: cleanup strchr
...
Move strchr to a .cpp file, and change to bionic directory.
Change-Id: I64ade7df326c0a9a714aca4caf5647b6833b1c97
2013-05-02 13:58:03 -07:00
Nick Kralevich
65fe3ea708
am 5e3b502b
: Merge "keep test names consistent with other tests."
...
* commit '5e3b502b6b56634953ea152409363088974fa5e9':
keep test names consistent with other tests.
2013-05-01 15:10:07 -07:00
Nick Kralevich
b9aab3a462
am 8c00c91a
: Merge "add strrchr -D_FORTIFY_SOURCE=2 test."
...
* commit '8c00c91aa051f18e107466b5d8c9280a2e1fabc1':
add strrchr -D_FORTIFY_SOURCE=2 test.
2013-05-01 15:10:07 -07:00
Nick Kralevich
5e3b502b6b
Merge "keep test names consistent with other tests."
2013-05-01 22:06:15 +00:00
Nick Kralevich
277226bf43
keep test names consistent with other tests.
...
Change-Id: I23dc4d963af40406b270af83cd17f6c8c95f1de3
2013-05-01 15:05:01 -07:00
Nick Kralevich
8c00c91aa0
Merge "add strrchr -D_FORTIFY_SOURCE=2 test."
2013-05-01 22:01:20 +00:00
Nick Kralevich
80541922e3
add strrchr -D_FORTIFY_SOURCE=2 test.
...
Change-Id: I1b95bb0086ae9f2f506f3cc90cee834c0ce3b1d8
2013-05-01 14:55:33 -07:00
Nick Kralevich
8355ab5524
am bee0ab16
: Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
...
* commit 'bee0ab16e47086d2f31f6f9ff41328066d5a7128':
libc: upgrade strrchr to FORTIFY_SOURCE=2
2013-04-30 16:25:23 -07:00
Nick Kralevich
bee0ab16e4
Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
2013-04-30 23:13:04 +00:00
Nick Kralevich
3b2e6bc9ac
libc: upgrade strrchr to FORTIFY_SOURCE=2
...
Change-Id: I4c34c2ce22c5092c4446dc1ab55f37604c1c223f
2013-04-30 14:19:23 -07:00
Nick Kralevich
2ff94a0964
am c4687130
: Merge "libc: upgrade some libc functions to _FORTIFY_SOURCE=2"
...
* commit 'c46871302e7bd099aaf54d91da93a2248acbf733':
libc: upgrade some libc functions to _FORTIFY_SOURCE=2
2013-04-30 11:56:08 -07:00