Elliott Hughes
55383d57d4
am 4d421901
: Merge "Use upstream OpenBSD\'s arc4random."
...
* commit '4d421901e587fd1563da94baf59b015017c01b91':
Use upstream OpenBSD's arc4random.
2014-07-22 02:07:58 +00:00
Elliott Hughes
85287b29ea
am 925d388e
: Merge "Rewrite syslog(3) to use Android logging."
...
* commit '925d388e24945afb17f66d5c132f993e6a0d4fee':
Rewrite syslog(3) to use Android logging.
2014-07-22 01:54:47 +00:00
Dan Albert
607458ffe1
am b828eaeb
: Merge "There is no _MIN for unsigned types."
...
* commit 'b828eaeb4512baba6d43a56da682bd7329079822':
There is no _MIN for unsigned types.
2014-07-22 00:43:15 +00:00
Dan Albert
e226b64061
am 1fb90a8a
: Merge "Fix mbsrtowcs(3)\'s handling of len parameter."
...
* commit '1fb90a8aa0086f7e4f7960a5b916b8605a9a3c96':
Fix mbsrtowcs(3)'s handling of len parameter.
2014-07-21 18:56:06 +00:00
Dan Albert
75fcd01a6e
am e9731387
: Merge "__libc_fatal should print a newline to stderr."
...
* commit 'e9731387f46938dd73fcda0193460b33655400c4':
__libc_fatal should print a newline to stderr.
2014-07-21 18:23:56 +00:00
Elliott Hughes
4d421901e5
Merge "Use upstream OpenBSD's arc4random."
2014-07-21 15:45:37 +00:00
Elliott Hughes
2b67d7dee0
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.
Change-Id: If32229fc28aba908035fb38703190d41ddcabc95
2014-07-21 14:38:16 -07:00
Dan Albert
b828eaeb45
Merge "There is no _MIN for unsigned types."
2014-07-21 15:45:37 +00:00
Dan Albert
ee7f1b5946
There is no _MIN for unsigned types.
...
Change-Id: I49c38e51197b750210bdbf28c9cf6db30452a206
2014-07-21 17:16:30 -07:00
Hans Boehm
50f2de914f
am ed68221a
: Define atomic_charN_t only if charN_t is supported.
...
* commit 'ed68221a8225a6696d2b0b1607ef0b2de1c1b3aa':
Define atomic_charN_t only if charN_t is supported.
2014-07-20 18:02:21 +00:00
Christopher Ferris
b290796ff9
am b0815aea
: Make sure not to construct illegal property names.
...
* commit 'b0815aeacb86e20cbbd4fa27dd90ad43b9c200fe':
Make sure not to construct illegal property names.
2014-07-20 17:59:47 +00:00
Elliott Hughes
ebb4745531
am fbd00819
: Merge "Clean up some misinformation around prctl." into lmp-dev
...
* commit 'fbd0081923336e3d2fa697445372a329134d9484':
Clean up some misinformation around prctl.
2014-07-20 17:59:30 +00:00
Christopher Ferris
2affffac74
am a6945179
: Merge "Add gen syscalls step to instructions." into lmp-dev
...
* commit 'a694517909546cf5c0d0fb54ab40234047238283':
Add gen syscalls step to instructions.
2014-07-20 17:59:30 +00:00
Elliott Hughes
4aa1203474
am 291da8d3
: Remove SIOCKILLADDR from <sys/socket.h>.
...
* commit '291da8d3533b3ee47f8d742c72d789d3149d15da':
Remove SIOCKILLADDR from <sys/socket.h>.
2014-07-20 17:59:28 +00:00
Elliott Hughes
6f9e612413
am b5bef263
: (-s ours) Remove PR_SET_TIMERSLACK_PID from <sys/prctl.h>.
...
* commit 'b5bef263b37b1f0def2a6c4e8e714ab871452b72':
Remove PR_SET_TIMERSLACK_PID from <sys/prctl.h>.
2014-07-20 17:59:27 +00:00
Elliott Hughes
841c633fa1
resolved conflicts for merge of b5bef263
to lmp-dev-plus-aosp
...
.
Change-Id: Ieef30b3a308ca3cad4a59f17566d4cede0ae2b16
2014-07-20 10:43:16 -07:00
Christopher Ferris
bdfb313cf1
am e8bc5813
: Use the mmap/munmap for allocation routines.
...
* commit 'e8bc581333d1fe19d28211330d1e06d471365d54':
Use the mmap/munmap for allocation routines.
2014-07-20 02:17:50 +00:00
Elliott Hughes
925d388e24
Merge "Rewrite syslog(3) to use Android logging."
2014-07-19 23:20:08 +00:00
Elliott Hughes
3ad8ecb64e
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
Change-Id: Icee7f088b97f88ccbdaf471b98cbac7f19f9210a
2014-07-21 16:56:48 -07:00
Hans Boehm
ed68221a82
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 8b002362d9
)
Change-Id: Ie5a17f20b8b545c97128d00605b4eabd2a6bfe3e
2014-07-18 17:53:01 -07:00
Christopher Ferris
b0815aeacb
Make sure not to construct illegal property names.
...
(cherry picked from commit 53531ccebb
)
Change-Id: I7e988c335ef32b61b2ac34f34509274623dbed69
2014-07-18 17:00:20 -07:00
Elliott Hughes
291da8d353
Remove SIOCKILLADDR from <sys/socket.h>.
...
(cherry picked from commit 8a3d1ca183
)
Change-Id: Idb5cc4cff3ece7fa8740db12a19438d1a1c9a6a8
2014-07-18 16:53:23 -07:00
Elliott Hughes
b5bef263b3
Remove PR_SET_TIMERSLACK_PID from <sys/prctl.h>.
...
(cherry picked from commit 9f165d24f0
)
Change-Id: I009d3742cefbf36115f09824f267a0265ae215bf
2014-07-18 16:52:24 -07:00
Elliott Hughes
2199ac3113
am 7dd126a3
: Merge "Clean up some misinformation around prctl."
...
* commit '7dd126a38ca501818b07927f310dcc0f531c0f1f':
Clean up some misinformation around prctl.
2014-07-18 23:35:08 +00:00
Christopher Ferris
e8bc581333
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 6425327c32
)
Change-Id: If43d12b2c588c9abcbfbbd2c53702cdac7695a73
2014-07-18 15:23:32 -07:00
Dan Albert
e9731387f4
Merge "__libc_fatal should print a newline to stderr."
2014-07-18 22:17:02 +00:00
Dan Albert
97e31dedf0
__libc_fatal should print a newline to stderr.
...
Change-Id: I088dc880d7488a65beac8cda95f530f3db41f112
2014-07-21 11:10:00 -07:00
Elliott Hughes
fbd0081923
Merge "Clean up some misinformation around prctl." into lmp-dev
2014-07-18 22:16:50 +00:00
Elliott Hughes
de24f1ac00
Clean up some misinformation around prctl.
...
prctl shouldn't be in <unistd.h>.
(cherry picked from commit 9c07aee83b
)
Change-Id: I70cda886fbf4d58d82dc70adaa981506ebff9949
2014-07-18 16:54:28 -07:00
Christopher Ferris
3a23030ded
am 3c2b71ad
: Merge "Use the mmap/munmap for allocation routines."
...
* commit '3c2b71ad5612721c7073a4396cdad2c00e86ba54':
Use the mmap/munmap for allocation routines.
2014-07-18 22:13:21 +00:00
Elliott Hughes
c6e9b8cebf
am b4669685
: Fix private/bionic_name_mem.h build breakage.
...
* commit 'b46696858b9018ff8a1069d429366e05d4814c52':
Fix private/bionic_name_mem.h build breakage.
2014-07-18 02:50:37 +00:00
Elliott Hughes
1b77f3f741
resolved conflicts for merge of d648f557
to lmp-dev-plus-aosp
...
Change-Id: I406207b390460d5ccb6da338bf84fce674dc8038
2014-07-17 17:37:26 -07:00
Elliott Hughes
6e47ddab72
am d18b87f3
: Merge "Remove SIOCKILLADDR from <sys/socket.h>."
...
* commit 'd18b87f38de8644acdcd1a112bd06d3a70d2ea1d':
Remove SIOCKILLADDR from <sys/socket.h>.
2014-07-18 00:24:35 +00:00
Elliott Hughes
1a04da8750
am 76282482
: Merge "Remove PR_SET_TIMERSLACK_PID from <sys/prctl.h>."
...
* commit '76282482dbb05bf97a834d20b3ccf98de3f5a31d':
Remove PR_SET_TIMERSLACK_PID from <sys/prctl.h>.
2014-07-18 00:24:34 +00:00
Dan Albert
1fb90a8aa0
Merge "Fix mbsrtowcs(3)'s handling of len parameter."
2014-07-17 22:34:19 +00:00
Dan Albert
6b55ba54ef
Fix mbsrtowcs(3)'s handling of len parameter.
...
The len parameter is a _maximum_ length. The previous code was treating
it as an exact length, causing the following typical call to fail:
mbsrtowcs(out, &in, sizeof(out), state); // sizeof(out) > strlen(in)
Change-Id: I48e474fd54ea5f122bc168a4d74bfe08704f28cc
2014-07-21 11:45:48 -07:00
Elliott Hughes
7dd126a38c
Merge "Clean up some misinformation around prctl."
2014-07-17 22:33:54 +00:00
Elliott Hughes
9c07aee83b
Clean up some misinformation around prctl.
...
prctl shouldn't be in <unistd.h>.
Change-Id: I29609fc91c033e1ad143b75d9b4eb17aefbd63d6
2014-07-18 16:15:32 -07:00
Christopher Ferris
3c2b71ad56
Merge "Use the mmap/munmap for allocation routines."
2014-07-17 22:33:54 +00:00
Christopher Ferris
6425327c32
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.
Change-Id: Iae2d197145da43dc103ad6024357d8cc2374378f
2014-07-18 14:16:51 -07:00
Elliott Hughes
d18b87f38d
Merge "Remove SIOCKILLADDR from <sys/socket.h>."
2014-07-17 22:33:42 +00:00
Elliott Hughes
8a3d1ca183
Remove SIOCKILLADDR from <sys/socket.h>.
...
Change-Id: I6b64a9abe01c786a9ec26aee1517cb981a4860fb
2014-07-17 17:10:02 -07:00
Elliott Hughes
76282482db
Merge "Remove PR_SET_TIMERSLACK_PID from <sys/prctl.h>."
2014-07-17 22:33:42 +00:00
Elliott Hughes
9f165d24f0
Remove PR_SET_TIMERSLACK_PID from <sys/prctl.h>.
...
Change-Id: Ie70f23c80e8473ac9617b74967d7c84709f5b00d
2014-07-17 17:12:35 -07:00
Elliott Hughes
d377833de6
am 6bf42ddc
: Merge "Fix private/bionic_name_mem.h build breakage."
...
* commit '6bf42ddc7962dec56840eb370bfe7b0469a4efb1':
Fix private/bionic_name_mem.h build breakage.
2014-07-17 22:16:45 +00:00
Elliott Hughes
b46696858b
Fix private/bionic_name_mem.h build breakage.
...
(cherry picked from commit 2f9c6e38b8
)
Change-Id: Ia8e96da98802d312011df866ac1baaa48f97811c
2014-07-17 15:15:44 -07:00
Elliott Hughes
d648f557f1
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 d7453860a6
)
Change-Id: I26b7638609e9d4eaf4f21ae29721ea27d4176702
2014-07-17 15:15:37 -07:00
Elliott Hughes
6bf42ddc79
Merge "Fix private/bionic_name_mem.h build breakage."
2014-07-17 21:58:34 +00:00
Elliott Hughes
2f9c6e38b8
Fix private/bionic_name_mem.h build breakage.
...
Change-Id: I8fe9c63dbbb5911721ca56791c0bff4bdf403314
2014-07-17 15:09:17 -07:00
Elliott Hughes
fdd6414093
am 169e2bf6
: Merge "Remove non-standard prctl constants from <sys/prctl.h>."
...
* commit '169e2bf6bd092ea3599cfe3426766988ec66658a':
Remove non-standard prctl constants from <sys/prctl.h>.
2014-07-17 21:54:26 +00:00