OSDN Git Service
Pierre Imai [Wed, 6 Apr 2016 03:55:56 +0000 (03:55 +0000)]
DO NOT MERGE: Fix off-by-one error in res_cache.c
am:
8b50d08
* commit '
8b50d08e826dacdd9422b7151121808307da3a10':
DO NOT MERGE: Fix off-by-one error in res_cache.c
Change-Id: I4b01a05a175d1129be084c876455eb618c1c30b5
Pierre Imai [Wed, 6 Apr 2016 03:55:56 +0000 (03:55 +0000)]
DO NOT MERGE: Ignore unreliable DNS servers.
am:
4d8e740 -s ours
* commit '
4d8e740b0868b2670599b949ff07d74e5f317114':
DO NOT MERGE: Ignore unreliable DNS servers.
Change-Id: Ia122996fcb689555bebf699317ccd1325ea02e47
Pierre Imai [Wed, 6 Apr 2016 03:11:10 +0000 (03:11 +0000)]
Merge "Reduce the amount of logging in Bionic\'s resolver." am:
a749dc9
am:
e5655a0
* commit '
e5655a0e14338ab6811879bb59f67046b8975393':
Reduce the amount of logging in Bionic's resolver.
Change-Id: Ie4bb5c777a070a614cddf44ac999ca1cdefc8434
Pierre Imai [Wed, 6 Apr 2016 03:07:43 +0000 (03:07 +0000)]
Merge "Reduce the amount of logging in Bionic\'s resolver."
am:
a749dc9
* commit '
a749dc91c51a9e6609701f0717d13ec324ddfb42':
Reduce the amount of logging in Bionic's resolver.
Change-Id: I35a98fa5168d5348c56ee91148859980c7a2d1ff
Pierre Imai [Wed, 6 Apr 2016 03:01:51 +0000 (03:01 +0000)]
Merge "Reduce the amount of logging in Bionic's resolver."
Pierre Imai [Wed, 6 Apr 2016 02:23:47 +0000 (11:23 +0900)]
Reduce the amount of logging in Bionic's resolver.
Change-Id: I250d9a352f1fa0cafef349d0e23f72a9dd8e399d
Pierre Imai [Tue, 5 Apr 2016 06:49:08 +0000 (15:49 +0900)]
DO NOT MERGE: Fix off-by-one error in res_cache.c
(cherry picked from commit
03844d8cdb43c351d2c94eb67242966019f7600d)
Change-Id: Ib5fff46ac9211716a1577ee25bb22461c489ea9f
Pierre Imai [Mon, 22 Feb 2016 08:50:41 +0000 (17:50 +0900)]
DO NOT MERGE: Ignore unreliable DNS servers.
Collect statistics about DNS query success state and delay. Ignore
servers that have been tried at least five times and have a success rate
of < 0.25. Retry these servers once every 180s.
Bug:
25731675
(cherry picked from commit
6b3f0d65f2c706625e5efb495df0f2c6178b965a)
Change-Id: Id989404b14fd885fb31a5a4de36a4186be1c9ad1
Dimitry Ivanov [Wed, 6 Apr 2016 00:53:01 +0000 (00:53 +0000)]
Merge "Do not test ifunc on mips" am:
c0e8b06
am:
c8704da
* commit '
c8704dae82cbe931a235a3e7ce8beb3498c4b067':
Do not test ifunc on mips
Change-Id: I9febc68d5ef2f98e0b58e884e4fe56e2a55cd3e7
Dimitry Ivanov [Wed, 6 Apr 2016 00:49:44 +0000 (00:49 +0000)]
Merge "Do not test ifunc on mips"
am:
c0e8b06
* commit '
c0e8b064678f5f6024c75817ca5afa4b6b85b8a4':
Do not test ifunc on mips
Change-Id: If8dbd8d2b23f1dc7d090631313ef25b865ef8c64
Dimitry Ivanov [Wed, 6 Apr 2016 00:38:23 +0000 (00:38 +0000)]
Merge "Do not test ifunc on mips"
Dimitry Ivanov [Wed, 6 Apr 2016 00:12:01 +0000 (17:12 -0700)]
Do not test ifunc on mips
This commit fixes mips build
Bug: http://b/
28009632
Change-Id: I5c657b31947791aea4cc02a2fc4ede6d0ecde851
Dimitry Ivanov [Wed, 6 Apr 2016 00:26:42 +0000 (00:26 +0000)]
Merge "linker: Add unit-test for sleb128_decoder" am:
66606ff
am:
b9601c6
* commit '
b9601c6ce5df37352de40996f8e46236a5096107':
linker: Add unit-test for sleb128_decoder
Change-Id: I0f6746b5ffcbf533bb2cb85e387118a31733e20d
Dimitry Ivanov [Wed, 6 Apr 2016 00:23:23 +0000 (00:23 +0000)]
Merge "linker: Add unit-test for sleb128_decoder"
am:
66606ff
* commit '
66606ff84c079e95c03a61cc8bcfb08261a5a173':
linker: Add unit-test for sleb128_decoder
Change-Id: I094144c42f405c0461a34746321cd9b5eaca44ab
Dimitry Ivanov [Wed, 6 Apr 2016 00:15:02 +0000 (00:15 +0000)]
Merge "linker: Add unit-test for sleb128_decoder"
Elliott Hughes [Tue, 5 Apr 2016 23:50:35 +0000 (23:50 +0000)]
Merge "Add sync_file_range to <fcntl.h>." am:
d9bba70
am:
33e7e46
* commit '
33e7e46a064a25de096955a38a4a347ea140c5a4':
Add sync_file_range to <fcntl.h>.
Change-Id: Ieb65cd8f40bcaaaab369e27eb0b17c09e64b8f39
Elliott Hughes [Tue, 5 Apr 2016 23:47:15 +0000 (23:47 +0000)]
Merge "Add sync_file_range to <fcntl.h>."
am:
d9bba70
* commit '
d9bba70c3d55a48eb75f3e41c2e0b92982bc7a59':
Add sync_file_range to <fcntl.h>.
Change-Id: I503b353efd1592138a2f786466c551c0246f2e47
Dimitry Ivanov [Tue, 5 Apr 2016 20:29:50 +0000 (13:29 -0700)]
linker: Add unit-test for sleb128_decoder
Add missing test for sleb128_decoder. Also remove
dependency to static library because it exposes malloc/free
which interfere with libc.so malloc/free causing test to crash.
Change-Id: Iedd3268011df9f67ed58c0b58c71f34e30370b23
Elliott Hughes [Tue, 5 Apr 2016 23:38:37 +0000 (23:38 +0000)]
Merge "Add sync_file_range to <fcntl.h>."
Elliott Hughes [Tue, 5 Apr 2016 18:56:03 +0000 (11:56 -0700)]
Add sync_file_range to <fcntl.h>.
Bug: http://b/
27952303
Change-Id: Idadfacd657ed415abc11684b9471e4e24c2fbf05
Elliott Hughes [Tue, 5 Apr 2016 19:00:28 +0000 (19:00 +0000)]
Merge "Add missing prototype for readahead in <fcntl.h>." am:
95ddb26
am:
f8a1007
* commit '
f8a100705d88af34e298a0ce2ffa4a37c7ec0650':
Add missing prototype for readahead in <fcntl.h>.
Change-Id: Icaf8aca9fb0aad594034e6de251c16ba5b4e9d4f
Elliott Hughes [Tue, 5 Apr 2016 18:57:19 +0000 (18:57 +0000)]
Merge "Add missing prototype for readahead in <fcntl.h>."
am:
95ddb26
* commit '
95ddb26256db734be7f7efc8cba3362bcececea9':
Add missing prototype for readahead in <fcntl.h>.
Change-Id: Ieafe88f439bde063a4186db85b51ec2372d6e3bd
Elliott Hughes [Tue, 5 Apr 2016 18:50:09 +0000 (18:50 +0000)]
Merge "Add missing prototype for readahead in <fcntl.h>."
Elliott Hughes [Tue, 5 Apr 2016 18:20:36 +0000 (18:20 +0000)]
Merge "Add POSIX getsubopt(3)." am:
c9291e1
am:
3d61030
* commit '
3d61030c34233e53ef2953d6d91aa88c38bccf8d':
Add POSIX getsubopt(3).
Change-Id: I810b5b8cd180970f04f2c3a63f6d677dcfa48850
Elliott Hughes [Tue, 5 Apr 2016 18:16:46 +0000 (18:16 +0000)]
Merge "Add POSIX getsubopt(3)."
am:
c9291e1
* commit '
c9291e1bb51a9bf9fb64e382a094dc205de4287d':
Add POSIX getsubopt(3).
Change-Id: Ifb02761bd1cef986689ad16b7bee4e3727b3e13a
Elliott Hughes [Tue, 5 Apr 2016 18:06:02 +0000 (11:06 -0700)]
Add missing prototype for readahead in <fcntl.h>.
Change-Id: Icfe85e9cf95c657b495c4e9cd10dec50b0b8f6db
Elliott Hughes [Tue, 5 Apr 2016 18:03:56 +0000 (18:03 +0000)]
Merge "Add POSIX getsubopt(3)."
Elliott Hughes [Tue, 5 Apr 2016 17:09:41 +0000 (17:09 +0000)]
Merge "Add SysV signal handling" am:
7897405
am:
bf75783
* commit '
bf757837671d2fcf04aad18013bcf1076ab06db9':
Add SysV signal handling
Change-Id: Ib042cf75f9af841f715c01cd35fc8b40a2ea101e
Greg Hackmann [Tue, 5 Apr 2016 17:06:40 +0000 (17:06 +0000)]
Merge "Add SysV signal handling"
am:
7897405
* commit '
7897405439630d59b8f2c9fc51239c44bac4fe9e':
Add SysV signal handling
Change-Id: Icd3c4e139022857fa494e35bf670ca1d0cfeefc5
Elliott Hughes [Tue, 5 Apr 2016 17:01:23 +0000 (17:01 +0000)]
Merge "Add SysV signal handling"
Pierre Imai [Tue, 5 Apr 2016 07:45:12 +0000 (07:45 +0000)]
Merge "Fix off-by-one error in res_cache.c" am:
14fc307
am:
55e251d
* commit '
55e251d28332cd1c56d59a826efd28fdf0c9c9de':
Fix off-by-one error in res_cache.c
Change-Id: I157e3e833ea2cee160e24fdf4b84313377abb12c
Pierre Imai [Tue, 5 Apr 2016 07:42:39 +0000 (07:42 +0000)]
Merge "Fix off-by-one error in res_cache.c"
am:
14fc307
* commit '
14fc307518d231933fde018992f1f063ff53d505':
Fix off-by-one error in res_cache.c
Change-Id: I83a65a3dbf558970302363e695dfbe5884684e45
Pierre Imai [Tue, 5 Apr 2016 07:35:46 +0000 (07:35 +0000)]
Merge "Fix off-by-one error in res_cache.c"
Pierre Imai [Tue, 5 Apr 2016 06:49:08 +0000 (15:49 +0900)]
Fix off-by-one error in res_cache.c
Change-Id: I58264902c123b3bc0d392d17837aa537ca0a3ca2
Pierre Imai [Tue, 5 Apr 2016 03:53:16 +0000 (03:53 +0000)]
Merge "Ignore unreliable DNS servers." am:
ce3101f
am:
665e73a
* commit '
665e73a66dbbed8f9244753c3f1f2a765e137a42':
Ignore unreliable DNS servers.
Change-Id: Iab9e14efb5c2e9157fbf9c9c2295b89ed676bb15
Pierre Imai [Tue, 5 Apr 2016 03:50:27 +0000 (03:50 +0000)]
Merge "Ignore unreliable DNS servers."
am:
ce3101f
* commit '
ce3101f021779446e5bcfa04031850bada7f3ef1':
Ignore unreliable DNS servers.
Change-Id: I538bca6cbca3d652584aa7a9d19e8e6ddd6eddeb
Pierre Imai [Tue, 5 Apr 2016 03:44:35 +0000 (03:44 +0000)]
Merge "Ignore unreliable DNS servers."
Pierre Imai [Mon, 22 Feb 2016 08:50:41 +0000 (17:50 +0900)]
Ignore unreliable DNS servers.
Collect statistics about DNS query success state and delay. Ignore
servers that have been tried at least five times and have a success rate
of < 0.25. Retry these servers once every 180s.
Bug:
25731675
Change-Id: I78e24f43e388dca82fb81835e1796f4c7dce8da3
Elliott Hughes [Tue, 5 Apr 2016 00:46:37 +0000 (00:46 +0000)]
Merge "Make it harder to use a broken legacy function by accident." am:
5b528c0
am:
fefdbf5
* commit '
fefdbf51ccd5292fe521e3b1b6f3ae3306455bfe':
Make it harder to use a broken legacy function by accident.
Change-Id: I0c2d8e8ad877a743919dcd1fb7c502a183feb25f
Elliott Hughes [Tue, 5 Apr 2016 00:44:02 +0000 (00:44 +0000)]
Merge "Make it harder to use a broken legacy function by accident."
am:
5b528c0
* commit '
5b528c08320937ac3685955693c55fb71cb82223':
Make it harder to use a broken legacy function by accident.
Change-Id: Iff4a13591e5f8d829fd59cef2dbc5bcacef54747
Elliott Hughes [Tue, 5 Apr 2016 00:36:08 +0000 (00:36 +0000)]
Merge "Make it harder to use a broken legacy function by accident."
Elliott Hughes [Tue, 5 Apr 2016 00:34:04 +0000 (17:34 -0700)]
Add POSIX getsubopt(3).
Bug: http://b/
27952303
Change-Id: I8a816477545dadcbd5c055714e76263574446b6f
Yabin Cui [Tue, 5 Apr 2016 00:20:12 +0000 (00:20 +0000)]
Merge "Format code to calculate thread stack and signal stack." am:
9a30714
am:
8c26e41
* commit '
8c26e4178349ce1c3e43971fb2bd8938aa1d3951':
Format code to calculate thread stack and signal stack.
Change-Id: Ib32177466a2da5c61863ce110fc3aa6774c3f3e1
Yabin Cui [Tue, 5 Apr 2016 00:17:36 +0000 (00:17 +0000)]
Merge "Format code to calculate thread stack and signal stack."
am:
9a30714
* commit '
9a30714c87aa1a3dfc632e367ae60b24ee897ce6':
Format code to calculate thread stack and signal stack.
Change-Id: I40f08d5f3e98d7cad800bb5e70d47b3e69343ecc
Yabin Cui [Tue, 5 Apr 2016 00:08:05 +0000 (00:08 +0000)]
Merge "Format code to calculate thread stack and signal stack."
Greg Hackmann [Mon, 29 Feb 2016 20:35:33 +0000 (12:35 -0800)]
Add SysV signal handling
Implement the legacy SysV signal handling functions sighold(),
sigignore(), sigpause(), sigrelse(), and sigset() in terms of the newer
POSIX signal APIs. As of POSIX 2013 the SysV signal APIs are deprecated
but still required.
Change-Id: I4ca40e3d706605a7d1a30dc76c78b2b24586387d
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Yabin Cui [Thu, 31 Mar 2016 00:48:50 +0000 (17:48 -0700)]
Format code to calculate thread stack and signal stack.
The code to calculate thread stack and signal stack looks weird:
the thread stack size and signal stack size are related with
each other on 32-bit mode, but not on 64-bit mode. So change the
code to make the logic more resonable. This doesn't change anything
as we have defined SIGSTKSZ to 16K on arm64.
Bug:
28005110
Change-Id: I04d2488cfb96ee7e2d894d062c66cef950fec418
Elliott Hughes [Mon, 4 Apr 2016 23:15:37 +0000 (16:15 -0700)]
Make it harder to use a broken legacy function by accident.
This function only exists for backwards compatibility, so leave it as it was.
Bug: http://b/
26944282
Change-Id: I31973d1402660933103ee2d815649ab9569e4dfc
Dan Willemsen [Mon, 4 Apr 2016 21:26:14 +0000 (21:26 +0000)]
Merge "Update Android.bp with recent Android.mk changes" am:
2678c90
am:
2e36945
* commit '
2e3694533a13525e5ce62f81698452db57c1c4ee':
Update Android.bp with recent Android.mk changes
Change-Id: I0ce29af51a95db177ac61f1008b33fb4607a2bda
Dan Willemsen [Mon, 4 Apr 2016 21:23:47 +0000 (21:23 +0000)]
Merge "Update Android.bp with recent Android.mk changes"
am:
2678c90
* commit '
2678c90f7d98a962badfe4bb736a26fb21485c7e':
Update Android.bp with recent Android.mk changes
Change-Id: I79f196a1c97e80479a58b876a33c7e1ecc7b3b4d
Dan Willemsen [Mon, 4 Apr 2016 21:14:01 +0000 (21:14 +0000)]
Merge "Update Android.bp with recent Android.mk changes"
Dimitry Ivanov [Mon, 4 Apr 2016 20:40:38 +0000 (20:40 +0000)]
Merge "Enable ifunc test for arm" am:
04c7d3d
am:
bf0ccea
* commit '
bf0cceaa66a81f4099ece9a8a49a5c3c5eb1da8c':
Enable ifunc test for arm
Change-Id: If3f8a5224f59015817f3ea180ec659da5c07cc8c
Dimitry Ivanov [Mon, 4 Apr 2016 20:38:11 +0000 (20:38 +0000)]
Merge "Enable ifunc test for arm"
am:
04c7d3d
* commit '
04c7d3d257abb7ef2a0298700677858c9d0938c3':
Enable ifunc test for arm
Change-Id: Ibae9af6dab65a5f72810508e9f6f7279f716835a
Dimitry Ivanov [Mon, 4 Apr 2016 20:25:21 +0000 (20:25 +0000)]
Merge "Enable ifunc test for arm"
Dan Willemsen [Mon, 4 Apr 2016 20:18:46 +0000 (13:18 -0700)]
Update Android.bp with recent Android.mk changes
This ports Idb3d445e053c44180773f59774df19b324f6817f to Android.bp
Change-Id: Id5cdb450330792810b8eb61b3cab115ef046e55d
Elliott Hughes [Mon, 4 Apr 2016 19:54:51 +0000 (19:54 +0000)]
Merge "Remove a workaround from stack_protector_test that\'s not needed in " am:
e5f7938
am:
fb48ef0
* commit '
fb48ef0183ad320a3726e72f6d6a0f6b3c939274':
Remove a workaround from stack_protector_test that's not needed in master.
Change-Id: Ia4f380ddb548f6648ce161c0edd6c4bc6339e407
Elliott Hughes [Mon, 4 Apr 2016 19:52:26 +0000 (19:52 +0000)]
Merge "Remove a workaround from stack_protector_test that\'s not needed in "
am:
e5f7938
* commit '
e5f79381db04d925a60116910626114965d934dc':
Remove a workaround from stack_protector_test that's not needed in master.
Change-Id: I3c18d0152fe1e9823825f2475b7f9c7f78a06abe
Elliott Hughes [Mon, 4 Apr 2016 19:46:18 +0000 (19:46 +0000)]
Merge "Remove a workaround from stack_protector_test that's not needed in "
Elliott Hughes [Mon, 4 Apr 2016 18:53:21 +0000 (18:53 +0000)]
Merge "Move math headers in with the other headers." am:
6b19f35
am:
e87420e
* commit '
e87420e6414a385eabfd4c0d448a91a7385329ec':
Move math headers in with the other headers.
Change-Id: I2b2406be597b63ca2ab3d835c708a11f9cbd3eb0
Elliott Hughes [Mon, 4 Apr 2016 18:50:27 +0000 (18:50 +0000)]
Merge "Move math headers in with the other headers."
am:
6b19f35
* commit '
6b19f35f6849259cdb0f8002e903cc7ac0d07db7':
Move math headers in with the other headers.
Change-Id: I757a247c348f6ae0aad5b0dc414ed082c1571834
Elliott Hughes [Mon, 4 Apr 2016 18:41:05 +0000 (18:41 +0000)]
Merge "Move math headers in with the other headers."
Dimitry Ivanov [Wed, 30 Mar 2016 23:44:48 +0000 (16:44 -0700)]
Enable ifunc test for arm
Bug: http://b/
27930475
Change-Id: I1f9e7c5b9ffabfd77ae6ebd534938aef39ec7987
Goran Jakovljevic [Mon, 4 Apr 2016 16:59:15 +0000 (16:59 +0000)]
Merge "Revert "[MIPS] Link .dex or .oat code lacking .MIPS.abiflags segment"" am:
d15837a
am:
827ad2d
* commit '
827ad2df6d4a7b132490a77b717e5e92f306776f':
Revert "[MIPS] Link .dex or .oat code lacking .MIPS.abiflags segment"
Change-Id: I8593dca64abfd68c924194b837c18e4b83e5e9f2
Goran Jakovljevic [Mon, 4 Apr 2016 16:55:45 +0000 (16:55 +0000)]
Merge "Revert "[MIPS] Link .dex or .oat code lacking .MIPS.abiflags segment""
am:
d15837a
* commit '
d15837a3b20ac2151481323d6d06e8c0355d3757':
Revert "[MIPS] Link .dex or .oat code lacking .MIPS.abiflags segment"
Change-Id: I990db33100dfb2b5f68777f5ebfa37a70da9c7b7
Dimitry Ivanov [Mon, 4 Apr 2016 16:49:21 +0000 (16:49 +0000)]
Merge "Revert "[MIPS] Link .dex or .oat code lacking .MIPS.abiflags segment""
Daniel Micay [Sun, 3 Apr 2016 16:28:47 +0000 (16:28 +0000)]
Merge "tests: allow brk to fail with ENOMEM" am:
a30c44a
am:
d05971c
* commit '
d05971c50f07e4500661f7d9d384af6b6572bbaa':
tests: allow brk to fail with ENOMEM
Change-Id: Ibd51cac95f3ca32749fe9a95284ea6ff6bfb5642
Daniel Micay [Sun, 3 Apr 2016 16:25:51 +0000 (16:25 +0000)]
Merge "tests: allow brk to fail with ENOMEM"
am:
a30c44a
* commit '
a30c44a3e38d1f743b07306d97cb1e759ee1935e':
tests: allow brk to fail with ENOMEM
Change-Id: I4b528b80246104196c0ca7ae9c36f9ade060558a
Nick Kralevich [Sun, 3 Apr 2016 16:20:25 +0000 (16:20 +0000)]
Merge "tests: allow brk to fail with ENOMEM"
Daniel Micay [Thu, 31 Dec 2015 13:04:53 +0000 (08:04 -0500)]
tests: allow brk to fail with ENOMEM
Any caller of brk needs to handle failure by falling back to mmap as
there's no guarantee that other mappings are not placed above the brk
heap. Since jemalloc starts with mmap in the first place and dlmalloc
knows how to fall back to mmap, it's already a legacy API in Android.
Forcing it to succeed rules out stronger ASLR implementations where the
brk heap might not have any room to grow. It's also valid for the brk
implementation to simply return -1 with errno set to ENOMEM in every
case and that's a good way of finding anything relying on it. It would
make sense for it to be an optional kernel feature.
The brk heap is also not guaranteed to be initially page aligned. PaX
ASLR randomizes the internal bits. It was only mentioned in a comment to
explain the design of the test though.
Bug:
24233096
Change-Id: I16e9bc8677e796c73915b830b99b0ce39c02b31d
Elliott Hughes [Sat, 2 Apr 2016 15:36:33 +0000 (08:36 -0700)]
Move math headers in with the other headers.
Keeping them separate is a pain for the NDK, and doesn't help the platform.
Change-Id: I96b8beef307d4a956e9c0a899ad9315adc502582
Elliott Hughes [Sat, 2 Apr 2016 04:18:20 +0000 (04:18 +0000)]
Merge "Fix the stack-protector test for x86/x86-64." am:
2152a8c
am:
7892c53
* commit '
7892c535af193f868539b95293c40cbe7c7681f6':
Fix the stack-protector test for x86/x86-64.
Change-Id: I53c54ee8fe772d909bf2004b030af94d52f15d73
Elliott Hughes [Sat, 2 Apr 2016 04:13:31 +0000 (04:13 +0000)]
Merge "Fix the stack-protector test for x86/x86-64."
am:
2152a8c
* commit '
2152a8ca3550ff0c9c998bfd4d6ab741758063ec':
Fix the stack-protector test for x86/x86-64.
Change-Id: I0b965e4cf183a026483cddb67ff5fa327516010c
Elliott Hughes [Sat, 2 Apr 2016 04:02:25 +0000 (21:02 -0700)]
Remove a workaround from stack_protector_test that's not needed in
The compiler in master doesn't leave a gap between the buffer and the stack
guard canary.
Bug: http://b/
27815668
Change-Id: Iae6681683881055c2719d661a2179f5305c23135
Elliott Hughes [Sat, 2 Apr 2016 04:01:54 +0000 (04:01 +0000)]
Merge "Fix the stack-protector test for x86/x86-64."
Elliott Hughes [Fri, 1 Apr 2016 21:51:10 +0000 (14:51 -0700)]
Fix the stack-protector test for x86/x86-64.
Built for fugu this was working fine, but built for generic x86/x86-64
the compiler was (a) optimizing out all the stack writes and (b) inserting
enough padding on x86-64 for the canary to be safely out of the way.
While here, let's tighten up this test so we test that it's sufficient to
only overwrite the buffer by one byte...
(cherry-pick of
6f90c1ac59eb4e7811b7b0e408615049c935c0a9.)
Bug: http://b/
27815668
Change-Id: I80a646de4b30fd5c78df20fdaa7e3eb163585caf
Elliott Hughes [Sat, 2 Apr 2016 02:23:55 +0000 (02:23 +0000)]
Fix the stack-protector test for x86/x86-64.
am:
6f90c1a
* commit '
6f90c1ac59eb4e7811b7b0e408615049c935c0a9':
Fix the stack-protector test for x86/x86-64.
Change-Id: If14fb81849b3bc05a72a3f3abd0ffb4b1bcefc1c
Elliott Hughes [Fri, 1 Apr 2016 21:51:10 +0000 (14:51 -0700)]
Fix the stack-protector test for x86/x86-64.
Built for fugu this was working fine, but built for generic x86/x86-64
the compiler was (a) optimizing out all the stack writes and (b) inserting
enough padding on x86-64 for the canary to be safely out of the way.
While here, let's tighten up this test so we test that it's sufficient to
only overwrite the buffer by one byte...
Bug: http://b/
27815668
Change-Id: I80a646de4b30fd5c78df20fdaa7e3eb163585caf
Elliott Hughes [Fri, 1 Apr 2016 21:05:42 +0000 (14:05 -0700)]
resolve merge conflicts of
38b88a4 to nyc-dev-plus-aosp
Change-Id: I5257d0e03723d7a89f7efbe7134ae35a917bfece
Elliott Hughes [Fri, 1 Apr 2016 20:50:11 +0000 (20:50 +0000)]
Merge "Ensure only mips is using GCC to build bionic." am:
1e89584
am:
5411c4f
* commit '
5411c4f3c1dbe481bdc1ea39edf42c4471d04f7b':
Ensure only mips is using GCC to build bionic.
Change-Id: I8b53f619ea7451d29384399efa477b554c08eb86
Elliott Hughes [Fri, 1 Apr 2016 20:45:22 +0000 (20:45 +0000)]
Merge "Ensure only mips is using GCC to build bionic."
am:
1e89584
* commit '
1e8958448a94753dec9c070ef011628c0b230d98':
Ensure only mips is using GCC to build bionic.
Change-Id: If1873f46cbbe3fbc39488dbdbb94fa3f13357af0
Elliott Hughes [Fri, 1 Apr 2016 20:30:11 +0000 (20:30 +0000)]
Merge "Ensure only mips is using GCC to build bionic."
Yabin Cui [Fri, 1 Apr 2016 18:14:03 +0000 (18:14 +0000)]
Merge "Check current pid at libc initialization for 32-bit build." am:
af39abd
am:
384ccaa
* commit '
384ccaad47284b0736e8a36de3cda3eea45fdca3':
Check current pid at libc initialization for 32-bit build.
Change-Id: Ic2bfa6384444bc855be4c08404f95152839b7eee
Yabin Cui [Fri, 1 Apr 2016 18:09:35 +0000 (18:09 +0000)]
Merge "Check current pid at libc initialization for 32-bit build."
am:
af39abd
* commit '
af39abdef53062c9bbc246371ac49ef5412eeb80':
Check current pid at libc initialization for 32-bit build.
Change-Id: Ib9b032752a88ad58f8f82dc91185e4cf1167e37c
Yabin Cui [Fri, 1 Apr 2016 17:56:33 +0000 (17:56 +0000)]
Merge "Check current pid at libc initialization for 32-bit build."
Elliott Hughes [Fri, 1 Apr 2016 17:54:27 +0000 (10:54 -0700)]
Ensure only mips is using GCC to build bionic.
MIPS still have ld128 and 16-bit atomics issues with clang, so we can't
just remove this yet.
Bug: http://b/
25291096
Change-Id: I2645ebf3af04e1a4008d70da780c04240e3d7a85
Elliott Hughes [Fri, 1 Apr 2016 17:37:38 +0000 (17:37 +0000)]
Merge "Tell GCC that sometimes we have to build deprecated functions." am:
538bdf9
am:
0069b9b
* commit '
0069b9b82b6afde8fb44a22ed099ac3ef5e60c88':
Tell GCC that sometimes we have to build deprecated functions.
Change-Id: I9f8811f43a64883a4df3120abf2476e109c448d2
Elliott Hughes [Fri, 1 Apr 2016 17:32:47 +0000 (17:32 +0000)]
Merge "Tell GCC that sometimes we have to build deprecated functions."
am:
538bdf9
* commit '
538bdf96231d05ff36f67cad4f3daba1087523e1':
Tell GCC that sometimes we have to build deprecated functions.
Change-Id: Ic810be7db6cb92376b3100246eff9180c2cafc74
Elliott Hughes [Fri, 1 Apr 2016 17:26:53 +0000 (17:26 +0000)]
Merge "Tell GCC that sometimes we have to build deprecated functions."
Elliott Hughes [Fri, 1 Apr 2016 17:25:19 +0000 (10:25 -0700)]
Tell GCC that sometimes we have to build deprecated functions.
We're the C library. Nothing could be more deprecated.
bionic/libc/bionic/pthread_cond.cpp:243:10: error: 'int pthread_cond_timedwait_relative_np(pthread_cond_t*, pthread_mutex_t*, const timespec*)' is deprecated (declared at bionic/libc/bionic/pthread_cond.cpp:227): use pthread_cond_timedwait instead [-Werror=deprecated-declarations]
return pthread_cond_timedwait_relative_np(cond_interface, mutex, &ts);
^
bionic/libc/bionic/pthread_cond.cpp:243:71: error: 'int pthread_cond_timedwait_relative_np(pthread_cond_t*, pthread_mutex_t*, const timespec*)' is deprecated (declared at bionic/libc/bionic/pthread_cond.cpp:227): use pthread_cond_timedwait instead [-Werror=deprecated-declarations]
return pthread_cond_timedwait_relative_np(cond_interface, mutex, &ts);
^
Change-Id: Idb3d445e053c44180773f59774df19b324f6817f
Elliott Hughes [Fri, 1 Apr 2016 17:14:57 +0000 (17:14 +0000)]
Merge "Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE." am:
e9daecf
am:
afc5767
* commit '
afc5767acad3c9f2b2a959cd663597127820dbf6':
Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE.
Change-Id: I4e4e82884794f629bddc03676d450a68a6ff31eb
Elliott Hughes [Fri, 1 Apr 2016 17:10:54 +0000 (10:10 -0700)]
Use consistent quoting in linker messages.
Using single quotes can be more convenient -- because there's no need to
escape -- but the vast majority of existing quoting was done with double
quotes, so move in that direction.
Bug: http://b/
27524191
Change-Id: I8f58593120e4c8aeaec45e16fc0178e9c162454d
Elliott Hughes [Fri, 1 Apr 2016 16:57:17 +0000 (16:57 +0000)]
Merge "Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE."
am:
e9daecf
* commit '
e9daecf74b276c780d65ded0c340193691dc69e5':
Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE.
Change-Id: I71bbe3770a0488c1590813f61dd9aea31ccfa400
Elliott Hughes [Fri, 1 Apr 2016 16:43:42 +0000 (16:43 +0000)]
Merge "Stop defining HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE."
Elliott Hughes [Fri, 1 Apr 2016 02:23:19 +0000 (02:23 +0000)]
Merge "Differentiate the MNTTYPE_* and MNTOPT_* constants." am:
4e764a0
am:
4b0c68f
* commit '
4b0c68f8cc773fe0e215cf72d24de7b6e2f4c132':
Differentiate the MNTTYPE_* and MNTOPT_* constants.
Change-Id: I028d429d48f2cc60e57eaac92a716996e130b724
Elliott Hughes [Fri, 1 Apr 2016 02:19:11 +0000 (02:19 +0000)]
Merge "Differentiate the MNTTYPE_* and MNTOPT_* constants."
am:
4e764a0
* commit '
4e764a0f98be37b32bd6b92967e54124e6aeb150':
Differentiate the MNTTYPE_* and MNTOPT_* constants.
Change-Id: I1b807c6afad1d6fd282fbbbe96a3be07d09839c6
Elliott Hughes [Fri, 1 Apr 2016 02:11:49 +0000 (02:11 +0000)]
Merge "Differentiate the MNTTYPE_* and MNTOPT_* constants."
Elliott Hughes [Fri, 1 Apr 2016 01:26:04 +0000 (01:26 +0000)]
Merge "Add a few missing types and constants to headers." am:
a30e19d
am:
c4991fa
* commit '
c4991fabb26b16c5759f803de6ed124b2f4f9310':
Add a few missing types and constants to headers.
Change-Id: I4b1e5bfcb37beb58ceb531abda2064b3039aa168
Elliott Hughes [Fri, 1 Apr 2016 01:21:36 +0000 (01:21 +0000)]
Merge "Add a few missing types and constants to headers."
am:
a30e19d
* commit '
a30e19da564deda466e3fe79784f51d2fc6adb51':
Add a few missing types and constants to headers.
Change-Id: Ib6d78642e8a28482eac2acb656fb8e996a57307c
Elliott Hughes [Fri, 1 Apr 2016 01:20:01 +0000 (18:20 -0700)]
Differentiate the MNTTYPE_* and MNTOPT_* constants.
Bug: http://b/
27952303
Change-Id: I926593c16143f76b21a65af7f6e1979d0fb44cac
Elliott Hughes [Fri, 1 Apr 2016 01:14:23 +0000 (01:14 +0000)]
Merge "Add a few missing types and constants to headers."