OSDN Git Service
Pierre Imai [Wed, 30 Mar 2016 07:43:44 +0000 (07:43 +0000)]
Merge "Copy the entire zero-separated DNS seach domain string." into nyc-dev
am:
9b33108
* commit '
9b331089db29d5ffa9909d27b17b96e0d45bda51':
Copy the entire zero-separated DNS seach domain string.
Change-Id: Iaf939a3b69f171c19c8f9c083da6ca22a2ce0ce4
Pierre Imai [Wed, 30 Mar 2016 07:38:26 +0000 (07:38 +0000)]
Merge "Copy the entire zero-separated DNS seach domain string." into nyc-dev
Predrag Blagojevic [Wed, 30 Mar 2016 02:37:35 +0000 (02:37 +0000)]
Merge "Add a checksum to jmp_buf on mips and mips64." am:
eaf50be
am:
a9b6bfb
* commit '
a9b6bfbb4c696ff8c9c78d18eab0373eb4a9ab79':
Add a checksum to jmp_buf on mips and mips64.
Change-Id: I1212798aa6eecb664ec75c6ac28944ca64bceb2c
Predrag Blagojevic [Wed, 30 Mar 2016 02:33:50 +0000 (02:33 +0000)]
Merge "Add a checksum to jmp_buf on mips and mips64."
am:
eaf50be
* commit '
eaf50be332f015bd90e45d4f9d111b24cd230f00':
Add a checksum to jmp_buf on mips and mips64.
Change-Id: I40992a1fc36bbe31fd3fa4c3b82b1ca62452f74b
Josh Gao [Wed, 30 Mar 2016 02:27:00 +0000 (02:27 +0000)]
Merge "Add a checksum to jmp_buf on mips and mips64."
Yabin Cui [Wed, 30 Mar 2016 01:48:18 +0000 (01:48 +0000)]
Merge "Fix test getauxval.arm_has_AT_HWCAP2." into nyc-dev
am:
26e33ec
* commit '
26e33ec1b9ce42accc0bea9ae9fdc9bf9b4d2d5d':
Fix test getauxval.arm_has_AT_HWCAP2.
Change-Id: Ice7954946f700c88a7d17f6bfc3f1be70053658f
Josh Gao [Wed, 30 Mar 2016 01:48:18 +0000 (01:48 +0000)]
Add a checksum to jmp_buf on x86_64.
am:
89c41d6
* commit '
89c41d68edd53189a006d7b7f21cdf0066b70711':
Add a checksum to jmp_buf on x86_64.
Change-Id: Ifb9e940c5eb6e37060936c202e433c5e102ded57
Josh Gao [Wed, 30 Mar 2016 01:48:17 +0000 (01:48 +0000)]
Delete lies from x86_64 setjmp implementation.
am:
95e789a -s ours
* commit '
95e789a30732ba9d51dc01a50b2e973e6330295f':
Delete lies from x86_64 setjmp implementation.
Change-Id: I6e21a5675f33ab09bce236b6f186630c2a5a6a13
Josh Gao [Wed, 30 Mar 2016 01:26:33 +0000 (01:26 +0000)]
Add a checksum to jmp_buf on x86.
am:
7af64bd
* commit '
7af64bd083a86df3ec2322892a5fcfcc075c2114':
Add a checksum to jmp_buf on x86.
Change-Id: I5c166c1d7fc231298ebcdcd3d629d4f18ef08836
Yabin Cui [Wed, 30 Mar 2016 01:24:12 +0000 (01:24 +0000)]
Merge "Fix test getauxval.arm_has_AT_HWCAP2." into nyc-dev
Josh Gao [Wed, 30 Mar 2016 01:19:14 +0000 (01:19 +0000)]
Merge changes from topic \'setjmp_checksum_x86\' am:
a42789f
am:
47982ec
* commit '
47982ec944fbf3256ed63487ef20d78706e4a986':
Add a checksum to jmp_buf on x86_64.
Delete lies from x86_64 setjmp implementation.
Add a checksum to jmp_buf on x86.
Change-Id: Iae1dfe7c09f4ed219daa6992f4b6428631fa5423
Josh Gao [Wed, 30 Mar 2016 01:11:57 +0000 (01:11 +0000)]
Merge changes from topic \'setjmp_checksum_x86\'
am:
a42789f
* commit '
a42789f9d246097c6178dabf5ba0fd227e038d70':
Add a checksum to jmp_buf on x86_64.
Delete lies from x86_64 setjmp implementation.
Add a checksum to jmp_buf on x86.
Change-Id: Ie985fd94f1f686d1335b3d898f3aee1973f2027e
Josh Gao [Tue, 29 Mar 2016 21:53:26 +0000 (14:53 -0700)]
Add a checksum to jmp_buf on x86_64.
Bug: http://b/
27856501
Bug: http://b/
27417786
Change-Id: I541f5a7ce4972ef56b3f69e73927ca7df362609a
(cherry picked from commit
686e5f6f69c5c30a09d73e42657cb502a261ad6a)
Josh Gao [Tue, 29 Mar 2016 21:34:03 +0000 (14:34 -0700)]
Delete lies from x86_64 setjmp implementation.
Previously, the implementation of setjmp on x86_64 claimed that
sigprocmask would write to two longs' worth of bytes.
Bug: http://b/
27856501
Change-Id: I9f32b40ac773a0cd91a976aace5bfba6e67fb0f8
(cherry picked from commit
c244fcb8a3396f94976a56379cce144c4451c3d4)
Josh Gao [Tue, 29 Mar 2016 21:03:09 +0000 (14:03 -0700)]
Add a checksum to jmp_buf on x86.
Bug: http://b/
27856501
Bug: http://b/
27417786
Change-Id: Id5a0a81fc38e311bff678cbc7dc2219bc0074503
(cherry picked from commit
926078539346f5d3cc864c9ba25993e8c6437c07)
Josh Gao [Wed, 30 Mar 2016 00:58:30 +0000 (00:58 +0000)]
Merge changes from topic 'setjmp_checksum_x86'
* changes:
Add a checksum to jmp_buf on x86_64.
Delete lies from x86_64 setjmp implementation.
Add a checksum to jmp_buf on x86.
Josh Gao [Tue, 29 Mar 2016 21:53:26 +0000 (14:53 -0700)]
Add a checksum to jmp_buf on x86_64.
Bug: http://b/
27856501
Bug: http://b/
27417786
Change-Id: I541f5a7ce4972ef56b3f69e73927ca7df362609a
Josh Gao [Tue, 29 Mar 2016 21:34:03 +0000 (14:34 -0700)]
Delete lies from x86_64 setjmp implementation.
Previously, the implementation of setjmp on x86_64 claimed that
sigprocmask would write to two longs' worth of bytes.
Bug: http://b/
27856501
Change-Id: I9f32b40ac773a0cd91a976aace5bfba6e67fb0f8
Josh Gao [Tue, 29 Mar 2016 21:03:09 +0000 (14:03 -0700)]
Add a checksum to jmp_buf on x86.
Bug: http://b/
27856501
Bug: http://b/
27417786
Change-Id: Id5a0a81fc38e311bff678cbc7dc2219bc0074503
Yabin Cui [Tue, 29 Mar 2016 23:56:36 +0000 (23:56 +0000)]
Merge "Fix test getauxval.arm_has_AT_HWCAP2." am:
c03e8ce
am:
e485131
* commit '
e485131e968baddbad6eb754ee718e62de216495':
Fix test getauxval.arm_has_AT_HWCAP2.
Change-Id: Ibe52a6067ca191c75122ccd85ab4dcd29074ef3a
Yabin Cui [Tue, 29 Mar 2016 23:53:27 +0000 (23:53 +0000)]
Merge "Fix test getauxval.arm_has_AT_HWCAP2."
am:
c03e8ce
* commit '
c03e8ceec233494ae1248247c5a1f4a374e70ae5':
Fix test getauxval.arm_has_AT_HWCAP2.
Change-Id: I13ec050d894c7626fc74327cf0b9e1e3e6528b0a
Yabin Cui [Tue, 29 Mar 2016 22:41:49 +0000 (15:41 -0700)]
Fix test getauxval.arm_has_AT_HWCAP2.
Bug:
27874785
Change-Id: Ibb39087c5353a0cca7783d39498b370e478fe91c
(cherry picked from commit
78f5eb0498e0bae7f64f749b252aee7e56621b34)
Dan Willemsen [Tue, 29 Mar 2016 23:47:16 +0000 (23:47 +0000)]
Merge "Update Android.bp with getdomainname" am:
8ac6611
am:
6c67077
* commit '
6c67077abd6974289532417ab6d345fa5121d6fb':
Update Android.bp with getdomainname
Change-Id: I69888502b466fca540aa1adbce1c125e9d025cbd
Yabin Cui [Tue, 29 Mar 2016 23:44:59 +0000 (23:44 +0000)]
Merge "Fix test getauxval.arm_has_AT_HWCAP2."
Dan Willemsen [Tue, 29 Mar 2016 23:44:10 +0000 (23:44 +0000)]
Merge "Update Android.bp with getdomainname"
am:
8ac6611
* commit '
8ac6611e7fc8df8ea90f22cc21398ab64f4da16c':
Update Android.bp with getdomainname
Change-Id: I49657f3d713ba17e67da32f3eb103544934ea041
Dan Willemsen [Tue, 29 Mar 2016 23:36:41 +0000 (23:36 +0000)]
Merge "Update Android.bp with getdomainname"
Yabin Cui [Tue, 29 Mar 2016 22:41:49 +0000 (15:41 -0700)]
Fix test getauxval.arm_has_AT_HWCAP2.
Bug:
27874785
Change-Id: Ibb39087c5353a0cca7783d39498b370e478fe91c
Dan Willemsen [Tue, 29 Mar 2016 22:21:38 +0000 (15:21 -0700)]
Update Android.bp with getdomainname
Change-Id: I32383162acd16430089708fdce8927be43d1bc5a
Elliott Hughes [Tue, 29 Mar 2016 18:27:27 +0000 (11:27 -0700)]
resolve merge conflicts of
9ce09e4 to nyc-dev-plus-aosp
Change-Id: I0b5ac686e45c685e5168a0870570589e2eb82488
Mingwei Shi [Thu, 12 Nov 2015 07:02:14 +0000 (07:02 +0000)]
libc: implement kernel vdso syscalls for i386
This patch uses __kernel_vsyscall instead of "int 0x80"
as the syscall entry point. AT_SYSINFO points to
an adapter to mask the arch specific difference and gives a
performance boost on i386 architecture.
Bug: http://b/
27533895
Change-ID: Ib340c604d02c6c25714a95793737e3cfdc3fc5d7
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
(cherry picked from commit
be910529322b461148debefd50b9e0d67ae84f8e)
Pierre Imai [Mon, 29 Feb 2016 07:31:55 +0000 (16:31 +0900)]
Copy the entire zero-separated DNS seach domain string.
The DNS search string contains zeros as domain separator. The resolver
code erroneously used strlcpy(), which resulted in only the first domain
to be copied. The code uses pointers into this string to access the
individual domains. Since the structure is zero-initialized, this bug only
resulted in zero-length domains instead of accessing unitialized memory.
BUG:
27312811
Change-Id: Ia9d066c405dfcc5e82d6766d93ead2ce574e7b0d
(cherry picked from commit
0967fc7e59cda0ea2561b0eaa58ed842da7c0eb9)
Dimitry Ivanov [Mon, 28 Mar 2016 23:57:50 +0000 (23:57 +0000)]
Merge "linker: hide the pointer to soinfo" into nyc-dev
am:
79e9228
* commit '
79e92282240e9e09568f3138b5f8caa6b85cb1c6':
linker: hide the pointer to soinfo
Dimitry Ivanov [Mon, 28 Mar 2016 23:36:40 +0000 (23:36 +0000)]
Merge "linker: hide the pointer to soinfo" into nyc-dev
Dimitry Ivanov [Mon, 28 Mar 2016 23:20:34 +0000 (16:20 -0700)]
resolve merge conflicts of
cba377a to nyc-dev-plus-aosp
Change-Id: Ib34a674f071228b528e8bca1cfae63a60d638572
Dimitry Ivanov [Mon, 28 Mar 2016 22:47:22 +0000 (22:47 +0000)]
Merge "linker: hide the pointer to soinfo"
am:
19f5f6f
* commit '
19f5f6fcb7f0edc41b2889649620f287458466f0':
linker: hide the pointer to soinfo
Dimitry Ivanov [Mon, 28 Mar 2016 22:39:39 +0000 (22:39 +0000)]
Merge changes Idd0fb06a,Ia17dd540,I96c6592a,I0eacb3f0,I8e2895ec, ... into nyc-dev
* changes:
Do not add linker the _r_debug.r_map on link_image
Improvements to dynamic linker messages
Move gdb support functions to a separate file
Use insert_link_map_into_debug_map for executable
Update a comment for init_linker_info_for_gdb
Initialize linker link_map for gdb directly
Dimitry Ivanov [Thu, 24 Mar 2016 22:30:30 +0000 (15:30 -0700)]
linker: hide the pointer to soinfo
Handle no longer is a pointer to soinfo of
a corresponding library. This is done to
prevent access to linker internal fields.
Bug: http://b/
25593965
Change-Id: I62bff0d0e5b2dc842e6bf0babb30fcc4c000be24
(cherry picked from commit
d88e1f350111b3dfd71c6492321f0503cb5540db)
Dimitry Ivanov [Mon, 28 Mar 2016 22:32:31 +0000 (22:32 +0000)]
Merge "linker: hide the pointer to soinfo"
Elliott Hughes [Mon, 28 Mar 2016 22:24:48 +0000 (22:24 +0000)]
Don\'t bother insisting on AT_HWCAP2 for 32-bit devices.
am:
5ca2bdd
* commit '
5ca2bddae3c468cd37f028cdc2d5a5f5d98b3545':
Don't bother insisting on AT_HWCAP2 for 32-bit devices.
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
Bug: http://b/
27533895
Change-Id: Idd0fb06a5d9f400c0608ae532cc4c575211810fa
(cherry picked from commit
e97d8ed70e44db619de9975a43ed2d1509653d74)
Dimitry Ivanov [Thu, 18 Feb 2016 22:37:44 +0000 (14:37 -0800)]
Improvements to dynamic linker messages
Error messages now include executable name,
also linker doesn't abort if called on itself.
Bug: http://b/
27533895
Change-Id: Ia17dd540919544b28062ed71751a1d79ee865206
(cherry picked from commit
9f0a6954c602e63f85746237e1a333b4571d757d)
Dimitry Ivanov [Thu, 18 Feb 2016 00:08:03 +0000 (16:08 -0800)]
Move gdb support functions to a separate file
Move gdb support functions and variables to
linker_gdb_support.h/cpp
Bug: http://b/
27533895
Change-Id: I96c6592a7055715b18f1137367470fe80987263f
(cherry picked from commit
6b788eeff2ea0019849517e796b762ae790ca142)
Dimitry Ivanov [Wed, 17 Feb 2016 23:25:25 +0000 (15:25 -0800)]
Use insert_link_map_into_debug_map for executable
Use insert_link_map_into_debug_map to insert the main
executable's link_map to r_debug
Bug: http://b/
27533895
Change-Id: I0eacb3f030ea3eb16ed50ad2011d604beece2d03
(cherry picked from commit
f3064e4bc7f4dee351bc2eb9272db3e9792dc683)
Dimitry Ivanov [Wed, 17 Feb 2016 22:13:06 +0000 (14:13 -0800)]
Update a comment for init_linker_info_for_gdb
Bug: http://b/
27533895
Change-Id: I8e2895ecfcc6f77a180c3735342afc93be5923d3
(cherry picked from commit
6400129628ef24adb57fc4822d4fd54b8967701b)
Dimitry Ivanov [Tue, 16 Feb 2016 21:43:35 +0000 (13:43 -0800)]
Initialize linker link_map for gdb directly
Remove unnecessary construction of soinfo when
initializing linker link_map for gdb.
Bug: http://b/
27533895
Change-Id: Idf32cee56309aa9c9cf260efbd17a9deae9a756b
(cherry picked from commit
8d22dd53feddcc7a84e1cc481f171fd4dfe095a1)
Dimitry Ivanov [Thu, 24 Mar 2016 22:30:30 +0000 (15:30 -0700)]
linker: hide the pointer to soinfo
Handle no longer is a pointer to soinfo of
a corresponding library. This is done to
prevent access to linker internal fields.
Bug: http://b/
25593965
Change-Id: I62bff0d0e5b2dc842e6bf0babb30fcc4c000be24
Elliott Hughes [Mon, 28 Mar 2016 19:46:31 +0000 (19:46 +0000)]
Merge "Don\'t bother insisting on AT_HWCAP2 for 32-bit devices."
am:
33a6622
* commit '
33a66222fa61e3eac5d9e76d550d104551042233':
Don't bother insisting on AT_HWCAP2 for 32-bit devices.
Elliott Hughes [Mon, 28 Mar 2016 18:53:12 +0000 (11:53 -0700)]
Don't bother insisting on AT_HWCAP2 for 32-bit devices.
Bug: http://b/
27874785
(cherry picked from commit
900a4dc5a8fcabcc85eb17a0d1ee2295cae7b180)
Change-Id: Ia8c3543c51861030b33f8a4e0c0b88d7cca6e11e
Elliott Hughes [Mon, 28 Mar 2016 19:33:48 +0000 (19:33 +0000)]
Merge "Don't bother insisting on AT_HWCAP2 for 32-bit devices."
Greg Hackmann [Mon, 28 Mar 2016 19:30:52 +0000 (19:30 +0000)]
Merge "clock_nanosleep: add CLOCK_THREAD_CPUTIME_ID special case"
am:
8a8e0cf
* commit '
8a8e0cf549249fd4040fbfa7f5e4f488db7ac8ad':
clock_nanosleep: add CLOCK_THREAD_CPUTIME_ID special case
Greg Hackmann [Mon, 28 Mar 2016 19:19:15 +0000 (19:19 +0000)]
Merge "clock_nanosleep: add CLOCK_THREAD_CPUTIME_ID special case"
Elliott Hughes [Mon, 28 Mar 2016 18:53:12 +0000 (11:53 -0700)]
Don't bother insisting on AT_HWCAP2 for 32-bit devices.
Bug: http://b/
27874785
Change-Id: I9dcf345ae1221f665f267cba3ed9279435671b75
Greg Hackmann [Sat, 26 Mar 2016 18:37:55 +0000 (11:37 -0700)]
clock_nanosleep: add CLOCK_THREAD_CPUTIME_ID special case
POSIX makes "the CPU-time clock of the calling thread" (i.e.,
CLOCK_THREAD_CPUTIME_ID) a special case which returns EINVAL instead of
ENOTSUP.
However, the clock_nanosleep syscall treats this clock just like any
other, and returns -EOPNOTSUPP to indicate an unimplemented nanosleep
handler. So we need to handle this ourselves in userspace.
This change fixes the LTP clock_nanosleep01 testcase.
Change-Id: If3bed940d276834bcd114d8c17f96197e9384711
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Predrag Blagojevic [Wed, 16 Mar 2016 14:49:12 +0000 (15:49 +0100)]
Add a checksum to jmp_buf on mips and mips64.
Make it easier to diagnose applications mucking with the contents of
jmp_buf by checksumming its contents.
Bug: http://b/
27417786
Change-Id: I473bc2871dece23a9b9d02481945246160d671c6
Nick Kralevich [Mon, 28 Mar 2016 00:36:06 +0000 (00:36 +0000)]
Merge "fixup x86 setdomainname.S"
am:
7c59c70
* commit '
7c59c70200a86387d3c97e9d7f34e2b8dbed88b3':
fixup x86 setdomainname.S
Nick Kralevich [Mon, 28 Mar 2016 00:27:05 +0000 (00:27 +0000)]
Merge "fixup x86 setdomainname.S"
Nick Kralevich [Sun, 27 Mar 2016 21:52:58 +0000 (14:52 -0700)]
fixup x86 setdomainname.S
Both
be910529322b461148debefd50b9e0d67ae84f8e and
e2faf07d659b1c824002e50b9cdfa9caae62a31b were submitted about
two days ago. The former changed how the syscalls stubs were
generated, but the latter was submitted using the old stub
format.
Use the new stub format for setdomainname.S
Change-Id: I578acd7053f57a275f6831dd2404ef04826c578e
Yabin Cui [Sat, 26 Mar 2016 22:19:18 +0000 (22:19 +0000)]
Fix pthread.pthread_barrier_smoke test.
am:
0eed282
* commit '
0eed2827ed707f22c6901f70a167b005a2ade262':
Fix pthread.pthread_barrier_smoke test.
Yabin Cui [Tue, 22 Mar 2016 20:45:55 +0000 (13:45 -0700)]
Fix pthread.pthread_barrier_smoke test.
pthread_barrier_smoke test uses WaitUntilThreadSleep() to wait until
BarrierTestHelper threads sleep in pthread_barrier_wait(). But this
is flaky as there a two futex_wait places in pthread_barrier_wait.
This patch modifies this test to avoid using WaitUntilThreadSleep().
Bug:
27780937
Bug:
27811377
Change-Id: I4c36b82cce9345d5088f8854b289dc5bf7a08e8c
(cherry picked from commit
81d2797e33d6f95c0b79e20ae8a04f2a4f3841cc)
Greg Hackmann [Fri, 25 Mar 2016 22:50:04 +0000 (22:50 +0000)]
Merge "Add hasmntopt(3)"
am:
d132099
* commit '
d132099e0597276dea1faa30d674256309c99736':
Add hasmntopt(3)
Greg Hackmann [Fri, 25 Mar 2016 22:43:00 +0000 (22:43 +0000)]
Merge "Add hasmntopt(3)"
Mingwei Shi [Fri, 25 Mar 2016 22:29:02 +0000 (22:29 +0000)]
Merge "libc: implement kernel vdso syscalls for i386"
am:
d81143d
* commit '
d81143df7196509596ede621d635f90421ad152b':
libc: implement kernel vdso syscalls for i386
Elliott Hughes [Fri, 25 Mar 2016 22:20:42 +0000 (22:20 +0000)]
Merge "libc: implement kernel vdso syscalls for i386"
Greg Hackmann [Fri, 25 Mar 2016 22:12:53 +0000 (22:12 +0000)]
Merge "Add {get,set}domainname(2)"
am:
76640d5
* commit '
76640d5555a7c79d8025f5f0934afbf9f539e6a7':
Add {get,set}domainname(2)
Greg Hackmann [Fri, 25 Mar 2016 22:02:06 +0000 (22:02 +0000)]
Merge "Add {get,set}domainname(2)"
Greg Hackmann [Fri, 4 Mar 2016 18:07:35 +0000 (10:07 -0800)]
Add hasmntopt(3)
bionic has the Linux-specific mntent.h but is missing hasmntopt().
Change-Id: I0ab7b83626c969704add4e64b37a6fc715d4a723
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Thu, 3 Mar 2016 16:37:53 +0000 (08:37 -0800)]
Add {get,set}domainname(2)
{get,set}domainname aren't in POSIX but are widely-implemented
extensions.
The Linux kernel provides a setdomainname syscall but not a symmetric
getdomainname syscall, since it expects userspace to get the domain name
from uname(2).
Change-Id: I96726c242f4bb646c130b361688328b0b97269a0
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Mingwei Shi [Thu, 12 Nov 2015 07:02:14 +0000 (07:02 +0000)]
libc: implement kernel vdso syscalls for i386
This patch uses __kernel_vsyscall instead of "int 0x80"
as the syscall entry point. AT_SYSINFO points to
an adapter to mask the arch specific difference and gives a
performance boost on i386 architecture.
Change-ID: Ib340c604d02c6c25714a95793737e3cfdc3fc5d7
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
Greg Hackmann [Fri, 25 Mar 2016 20:07:30 +0000 (20:07 +0000)]
Merge "epoll_create: reject size <= 0"
am:
2846ae7
* commit '
2846ae70fb967269e8fcd2d854d04c9aeb5d01d3':
epoll_create: reject size <= 0
Greg Hackmann [Fri, 25 Mar 2016 20:07:30 +0000 (20:07 +0000)]
Merge "clone: check for NULL child stack"
am:
61cb584
* commit '
61cb584f9fdcbe96c6130ee5dc402fce296bc635':
clone: check for NULL child stack
Colin Cross [Fri, 25 Mar 2016 19:58:52 +0000 (19:58 +0000)]
Merge "Update Android.bp to match Android.mk" into nyc-dev
am:
3b012b0
* commit '
3b012b0cf34b5a9c3d062a6b23ba91460662e816':
Update Android.bp to match Android.mk
Colin Cross [Fri, 25 Mar 2016 19:54:27 +0000 (19:54 +0000)]
Merge "Update Android.bp to match Android.mk" into nyc-dev
Greg Hackmann [Fri, 25 Mar 2016 19:35:01 +0000 (19:35 +0000)]
Merge "epoll_create: reject size <= 0"
Greg Hackmann [Fri, 25 Mar 2016 19:34:44 +0000 (19:34 +0000)]
Merge "clone: check for NULL child stack"
Elliott Hughes [Fri, 25 Mar 2016 19:12:26 +0000 (19:12 +0000)]
Fix the AT_HWCAP2 test.
am:
2c7fdeb
* commit '
2c7fdeb61cca97fb40df006354a6f5c81361faee':
Fix the AT_HWCAP2 test.
Elliott Hughes [Fri, 25 Mar 2016 18:48:05 +0000 (18:48 +0000)]
Merge "Fix x86 __memset_chk."
am:
ef27637
* commit '
ef276377933e5e406f5e34dd8f45af1c98f89706':
Fix x86 __memset_chk.
Elliott Hughes [Fri, 25 Mar 2016 18:08:47 +0000 (18:08 +0000)]
Merge "Fix the AT_HWCAP2 test."
am:
fc501cc
* commit '
fc501cc54622939cc51499b9af57539f48cbba1a':
Fix the AT_HWCAP2 test.
Elliott Hughes [Fri, 25 Mar 2016 18:02:42 +0000 (18:02 +0000)]
Merge "Fix x86 __memset_chk."
Elliott Hughes [Fri, 25 Mar 2016 15:29:05 +0000 (08:29 -0700)]
Fix the AT_HWCAP2 test.
"I have none of these capabilities" is a legitimate response, and
distinct from "I don't know what my capabilities are". It's the latter
I meant to test for.
Bug: http://b/
27810985
(cherry picked from commit
d4c91124906b6d73a2be336bbd305cd2678e04b2)
Change-Id: I4093948039a658e926e9b5e28d19b1344c70bd0e
Elliott Hughes [Fri, 25 Mar 2016 17:31:54 +0000 (17:31 +0000)]
Merge "Fix the AT_HWCAP2 test."
Elliott Hughes [Fri, 25 Mar 2016 15:29:05 +0000 (08:29 -0700)]
Fix the AT_HWCAP2 test.
"I have none of these capabilities" is a legitimate response, and
distinct from "I don't know what my capabilities are". It's the latter
I meant to test for.
Bug: http://b/
27810985
Change-Id: Id165423e62390051cbf23fdda54f28d94566cbe7
Elliott Hughes [Fri, 25 Mar 2016 05:34:47 +0000 (22:34 -0700)]
Fix x86 __memset_chk.
The stack offsets assumed we'd pushed %ebx. Unlike x86-64 we can't fall
through, but we can avoid repeating work we've already done.
Change-Id: I7e5f9be50983ed6178dd0c0534042da7ea30ad0c
Yabin Cui [Fri, 25 Mar 2016 03:00:20 +0000 (03:00 +0000)]
Adjust test to let it pass on libhoudini.
am:
ec9b56e
* commit '
ec9b56ee2e3ddd5b475e9804f42f65e8b71486bd':
Adjust test to let it pass on libhoudini.
Greg Hackmann [Thu, 24 Mar 2016 20:41:17 +0000 (13:41 -0700)]
epoll_create: reject size <= 0
Even though the size parameter to epoll_create(2) is (otherwise) unused,
passing in size <= 0 is explicitly documented as an error.
This change fixes the LTP epoll01 testcase.
Change-Id: I044a38be823c2fa956b57e77cc66571dfae8a4bb
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Thu, 24 Mar 2016 00:15:02 +0000 (17:15 -0700)]
clone: check for NULL child stack
The clone syscall accepts NULL child stacks, interpreting this to mean
the child gets a copy of the parent's stack with copy-on-write
semantics. However clone(2) is explicitly documented to treat this an
an error.
"Fortunately" every architecture's __bionic_clone implementation pushes
something onto the child stack before making the clone syscall. So we
know fixing this won't break legacy apps, because any app that tried
using a NULL child stack would have died with SIGSEGV.
This change fixes the LTP clone04 testcase.
Change-Id: I663b34f34bc8dad2aa405c46e4eed4418cccca0d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Yabin Cui [Tue, 8 Mar 2016 01:44:58 +0000 (17:44 -0800)]
Adjust test to let it pass on libhoudini.
When using libhoudini to run arm code on x86 platforms, we can't
assume the main thread allocates local variables at the stack
declared by kernel.
(cherry picked from commit
61e4d461e5c1c5108fdfe2a9f1edec6717e7461e)
Bug: http://b/
27815309
Change-Id: Ic714a8e633a0bb6e85b38ee0e01e3439d0a0cea5
Colin Cross [Thu, 24 Mar 2016 20:41:30 +0000 (13:41 -0700)]
Update Android.bp to match Android.mk
Change-Id: Ib5bbe66a398734b6db9a40d51f2849d1531853ef
Neil Fuller [Thu, 24 Mar 2016 15:29:23 +0000 (15:29 +0000)]
Revert "Update timezone data to 2016b"
am:
11c7930
* commit '
11c79304886155209fc2af9bd7b4096515588584':
Revert "Update timezone data to 2016b"
Neil Fuller [Thu, 24 Mar 2016 15:22:09 +0000 (15:22 +0000)]
Revert "Update timezone data to 2016b"
The bionic change merged down from upstream but the
external/icu one didn't.
A replacement change will be submitted along with one for
external/icu.
This reverts commit
7bcee86edcc8cb0f969c719fed9bc3bd04de142f.
Change-Id: I0dd28e02231e6ebba5b61131b22889a1268a0675
Elliott Hughes [Thu, 24 Mar 2016 03:39:02 +0000 (03:39 +0000)]
Merge "Remove the __USE_GNU guard from pthread_setname_np again."
am:
e725dc1
* commit '
e725dc164015d873b64639f0fee9ba5c30175f4c':
Remove the __USE_GNU guard from pthread_setname_np again.
Elliott Hughes [Thu, 24 Mar 2016 03:28:30 +0000 (03:28 +0000)]
Merge "Remove the __USE_GNU guard from pthread_setname_np again."
Elliott Hughes [Thu, 24 Mar 2016 03:26:35 +0000 (20:26 -0700)]
Remove the __USE_GNU guard from pthread_setname_np again.
Caused build breakage, but not spotted by TreeHugger:
external/libnfc-nxp/Linux_x86/phDal4Nfc.c:737:5: error: implicit declaration of function 'pthread_setname_np' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
pthread_setname_np(pthread_self(), "reader");
^
Nice file name.
Change-Id: I102e55718babf4e4f2f2c64066c6a83ed3ac86d3
Elliott Hughes [Thu, 24 Mar 2016 02:53:02 +0000 (02:53 +0000)]
Merge "Add pthread_getname_np."
am:
63322aa
* commit '
63322aa555d06bc961bfe419ba69471cdab2927b':
Add pthread_getname_np.
Elliott Hughes [Thu, 24 Mar 2016 02:47:10 +0000 (02:47 +0000)]
Merge "Add pthread_getname_np."
Elliott Hughes [Wed, 23 Mar 2016 18:20:47 +0000 (11:20 -0700)]
Add pthread_getname_np.
Also guard both these GNU extensions with _GNU_SOURCE.
Also improve the tests to test each case on both the current thread and
another thread, since the code paths are totally different.
Bug: http://b/
27810459
Change-Id: I72b05bca5c5b6ca8ba4585b8edfb716a1c252f92
Greg Hackmann [Thu, 24 Mar 2016 00:40:02 +0000 (00:40 +0000)]
Merge "genversion-scripts: fix script name in autogenerated comment"
am:
3c410c8
* commit '
3c410c855c902f3fe99b4bf24ea8af1b289f120f':
genversion-scripts: fix script name in autogenerated comment
Greg Hackmann [Thu, 24 Mar 2016 00:32:35 +0000 (00:32 +0000)]
Merge "genversion-scripts: fix script name in autogenerated comment"
Greg Hackmann [Thu, 3 Mar 2016 21:10:23 +0000 (13:10 -0800)]
genversion-scripts: fix script name in autogenerated comment
Change-Id: I2a304818cfc54d08a08d2e621e4cf74e7ce465dd
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Elliott Hughes [Wed, 23 Mar 2016 18:38:52 +0000 (18:38 +0000)]
Merge "Move relocation_packer off libnativehelper."
am:
506456c
* commit '
506456c5d1ba281cb01c224679fc86d7a4c99ade':
Move relocation_packer off libnativehelper.
Elliott Hughes [Wed, 23 Mar 2016 18:22:16 +0000 (18:22 +0000)]
Merge "Move relocation_packer off libnativehelper."