OSDN Git Service
jzha136 [Tue, 8 Mar 2016 22:57:48 +0000 (22:57 +0000)]
Merge "Add x86 optimization of rint functions and tests"
am:
55dc0c5eea
* commit '
55dc0c5eea04b13465951ef0354f9541123b0f94':
Add x86 optimization of rint functions and tests
Elliott Hughes [Tue, 8 Mar 2016 22:01:07 +0000 (22:01 +0000)]
Merge "Add x86 optimization of rint functions and tests"
Elliott Hughes [Tue, 8 Mar 2016 08:03:33 +0000 (08:03 +0000)]
Merge "Minor clock_getcpuclockid optimization." am:
b83bd7bc25
am:
59eab81e16
* commit '
59eab81e16b190fb07d73d56eab1077b4b451653':
Minor clock_getcpuclockid optimization.
jzha136 [Fri, 12 Jun 2015 16:15:02 +0000 (09:15 -0700)]
Add x86 optimization of rint functions and tests
Change-Id: I5e7696ff9bcb1efc2625100ef8565b68dca2326c
Signed-off-by: Jingwei Zhang <jingwei.zhang@intel.com>
Elliott Hughes [Mon, 7 Mar 2016 21:17:00 +0000 (21:17 +0000)]
Merge "Minor clock_getcpuclockid optimization."
am:
b83bd7bc25
* commit '
b83bd7bc256d5121ec3ff1babc3bc08d7f04eea2':
Minor clock_getcpuclockid optimization.
Elliott Hughes [Mon, 7 Mar 2016 21:08:53 +0000 (21:08 +0000)]
Merge "Minor clock_getcpuclockid optimization."
Dimitry Ivanov [Mon, 7 Mar 2016 20:12:48 +0000 (12:12 -0800)]
Revert "Revert "libm: rename LIBC_PRIVATE to LIBC_DEPRECATED""
This reverts commit
49b9a5a342031580b3e106b9ead0ec847a20a186.
Elliott Hughes [Mon, 7 Mar 2016 19:54:02 +0000 (11:54 -0800)]
Minor clock_getcpuclockid optimization.
Don't ask the kernel to copy data to userspace if we don't need it.
(Noticed while cleaning up sysconf to not call clock_getres.)
Change-Id: Icc0f7559775b8a2dcefe638ce831d06b75d67122
Dimitry Ivanov [Mon, 7 Mar 2016 19:44:13 +0000 (19:44 +0000)]
Merge "Revert "libm: rename LIBC_PRIVATE to LIBC_DEPRECATED"" into nyc-dev
am:
060d6bbe6f
* commit '
060d6bbe6f9c9e4a55c5ebb2724c30ec24279e8a':
Revert "libm: rename LIBC_PRIVATE to LIBC_DEPRECATED"
Dimitry Ivanov [Mon, 7 Mar 2016 17:22:59 +0000 (17:22 +0000)]
Merge "Revert "libm: rename LIBC_PRIVATE to LIBC_DEPRECATED"" into nyc-dev
Dimitry Ivanov [Mon, 7 Mar 2016 17:13:34 +0000 (17:13 +0000)]
Revert "libm: rename LIBC_PRIVATE to LIBC_DEPRECATED"
Vendor blobs strike back.
This reverts commit
9721bb3f0b7c8c45f42d2874c908a177615f42b5.
Bug:
http://b/
27518190
Change-Id: I3fbe71123840edc51a1a804f6c8e83c84958192d
Josh Gao [Sat, 5 Mar 2016 03:23:36 +0000 (03:23 +0000)]
forkpty: set the output fd to -1 on the slave side.
am:
bf4c113cad
* commit '
bf4c113cad4d1f4464867a057d5c703505ef32b2':
forkpty: set the output fd to -1 on the slave side.
Josh Gao [Sat, 5 Mar 2016 02:04:41 +0000 (18:04 -0800)]
forkpty: set the output fd to -1 on the slave side.
glibc, FreeBSD, OpenBSD, and Darwin all just leave the fd unchanged and
possibly uninitialized. Setting it to -1 seems friendlier, though.
Bug: http://b/
27506278
Change-Id: I7acdc8eecbea4404d5fb4ba0b4d572245a323886
Josh Gao [Sat, 5 Mar 2016 03:10:54 +0000 (03:10 +0000)]
Merge "forkpty: set the output fd to -1 on the slave side." am:
ba2232d013
am:
8598f1fd66
* commit '
8598f1fd66b347fcee5e07720f246d33464adfb0':
forkpty: set the output fd to -1 on the slave side.
Josh Gao [Sat, 5 Mar 2016 03:08:52 +0000 (03:08 +0000)]
Merge "forkpty: set the output fd to -1 on the slave side."
am:
ba2232d013
* commit '
ba2232d0132274433a269eeccbbbd3be7f8f4384':
forkpty: set the output fd to -1 on the slave side.
Josh Gao [Sat, 5 Mar 2016 03:04:36 +0000 (03:04 +0000)]
Merge "forkpty: set the output fd to -1 on the slave side."
Elliott Hughes [Sat, 5 Mar 2016 02:38:57 +0000 (02:38 +0000)]
Merge "Don\'t call clock_getres in sysconf." am:
a703498f0c
am:
a990df3b7f
* commit '
a990df3b7f37498d1f33ffd3b7d9f488107f1e25':
Don't call clock_getres in sysconf.
Elliott Hughes [Sat, 5 Mar 2016 02:37:14 +0000 (02:37 +0000)]
Don\'t call clock_getres in sysconf.
am:
8dd7c611ea
* commit '
8dd7c611ea9889b316c02861d463edee83c6a207':
Don't call clock_getres in sysconf.
Elliott Hughes [Sat, 5 Mar 2016 02:36:55 +0000 (02:36 +0000)]
Merge "Don\'t call clock_getres in sysconf."
am:
a703498f0c
* commit '
a703498f0c416f58fdfdf3cdb208fffee60c9bb8':
Don't call clock_getres in sysconf.
Elliott Hughes [Sat, 5 Mar 2016 02:25:57 +0000 (18:25 -0800)]
Don't call clock_getres in sysconf.
There are a hundred other reasons why we can't run on kernels old enough
to not have all the clocks covered by sysconf.
This was causing trouble for jemalloc 4.1.0 in a seccomp-constrained process
because jemalloc 4.1.0 introduced a call to sysconf that caused us to make
clock_getres syscalls for the first time, leading to SIGSYS.
Bug: http://b/
27408522
(cherry picked from commit
d2b8de2cd16ecd86c830d98c58bcf392475bd0b3)
Change-Id: Id46a0f2c2804c597a8c9091690a8a1fc4a65f4cd
Elliott Hughes [Sat, 5 Mar 2016 02:31:08 +0000 (02:31 +0000)]
Merge "Don't call clock_getres in sysconf."
Elliott Hughes [Sat, 5 Mar 2016 02:25:57 +0000 (18:25 -0800)]
Don't call clock_getres in sysconf.
There are a hundred other reasons why we can't run on kernels old enough
to not have all the clocks covered by sysconf.
This was causing trouble for jemalloc 4.1.0 in a seccomp-constrained process
because jemalloc 4.1.0 introduced a call to sysconf that caused us to make
clock_getres syscalls for the first time, leading to SIGSYS.
Bug: http://b/
27408522
Change-Id: I2eb6986d871bc03cbef278e5617734409c39e057
Josh Gao [Sat, 5 Mar 2016 02:04:41 +0000 (18:04 -0800)]
forkpty: set the output fd to -1 on the slave side.
glibc, FreeBSD, OpenBSD, and Darwin all just leave the fd unchanged and
possibly uninitialized. Setting it to -1 seems friendlier, though.
Bug: http://b/
27506278
Change-Id: I7acdc8eecbea4404d5fb4ba0b4d572245a323886
Douglas Leung [Sat, 5 Mar 2016 01:13:41 +0000 (01:13 +0000)]
Merge "Add __memset_chk assembler for mips32 and mips64." am:
c4d2bede15
am:
5bfd3ffd36
* commit '
5bfd3ffd36f41b1fa5741ac9c5d043639c9af9d5':
Add __memset_chk assembler for mips32 and mips64.
Douglas Leung [Sat, 5 Mar 2016 01:11:43 +0000 (01:11 +0000)]
Merge "Add __memset_chk assembler for mips32 and mips64."
am:
c4d2bede15
* commit '
c4d2bede1592dd82dce9bfc6ebecdc414a79490b':
Add __memset_chk assembler for mips32 and mips64.
Elliott Hughes [Sat, 5 Mar 2016 01:07:10 +0000 (01:07 +0000)]
Merge "Add __memset_chk assembler for mips32 and mips64."
Douglas Leung [Fri, 4 Mar 2016 02:55:39 +0000 (18:55 -0800)]
Add __memset_chk assembler for mips32 and mips64.
Change-Id: I365b1f345c695850c30ccb1a9f56f254ce182000
Dimitry Ivanov [Fri, 4 Mar 2016 22:57:31 +0000 (22:57 +0000)]
libm: rename LIBC_PRIVATE to LIBC_DEPRECATED
am:
9721bb3f0b
* commit '
9721bb3f0b7c8c45f42d2874c908a177615f42b5':
libm: rename LIBC_PRIVATE to LIBC_DEPRECATED
Dimitry Ivanov [Fri, 4 Mar 2016 21:34:16 +0000 (21:34 +0000)]
Merge "libm: rename LIBC_PRIVATE to LIBC_DEPRECATED" am:
015f2e803a
am:
b4e083ed05
* commit '
b4e083ed05070049baef21aa8f4ccb923a48b979':
libm: rename LIBC_PRIVATE to LIBC_DEPRECATED
Chih-Hung Hsieh [Fri, 4 Mar 2016 21:34:04 +0000 (21:34 +0000)]
Merge "Enable test with clang aarch64." am:
cb9e4530a8
am:
91c9943c95
* commit '
91c9943c9597c9e5d824f70b312416b0cb843e1c':
Enable test with clang aarch64.
Dimitry Ivanov [Fri, 4 Mar 2016 19:05:52 +0000 (11:05 -0800)]
libm: rename LIBC_PRIVATE to LIBC_DEPRECATED
Bug: http://b/
26386014
Change-Id: Ia32411ce779f9dcf2cf7910d8658ffa753c73af9
(cherry picked from commit
9296460bf4dc64d91a83032c8323816430048419)
Dimitry Ivanov [Fri, 4 Mar 2016 21:32:14 +0000 (21:32 +0000)]
Merge "libm: rename LIBC_PRIVATE to LIBC_DEPRECATED"
am:
015f2e803a
* commit '
015f2e803abd9403808a1829e40c2609e3cd4fde':
libm: rename LIBC_PRIVATE to LIBC_DEPRECATED
Chih-Hung Hsieh [Fri, 4 Mar 2016 21:32:07 +0000 (21:32 +0000)]
Merge "Enable test with clang aarch64."
am:
cb9e4530a8
* commit '
cb9e4530a8fbf6eb078476610b71e4ca41988cb2':
Enable test with clang aarch64.
Dimitry Ivanov [Fri, 4 Mar 2016 21:29:48 +0000 (21:29 +0000)]
Merge "libm: rename LIBC_PRIVATE to LIBC_DEPRECATED"
Chih-hung Hsieh [Fri, 4 Mar 2016 21:26:05 +0000 (21:26 +0000)]
Merge "Enable test with clang aarch64."
Chih-Hung Hsieh [Fri, 4 Mar 2016 20:28:50 +0000 (12:28 -0800)]
Enable test with clang aarch64.
TLS bug on aarch64 was fixed.
Bug:
25642296
Change-Id: I02b4f67955991f08a133a3d72ba4b109f896f1dd
Dimitry Ivanov [Fri, 4 Mar 2016 19:05:52 +0000 (11:05 -0800)]
libm: rename LIBC_PRIVATE to LIBC_DEPRECATED
Bug: http://b/
26386014
Change-Id: Ia32411ce779f9dcf2cf7910d8658ffa753c73af9
Elliott Hughes [Fri, 4 Mar 2016 16:35:54 +0000 (16:35 +0000)]
Merge "Add x86 __memset_chk assembler." am:
728e0e9b97
am:
b9b99b83cd
* commit '
b9b99b83cde5a46b962109b9b867cdffc8d56979':
Add x86 __memset_chk assembler.
Elliott Hughes [Fri, 4 Mar 2016 16:33:58 +0000 (16:33 +0000)]
Merge "Add x86 __memset_chk assembler."
am:
728e0e9b97
* commit '
728e0e9b97d7a43b4348062e4040d478c2ab8f51':
Add x86 __memset_chk assembler.
Elliott Hughes [Fri, 4 Mar 2016 16:28:10 +0000 (16:28 +0000)]
Merge "Add x86 __memset_chk assembler."
Elliott Hughes [Fri, 4 Mar 2016 03:23:00 +0000 (03:23 +0000)]
Merge "Fix x86-64 __memset_chk." am:
7d188ce0fe
am:
6ac4d0a054
* commit '
6ac4d0a05431182c8c6e27530f995f28bcbcdcc2':
Fix x86-64 __memset_chk.
Elliott Hughes [Fri, 4 Mar 2016 03:21:06 +0000 (03:21 +0000)]
Merge "Fix x86-64 __memset_chk."
am:
7d188ce0fe
* commit '
7d188ce0feda07f3e0cf6bdbe4e52efe224bb39f':
Fix x86-64 __memset_chk.
Elliott Hughes [Fri, 4 Mar 2016 03:12:35 +0000 (03:12 +0000)]
Merge "Fix x86-64 __memset_chk."
Dimitry Ivanov [Fri, 4 Mar 2016 02:44:05 +0000 (02:44 +0000)]
Merge "Add libsqlite.so to the grey-list" into nyc-dev
am:
60f51b7eb9
* commit '
60f51b7eb906f994832529d1321a39d64710165b':
Add libsqlite.so to the grey-list
Dimitry Ivanov [Fri, 4 Mar 2016 02:33:35 +0000 (02:33 +0000)]
Merge "Add libsqlite.so to the grey-list" into nyc-dev
Dimitry Ivanov [Fri, 4 Mar 2016 02:13:18 +0000 (18:13 -0800)]
Add libsqlite.so to the grey-list
Bug: http://b/
27152660
Bug: http://b/
26394120
Change-Id: I9f8f6eb8cf0d81ddf1b7769e306c08b927f3dad1
Elliott Hughes [Fri, 4 Mar 2016 00:46:25 +0000 (16:46 -0800)]
Fix x86-64 __memset_chk.
I can only assume I was testing the 32-bit implementation when I claimed
this worked. While improving the 32-bit code I realized that I'd used
signed comparisons instead of unsigned, and came back to find that the
64-bit code didn't work.
By way of apology, make x86-64 the first architecture where __memset_chk
falls through to memset.
Change-Id: I54d9eee5349b6a2abb2ce81e161fdcde09556561
Dan Willemsen [Fri, 4 Mar 2016 00:42:36 +0000 (00:42 +0000)]
Merge "Update Android.bp with recent *.mk changes" am:
5f67f8ae9d
am:
27770d6286
* commit '
27770d6286df1b7ea6abca7a04f4edb9acc008b1':
Update Android.bp with recent *.mk changes
Dan Willemsen [Fri, 4 Mar 2016 00:40:52 +0000 (00:40 +0000)]
Merge "Update Android.bp with recent *.mk changes"
am:
5f67f8ae9d
* commit '
5f67f8ae9ded09b1eb68e54a1b3a226c35e10166':
Update Android.bp with recent *.mk changes
Elliott Hughes [Fri, 4 Mar 2016 00:10:33 +0000 (16:10 -0800)]
Add x86 __memset_chk assembler.
Change-Id: Ic6732f761ea8a41f70d5ff59d47ad38417d17cc2
Dan Willemsen [Thu, 3 Mar 2016 23:50:24 +0000 (23:50 +0000)]
Merge "Update Android.bp with recent *.mk changes"
Dan Willemsen [Thu, 3 Mar 2016 23:40:33 +0000 (15:40 -0800)]
Update Android.bp with recent *.mk changes
Change-Id: I01acce3b0018d838c4765881c19f5f009721370f
Josh Gao [Thu, 3 Mar 2016 23:14:40 +0000 (23:14 +0000)]
Add a checksum to jmp_buf on AArch64.
am:
bb06d688a9
* commit '
bb06d688a936a87e8bfee3934e85f8a6d9398f21':
Add a checksum to jmp_buf on AArch64.
Josh Gao [Thu, 3 Mar 2016 23:14:29 +0000 (23:14 +0000)]
Add a checksum to jmp_buf on ARM.
am:
54f1339d1c
* commit '
54f1339d1c745d9d30f0200c332dc76661e75214':
Add a checksum to jmp_buf on ARM.
Josh Gao [Thu, 3 Mar 2016 03:45:29 +0000 (19:45 -0800)]
Add a checksum to jmp_buf on AArch64.
Bug: http://b/
27417786
Change-Id: I17c22dc28a46dd6b678b449b506b0da978f3793e
(cherry picked from commit
0c3655a864f33080ebbec1248c27a7ead87d6a28)
Josh Gao [Thu, 3 Mar 2016 03:03:17 +0000 (19:03 -0800)]
Add a checksum to jmp_buf on ARM.
Make it easier to diagnose applications mucking with the contents of
jmp_buf by checksumming its contents.
Bug: http://b/
27417786
Change-Id: I9989e2ea3979a36ae0bc4c9e1bacafddbacc731b
(cherry picked from commit
a4c69137c693c45fce4010ba61d69d7147f5dd9a)
Elliott Hughes [Thu, 3 Mar 2016 22:36:29 +0000 (22:36 +0000)]
Merge "Clean up bcopy cruft." am:
f3b42e5ae7
am:
915f64cb73
* commit '
915f64cb737c43603eadfff43a03c7ce24f5abf3':
Clean up bcopy cruft.
Elliott Hughes [Thu, 3 Mar 2016 22:36:22 +0000 (22:36 +0000)]
Merge "Mandate optimized assembler for x86-64 __memset_chk." am:
ff9bda7201
am:
a8dc8e601b
* commit '
a8dc8e601b13158e9112262cdefe1b917c93188b':
Mandate optimized assembler for x86-64 __memset_chk.
Elliott Hughes [Thu, 3 Mar 2016 22:27:03 +0000 (22:27 +0000)]
Merge "Clean up bcopy cruft."
am:
f3b42e5ae7
* commit '
f3b42e5ae7727234cac586c20c230466886a7232':
Clean up bcopy cruft.
Elliott Hughes [Thu, 3 Mar 2016 22:24:51 +0000 (22:24 +0000)]
Merge "Clean up bcopy cruft."
Elliott Hughes [Thu, 3 Mar 2016 22:23:25 +0000 (22:23 +0000)]
Merge "Mandate optimized assembler for x86-64 __memset_chk."
am:
ff9bda7201
* commit '
ff9bda720194f3596c9096eb8648ef92d9337c7e':
Mandate optimized assembler for x86-64 __memset_chk.
Elliott Hughes [Thu, 3 Mar 2016 22:18:45 +0000 (22:18 +0000)]
Merge "Mandate optimized assembler for x86-64 __memset_chk."
Dimitry Ivanov [Thu, 3 Mar 2016 22:10:39 +0000 (22:10 +0000)]
libdl: Rename LIBC_PRIVATE to LIBC_PLATFORM
am:
6b80e0b4bb
* commit '
6b80e0b4bbfa51ef72c1446683a943ddbfc26784':
libdl: Rename LIBC_PRIVATE to LIBC_PLATFORM
Dimitry Ivanov [Thu, 3 Mar 2016 22:10:28 +0000 (22:10 +0000)]
Modify android_dlwarning function to use a callback
am:
6be6ef563e
* commit '
6be6ef563e15cec05ea758f76b493b63c760923c':
Modify android_dlwarning function to use a callback
Josh Gao [Thu, 3 Mar 2016 22:06:35 +0000 (22:06 +0000)]
Merge changes I17c22dc2,I9989e2ea am:
19ca2fe82f
am:
6e7e53af2d
* commit '
6e7e53af2d5a3474194ec3ecd3833eba5bf67d34':
Add a checksum to jmp_buf on AArch64.
Add a checksum to jmp_buf on ARM.
Josh Gao [Thu, 3 Mar 2016 22:04:45 +0000 (22:04 +0000)]
Merge changes I17c22dc2,I9989e2ea
am:
19ca2fe82f
* commit '
19ca2fe82fe05dd7565ce294841bd6425e84bb3d':
Add a checksum to jmp_buf on AArch64.
Add a checksum to jmp_buf on ARM.
Josh Gao [Thu, 3 Mar 2016 22:02:37 +0000 (22:02 +0000)]
Merge changes I17c22dc2,I9989e2ea
* changes:
Add a checksum to jmp_buf on AArch64.
Add a checksum to jmp_buf on ARM.
Dimitry Ivanov [Wed, 2 Mar 2016 19:41:22 +0000 (11:41 -0800)]
libdl: Rename LIBC_PRIVATE to LIBC_PLATFORM
Bug: http://b/
26386014
Change-Id: I3255faac66a96867aed302e205e3644b40ce7750
(cherry picked from commit
98cdef39dccad972a527b274be08a1905047a39a)
Dimitry Ivanov [Wed, 2 Mar 2016 21:05:51 +0000 (13:05 -0800)]
Modify android_dlwarning function to use a callback
The previous implementation of android_dlwarning was not thread-safe
and could return a pointer soon to become invalid in some situations.
This change fixed the problem. I have also removed android_dlwarning
from the dlext.h header file in case we decide to keep
android_dlwarning in the final release.
Bug: http://b/
27453994
Change-Id: If6c896a80a17c4be0e18795e617712ad36a106fe
Josh Gao [Thu, 3 Mar 2016 03:45:29 +0000 (19:45 -0800)]
Add a checksum to jmp_buf on AArch64.
Bug: http://b/
27417786
Change-Id: I17c22dc28a46dd6b678b449b506b0da978f3793e
Josh Gao [Thu, 3 Mar 2016 03:03:17 +0000 (19:03 -0800)]
Add a checksum to jmp_buf on ARM.
Make it easier to diagnose applications mucking with the contents of
jmp_buf by checksumming its contents.
Bug: http://b/
27417786
Change-Id: I9989e2ea3979a36ae0bc4c9e1bacafddbacc731b
Elliott Hughes [Thu, 3 Mar 2016 18:41:42 +0000 (10:41 -0800)]
Clean up bcopy cruft.
Also remove some generic x86 assembler that's never built.
Change-Id: Ic126de2eee646b5ba2b6ee549679ba90d67a48bb
Elliott Hughes [Thu, 3 Mar 2016 18:29:36 +0000 (18:29 +0000)]
Merge "Remove optimized code for bzero, which was removed from POSIX in 2008." am:
6809af0375
am:
11dcd28038
* commit '
11dcd28038922612663b108738087c595c6cdbdd':
Remove optimized code for bzero, which was removed from POSIX in 2008.
Elliott Hughes [Thu, 3 Mar 2016 18:27:36 +0000 (18:27 +0000)]
Merge "Remove optimized code for bzero, which was removed from POSIX in 2008."
am:
6809af0375
* commit '
6809af03759e27c87598ea56e4f6a8c9b6267add':
Remove optimized code for bzero, which was removed from POSIX in 2008.
Elliott Hughes [Thu, 3 Mar 2016 18:26:02 +0000 (18:26 +0000)]
Merge "Remove optimized code for bzero, which was removed from POSIX in 2008."
Elliott Hughes [Thu, 3 Mar 2016 01:40:27 +0000 (01:40 +0000)]
Merge "Mandate optimized __memset_chk for arm and arm64." am:
5e57039c24
am:
e579456a80
* commit '
e579456a80dd135b0f109d5688cbe8ad4f7b22ba':
Mandate optimized __memset_chk for arm and arm64.
Elliott Hughes [Thu, 3 Mar 2016 01:18:18 +0000 (17:18 -0800)]
Remove optimized code for bzero, which was removed from POSIX in 2008.
I'll come back for the last bcopy remnant...
Bug: http://b/
26407170
Change-Id: Iabfeb95fc8a4b4b3992e3cc209ec5221040e7c26
Elliott Hughes [Thu, 3 Mar 2016 00:42:51 +0000 (00:42 +0000)]
Merge "Mandate optimized __memset_chk for arm and arm64."
am:
5e57039c24
* commit '
5e57039c24d8aa777480e33255d627ca28af7dfe':
Mandate optimized __memset_chk for arm and arm64.
Elliott Hughes [Thu, 3 Mar 2016 00:39:29 +0000 (16:39 -0800)]
Mandate optimized assembler for x86-64 __memset_chk.
Change-Id: I4d6b452f3cf850d405e8f5d7da01d432603e606b
Elliott Hughes [Thu, 3 Mar 2016 00:30:06 +0000 (00:30 +0000)]
Merge "Mandate optimized __memset_chk for arm and arm64."
Dimitry Ivanov [Wed, 2 Mar 2016 22:49:02 +0000 (14:49 -0800)]
resolve merge conflicts of
b2fd768656 to nyc-dev-plus-aosp
Change-Id: Ic4e4f151759c34ef271d54d37be379600ef16f4b
Dimitry Ivanov [Wed, 2 Mar 2016 21:34:03 +0000 (21:34 +0000)]
Merge "libdl: Rename LIBC_PRIVATE to LIBC_PLATFORM"
am:
6e30ca516b
* commit '
6e30ca516bbf1d209d827306c495b2a205540c5a':
libdl: Rename LIBC_PRIVATE to LIBC_PLATFORM
Dimitry Ivanov [Wed, 2 Mar 2016 21:04:31 +0000 (21:04 +0000)]
Merge "libdl: Rename LIBC_PRIVATE to LIBC_PLATFORM"
Dimitry Ivanov [Wed, 2 Mar 2016 20:04:02 +0000 (20:04 +0000)]
Merge "Do not add linker the _r_debug.r_map on link_image" am:
ca75a3e3e7
am:
7264f571a7
* commit '
7264f571a7fd7689dc92a3bb16806e77a4fe3007':
Do not add linker the _r_debug.r_map on link_image
Elliott Hughes [Wed, 2 Mar 2016 19:58:41 +0000 (11:58 -0800)]
Mandate optimized __memset_chk for arm and arm64.
This involves actually implementing assembler __memset_chk for arm64,
but that's easily done.
Obviously I'd like this for all architectures (and all the string functions),
but this is low-hanging fruit...
Change-Id: I70ec48c91aafd1f0feb974a2555c51611de9ef82
Dimitry Ivanov [Wed, 2 Mar 2016 19:53:12 +0000 (19:53 +0000)]
Merge "Do not add linker the _r_debug.r_map on link_image"
am:
ca75a3e3e7
* commit '
ca75a3e3e7574e66e09632b1692b3c144ba2b4f4':
Do not add linker the _r_debug.r_map on link_image
Dimitry Ivanov [Wed, 2 Mar 2016 19:49:25 +0000 (19:49 +0000)]
Merge "Do not add linker the _r_debug.r_map on link_image"
Dimitry Ivanov [Wed, 2 Mar 2016 19:41:22 +0000 (11:41 -0800)]
libdl: Rename LIBC_PRIVATE to LIBC_PLATFORM
Bug: http://b/
26386014
Change-Id: I3255faac66a96867aed302e205e3644b40ce7750
Elliott Hughes [Wed, 2 Mar 2016 19:32:03 +0000 (19:32 +0000)]
Merge "Improve diagnostics from the assembler __memcpy_chk routines." am:
2332d52439
am:
61050edbfd
* commit '
61050edbfd0896d2445dcf1e2cece2f4d207e00a':
Improve diagnostics from the assembler __memcpy_chk routines.
Elliott Hughes [Wed, 2 Mar 2016 19:21:33 +0000 (19:21 +0000)]
Merge "Improve diagnostics from the assembler __memcpy_chk routines."
am:
2332d52439
* commit '
2332d524396aa69c55969cf6e48a5048f12d53ea':
Improve diagnostics from the assembler __memcpy_chk routines.
Elliott Hughes [Wed, 2 Mar 2016 19:13:02 +0000 (19:13 +0000)]
Merge "Improve diagnostics from the assembler __memcpy_chk routines."
Dimitry Ivanov [Tue, 1 Mar 2016 23:55:56 +0000 (15:55 -0800)]
Do not add linker the _r_debug.r_map on link_image
Change-Id: Idd0fb06a5d9f400c0608ae532cc4c575211810fa
Elliott Hughes [Wed, 2 Mar 2016 18:24:23 +0000 (18:24 +0000)]
Fix getifaddrs\' handling of point-to-point interfaces.
am:
fbdffcc34b
* commit '
fbdffcc34b757c267c736f5fde9c631ae4815247':
Fix getifaddrs' handling of point-to-point interfaces.
Elliott Hughes [Wed, 2 Mar 2016 16:55:23 +0000 (16:55 +0000)]
Merge "Fix getifaddrs\' handling of point-to-point interfaces." am:
c5fa374ee9
am:
869dfdc6be
* commit '
869dfdc6be8aedb0b2ba73c8f7c2c24337e253de':
Fix getifaddrs' handling of point-to-point interfaces.
Elliott Hughes [Wed, 2 Mar 2016 16:30:41 +0000 (16:30 +0000)]
Merge "Fix getifaddrs\' handling of point-to-point interfaces."
am:
c5fa374ee9
* commit '
c5fa374ee92e3aedd15daf450e1a8bb5179e7a6a':
Fix getifaddrs' handling of point-to-point interfaces.
Elliott Hughes [Wed, 2 Mar 2016 01:27:12 +0000 (17:27 -0800)]
Fix getifaddrs' handling of point-to-point interfaces.
Also remove an if that implied that IFA_BROADCAST is a possibility for
AF_INET6.
The existing tests fail if you have a point-to-point interface configured,
so no new test necessary.
Bug: http://b/
27442503
(cherry picked from commit
ef925e50d38fe6f5499c1d0d24cca98bf88e5256)
Change-Id: I19c19d83a86d0a8004a6b45dea7febe9d6fb6a2e
Elliott Hughes [Wed, 2 Mar 2016 16:06:13 +0000 (16:06 +0000)]
Merge "Fix getifaddrs' handling of point-to-point interfaces."
Elliott Hughes [Wed, 2 Mar 2016 01:27:12 +0000 (17:27 -0800)]
Fix getifaddrs' handling of point-to-point interfaces.
Also remove an if that implied that IFA_BROADCAST is a possibility for
AF_INET6.
The existing tests fail if you have a point-to-point interface configured,
so no new test necessary.
Bug: http://b/
27442503
Change-Id: I4c5823b32204ae6c15527853414c2a0cef320b53
Dimitry Ivanov [Wed, 2 Mar 2016 01:15:10 +0000 (17:15 -0800)]
resolve merge conflicts of
e80bd8c884 to nyc-dev-plus-aosp
Change-Id: Ife166398167859af1ea471016e73a5e0fe03fee7
Dimitry Ivanov [Tue, 1 Mar 2016 23:33:31 +0000 (23:33 +0000)]
Merge "linker: print "not accessible" error message to the log"
am:
a3be5bfded
* commit '
a3be5bfdede8ae6c88bb06d6fa6bf8192ea3268e':
linker: print "not accessible" error message to the log
OSDN Git Service
