Dan Albert
46c7bc83ab
Merge "Don't re-export libunwind_llvm."
2015-08-27 22:20:51 +00:00
Elliott Hughes
adf5c7237d
Fix regoff_t for LP32 and _FILE_OFFSET_BITS=64.
...
bionic is built without _FILE_OFFSET_BITS=64, so internally regoff_t
was 32-bit on LP32, but code compiled with _FILE_OFFSET_BITS would
expect rm_so and rm_eo in struct regmatch_t to be 64-bit, leading to
confusion.
Bug: http://b/23566443
Change-Id: Iae92fa545104068e4f64ce1977f5ec616859638c
2015-08-27 14:48:32 -07:00
Chih-hung Hsieh
4afb130399
am e7a09ff7
: am bfaee4bd
: Merge "Add test cases for __emutls_get_address."
...
* commit 'e7a09ff7d99740c5e74308abc1e209522811b814':
Add test cases for __emutls_get_address.
2015-08-27 12:40:33 +00:00
Elliott Hughes
a0d1cda1a6
am c6effb3a
: am 848808c6
: Merge "Add preadv/pwritev."
...
* commit 'c6effb3af6f27c1acfbc2f776bb516e5f4d24476':
Add preadv/pwritev.
2015-08-27 12:40:32 +00:00
Chih-hung Hsieh
e7a09ff7d9
am bfaee4bd
: Merge "Add test cases for __emutls_get_address."
...
* commit 'bfaee4bd6ad901a699df21fd44d95f34e2e7444d':
Add test cases for __emutls_get_address.
2015-08-27 05:22:56 +00:00
Elliott Hughes
c6effb3af6
am 848808c6
: Merge "Add preadv/pwritev."
...
* commit '848808c660ec4811f4ff5a2748b6f754b008cd21':
Add preadv/pwritev.
2015-08-27 05:22:55 +00:00
Christopher Ferris
ed90d4caea
am 1154bcb3
: (-s ours) am d518a6d3
: Merge "Fix the 16 bit/32 bit instruction check for arm."
...
* commit '1154bcb3c095606fcaa5e836e935cb3406f6703d':
2015-08-27 05:06:25 +00:00
Elliott Hughes
a56db54d1d
am 03deb828
: (-s ours) am 629ed517
: Merge "Add strchrnul."
...
* commit '03deb8287b019e9d526b193a0b7fa5e3fa6e8f77':
2015-08-27 05:06:24 +00:00
Elliott Hughes
83c7b596e4
am 5f55f32e
: (-s ours) am 4d5c4f08
: Merge "Add the missing aarch64 user structs."
...
* commit '5f55f32e49c804b21a66b7656297e8a426660afe':
2015-08-27 05:06:24 +00:00
Neil Fuller
268344457e
am 1c751e5e
: (-s ours) am 82911942
: Update timezone data to 2015f
...
* commit '1c751e5ec76085aced87d50757495083a0f46a73':
2015-08-27 05:06:23 +00:00
Neil Fuller
b455457761
am 58cf5d6b
: (-s ours) am 53f2abb5
: Merge "Update timezone data to 2015f"
...
* commit '58cf5d6b1daf54b50c7864df563227787cb91375':
2015-08-27 05:06:22 +00:00
Neil Fuller
356868f8ac
am 7336be05
: (-s ours) am f7286a26
: Merge "Move tzdata scripts from bionic to external/icu"
...
* commit '7336be059850edf23ad51f16520a9a08eff7cfe5':
2015-08-27 05:06:21 +00:00
Elliott Hughes
11a740e879
am 0ed97d1b
: (-s ours) am 5bf79420
: Merge "Revert "Revert "Use compiler builtins for fabs."""
...
* commit '0ed97d1b5fc136226d1ab62a2aa982ee5d99cabd':
2015-08-27 05:06:20 +00:00
Elliott Hughes
82f20c916e
am 1a265558
: (-s ours) am c868b4c3
: Merge "Revert "Use compiler builtins for fabs.""
...
* commit '1a26555846f49a9f7d15772ab014e01cac7a6f5b':
2015-08-27 05:06:18 +00:00
Josh Gao
d32cadd1a5
am ebcaf389
: (-s ours) am 0f8f9300
: Merge "Add exported __popcount_tab for libgcc compat under compiler-rt."
...
* commit 'ebcaf389cdcb1d18622c500a6c7021259171dd39':
2015-08-27 05:06:17 +00:00
Josh Gao
b8c276b778
am df4492f3
: (-s ours) am fad8370c
: Merge "Improve .clang-format."
...
* commit 'df4492f339662ae1468bce3ee33270142227146c':
2015-08-27 05:06:16 +00:00
Elliott Hughes
756574d53e
am 51b0bf03
: (-s ours) am a19a9348
: Merge "Use compiler builtins for fabs."
...
* commit '51b0bf03c074aa36f100a3d4d688f9b1687d3300':
2015-08-27 05:06:15 +00:00
Dan Albert
4ca3de4502
am 8c6b0d16
: (-s ours) am a80ae8b8
: Merge "Add a .clang-format file."
...
* commit '8c6b0d164e0d7a1a3ae4a2497e3bb9d5ae208a02':
2015-08-27 05:06:14 +00:00
Nick Kralevich
437c3e48f9
am f94b491c
: (-s ours) am 4d7d05bd
: Merge "Revert "fix incompatibility with -fstack-protector-strong""
...
* commit 'f94b491c2b9f8f01038af73863b6ba3945f70d0b':
2015-08-27 05:06:13 +00:00
Nick Kralevich
40773fb797
am abd1975d
: (-s ours) am 5f7a5125
: Merge "fix incompatibility with -fstack-protector-strong"
...
* commit 'abd1975dcc814087afb1fe262b5f2ce389fb4ff9':
2015-08-27 05:06:12 +00:00
Yabin Cui
3aa60b82ef
am 65248069
: (-s ours) am 62c26ed9
: Merge "add fortified implementations of write/pwrite{,64}"
...
* commit '652480695172d90209e5163e92180a3952fba29a':
2015-08-27 05:06:10 +00:00
Elliott Hughes
806055dace
am 9835b61d
: (-s ours) am 49715dcc
: Merge "Fix a mistype in segment overrange checking"
...
* commit '9835b61d636720712f79e49a5672518ead4753f9':
2015-08-27 05:06:09 +00:00
Christopher Ferris
f962a1848e
am 55cd7b0b
: (-s ours) am 079fc833
: Merge "Modify ip to get the instr being executed."
...
* commit '55cd7b0b761ffb62ea522204fb2b0567862e920d':
2015-08-27 05:06:08 +00:00
Dan Albert
91aeb800d6
am af86eeec
: (-s ours) am df0891ad
: Merge "Add a TLS slot for TSAN."
...
* commit 'af86eeecc90442530ae6fa6f99188913c0198281':
2015-08-27 05:06:07 +00:00
Christopher Ferris
393e69d77e
am 888ad399
: (-s ours) am e4d51cf3
: Merge "Add optimized cortex-a7/cortex-a53 memset/memcpy."
...
* commit '888ad399ee0b4da90d745fb9b45e89aec18bd8e1':
2015-08-27 05:06:06 +00:00
Elliott Hughes
a849fe6e2e
am 37763e7a
: (-s ours) am 4a8c4ce4
: Merge "libc: remove bcopy from memmove on 64-bit architectures"
...
* commit '37763e7a7a3fc4b045d8a330306d652991bfed62':
2015-08-27 05:06:04 +00:00
Ying Wang
8abc375ec9
am e46c4212
: (-s ours) am 85197af9
: Merge "Don\'t attach linker_asan to linker in module definition."
...
* commit 'e46c4212d6478975dbbb7f7105ad05c2cdb07d7b':
2015-08-27 05:06:03 +00:00
Elliott Hughes
f92664cbe5
am 3034028d
: (-s ours) am 6816d8cc
: Merge "Use __builtin_* in <math.h>."
...
* commit '3034028d7a1f93e46e212061efe7b57fe8758107':
2015-08-27 05:06:01 +00:00
Elliott Hughes
b635c4ebb2
am 0ff5dda1
: (-s ours) am dd8adc35
: Merge "libm: ARM: reorganize a bit to match ARM64"
...
* commit '0ff5dda1020c4da9c4d21d8d3d4ad9ba15848441':
2015-08-27 05:06:00 +00:00
Elliott Hughes
ec6a557b38
am 1789ac90
: (-s ours) am b4f2112f
: Merge "[MIPS] Invalidate cached pid in vfork."
...
* commit '1789ac90f7ca94c161958640297b6b4aafa152fd':
2015-08-27 05:05:58 +00:00
Dan Albert
79697a7096
am 9423fb23
: (-s ours) am f2985ed8
: Merge "Fix test steps for 64-bit bionic"
...
* commit '9423fb23757a0d6d4f112a3f231717896444207b':
2015-08-27 05:05:57 +00:00
Dan Albert
8cc0d89a9d
am 34afc42a
: (-s ours) am 2b934924
: Merge "Add missing include."
...
* commit '34afc42ae749c9cd7ce660ef6ab0c50bdbb41497':
2015-08-27 05:05:53 +00:00
Yabin Cui
0bbda9838b
am 2bcb25c1
: (-s ours) am 0660be89
: am a6a12a78
: am 0fdcdd00
: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev
...
* commit '2bcb25c1c3153a28229bffcdd4d289ac72b987cc':
2015-08-27 05:05:46 +00:00
Dan Albert
3ce99a04a9
am ee8576d1
: (-s ours) am a3c01467
: Merge "Move up to C++14."
...
* commit 'ee8576d11413c7b9d42f466fb378921b4cdb01f3':
2015-08-27 05:05:44 +00:00
Yabin Cui
7b02991de7
am c23143a5
: (-s ours) am ff4afc13
: Merge "Omit comment when reading --gtest_list_tests option\'s output."
...
* commit 'c23143a5fdd32a1cc0ca0efdb435d9f46b596113':
2015-08-27 05:05:42 +00:00
Elliott Hughes
29eaaa6ee5
am 23e0bdf7
: (-s ours) am 182b91f6
: Merge "Invalidate cached pid in vfork."
...
* commit '23e0bdf7d4476399c04557396e288ad21938e65f':
2015-08-27 05:05:40 +00:00
Andreas Gampe
34df06eb8a
am fd202300
: (-s ours) am e80369ab
: Merge "Bionic: Add a TLS slot for ART for Thread self"
...
* commit 'fd202300d8639065406f054e7232e9135572bb81':
2015-08-27 05:05:38 +00:00
Elliott Hughes
45f262c084
am 711d7b9f
: (-s ours) am b3db7764
: Merge "name the arc4random structure mappings"
...
* commit '711d7b9f90648183af684f80b9de80fc83b43824':
2015-08-27 05:05:37 +00:00
Elliott Hughes
a31ba88d4c
am 65941221
: (-s ours) am f57f7945
: Merge "Cherrypick upstream fnmatch.c fix."
...
* commit '65941221b5985c824783f8c549241695a0cb6f92':
2015-08-27 05:05:35 +00:00
Elliott Hughes
f1a2cd9713
am dc181dd7
: (-s ours) am 2278d29a
: Merge "[MIPS] Link .dex or .oat code lacking .MIPS.abiflags segment"
...
* commit 'dc181dd7882e1a633400fe410266dc58152c7c10':
2015-08-27 05:05:32 +00:00
Yabin Cui
37c4110f41
am 993a2bee
: (-s ours) am 7e919dae
: Merge "add a fortified implementation of getcwd"
...
* commit '993a2bee84e25604e7ef8c1d386e7cd3904627e0':
2015-08-27 05:05:30 +00:00
Elliott Hughes
ba06d5519e
am 5b916453
: (-s ours) am 25907058
: Merge "Sync current upstream fnmatch.c."
...
* commit '5b916453f3d75ca9bbac6825191442c4b159e6a9':
2015-08-27 05:05:25 +00:00
Elliott Hughes
dc5970d025
am 9d7c6a7e
: (-s ours) am 61c21b63
: Merge "Revert "add a fortified implementation of getcwd""
...
* commit '9d7c6a7e570a8b91a094f0df4407b5624b469730':
2015-08-27 05:05:22 +00:00
Yabin Cui
e6623ebcaf
am 4279bac2
: (-s ours) am 442a3fca
: Merge "add a fortified implementation of getcwd"
...
* commit '4279bac26a15b69a85d3d98a57ff7094b579f207':
2015-08-27 05:05:20 +00:00
Elliott Hughes
b51b07117c
am 19a8b3fc
: (-s ours) am 807f27f9
: Merge "Stop sending SIGPIPE to debuggerd."
...
* commit '19a8b3fc8296974a4c65f52bd5da050b442bf901':
2015-08-27 05:05:18 +00:00
Elliott Hughes
1dd6f6436b
am d473681f
: (-s ours) am 44989174
: Merge "Prevent buffer over-read in linker.cpp\'s parse_path."
...
* commit 'd473681fb1ba8e93154a16ca5d9290c66c6da224':
2015-08-27 05:05:15 +00:00
Elliott Hughes
3cb8b52334
am 89a64c0f
: (-s ours) am 34c5f5ea
: Merge "Remove PAGE_SIZE from <limits.h>."
...
* commit '89a64c0f2ee1abfbda37049b7700c104a0092946':
2015-08-27 05:05:12 +00:00
Elliott Hughes
d4cc5122d2
am 5c104603
: (-s ours) am 374adfee
: Merge "Don\'t transitively include <limits.h> from <sys/user.h>."
...
* commit '5c104603a01ef3bffa6819313508a29722756bcf':
2015-08-27 05:05:09 +00:00
Elliott Hughes
6ed2717b28
am c5de153b
: (-s ours) am 1ff4094a
: Merge "Remove PAGESIZE."
...
* commit 'c5de153bc6600a73722a594416a9398361dfb942':
2015-08-27 05:05:06 +00:00
Elliott Hughes
6141acb75f
am a3c3a6b2
: (-s ours) am c8ba22c8
: Merge "Move PAGE_MASK into <sys/user.h>."
...
* commit 'a3c3a6b2df6de20f22139fae79c6bd124fc7fdb6':
2015-08-27 05:04:56 +00:00