OSDN Git Service
Elliott Hughes [Wed, 23 Sep 2015 00:36:13 +0000 (00:36 +0000)]
am
12432ca4: am
8d92afe3: Merge "Fix another duplicate maps parser."
* commit '
12432ca4839b4df9b040b2bd3b4401a48e1f8a06':
Fix another duplicate maps parser.
Elliott Hughes [Wed, 23 Sep 2015 00:26:38 +0000 (00:26 +0000)]
am
8d92afe3: Merge "Fix another duplicate maps parser."
* commit '
8d92afe32265be8c36ea2adb3c4059298cd583eb':
Fix another duplicate maps parser.
Elliott Hughes [Wed, 23 Sep 2015 00:18:50 +0000 (00:18 +0000)]
Merge "Fix another duplicate maps parser."
Elliott Hughes [Tue, 22 Sep 2015 23:40:14 +0000 (16:40 -0700)]
Fix another duplicate maps parser.
Change-Id: Icb69f59ffbd0d5de7f727142260fae152d36a904
Elliott Hughes [Tue, 22 Sep 2015 23:05:43 +0000 (23:05 +0000)]
am
f599ea97: am
9e3a2491: Merge "Clean up /proc/<pid>/maps sscanfs."
* commit '
f599ea9743098a694262b7ab6c3b3d3f11eeb0dd':
Clean up /proc/<pid>/maps sscanfs.
Elliott Hughes [Tue, 22 Sep 2015 22:54:45 +0000 (22:54 +0000)]
am
9e3a2491: Merge "Clean up /proc/<pid>/maps sscanfs."
* commit '
9e3a24915241c07d8ea886533c8de6a85744a734':
Clean up /proc/<pid>/maps sscanfs.
Elliott Hughes [Tue, 22 Sep 2015 22:49:20 +0000 (22:49 +0000)]
Merge "Clean up /proc/<pid>/maps sscanfs."
Elliott Hughes [Tue, 22 Sep 2015 22:45:50 +0000 (15:45 -0700)]
Clean up /proc/<pid>/maps sscanfs.
sscanf will swallow whitespace for us.
Change-Id: I59931cbad00f0144fd33ed4749ac0aaad15e6de6
Jorge Lucangeli Obes [Tue, 22 Sep 2015 22:09:43 +0000 (22:09 +0000)]
am
9583f7e7: am
dd514539: Merge "Add preliminary OEM UID/GID support."
* commit '
9583f7e7c2863c63596429ccb23a34fdbf272102':
Add preliminary OEM UID/GID support.
Elliott Hughes [Tue, 22 Sep 2015 22:09:42 +0000 (22:09 +0000)]
am
1085de1c: am
efcb5d9d: Merge "Remove some <sys/cdefs.h> cruft."
* commit '
1085de1cc5f56bf3538ff75ec93939b8c868eb2a':
Remove some <sys/cdefs.h> cruft.
Jorge Lucangeli Obes [Tue, 22 Sep 2015 21:59:02 +0000 (21:59 +0000)]
am
dd514539: Merge "Add preliminary OEM UID/GID support."
* commit '
dd51453904f609347ce7951661eff8bc12a1c0a4':
Add preliminary OEM UID/GID support.
Elliott Hughes [Tue, 22 Sep 2015 21:59:00 +0000 (21:59 +0000)]
am
efcb5d9d: Merge "Remove some <sys/cdefs.h> cruft."
* commit '
efcb5d9d4c4b482cf21318b2bb4aec6cf6d8e0f5':
Remove some <sys/cdefs.h> cruft.
Jorge Lucangeli Obes [Tue, 22 Sep 2015 21:53:39 +0000 (21:53 +0000)]
Merge "Add preliminary OEM UID/GID support."
Elliott Hughes [Tue, 22 Sep 2015 21:52:28 +0000 (21:52 +0000)]
Merge "Remove some <sys/cdefs.h> cruft."
Yabin Cui [Tue, 22 Sep 2015 20:59:44 +0000 (20:59 +0000)]
am
042a61de: am
3d00f79f: Merge "Increase alternative signal stack size on 64-bit devices."
* commit '
042a61de21296a7c5e4243b1e50ec591d124de98':
Increase alternative signal stack size on 64-bit devices.
Yabin Cui [Tue, 22 Sep 2015 20:51:36 +0000 (20:51 +0000)]
am
3d00f79f: Merge "Increase alternative signal stack size on 64-bit devices."
* commit '
3d00f79f98c8b981a36a79657f07a303a2288a55':
Increase alternative signal stack size on 64-bit devices.
Yabin Cui [Tue, 22 Sep 2015 20:44:05 +0000 (20:44 +0000)]
Merge "Increase alternative signal stack size on 64-bit devices."
Elliott Hughes [Tue, 22 Sep 2015 20:34:32 +0000 (20:34 +0000)]
am
d97f4224: am
822c40a3: Merge "<netinet/udp.h> should include <linux/udp.h>."
* commit '
d97f422405cfb3f1d6287f879ce828f7195e68d3':
<netinet/udp.h> should include <linux/udp.h>.
Jorge Lucangeli Obes [Tue, 22 Sep 2015 18:46:43 +0000 (11:46 -0700)]
Add preliminary OEM UID/GID support.
Until we implement full support for passwd/group files, add a simple
way to use the new OEM UID/GID range (5000-5999).
oem_XXX -> 5000 + XXX iff 0 <= XXX < 1000.
Bug:
23225475
Change-Id: If48b88135d5df538313414f747d6c4c63bf0a103
Elliott Hughes [Tue, 22 Sep 2015 20:25:03 +0000 (20:25 +0000)]
am
822c40a3: Merge "<netinet/udp.h> should include <linux/udp.h>."
* commit '
822c40a3389a953d9b43f05ad6e40640fd55f9c4':
<netinet/udp.h> should include <linux/udp.h>.
Elliott Hughes [Tue, 22 Sep 2015 20:19:14 +0000 (20:19 +0000)]
Merge "<netinet/udp.h> should include <linux/udp.h>."
Elliott Hughes [Tue, 22 Sep 2015 20:00:21 +0000 (13:00 -0700)]
Remove some <sys/cdefs.h> cruft.
In particular, we don't need to record the peculiarities of every
version of GCC ever shipped. It just makes this file harder to follow.
Change-Id: Ie9035d78eae86b4aed9dff3576c6f54e268aaced
Elliott Hughes [Tue, 22 Sep 2015 19:34:13 +0000 (12:34 -0700)]
<netinet/udp.h> should include <linux/udp.h>.
The comment about "other stuff" referred to pre-uapi headers. Everything
in the current <linux/udp.h> should be exposed to userspace. The only
problem is that BSD and Linux use different names for the members of
struct udphdr. We can move the Linux udphdr out of the way and use an
anonymous union to get the best of both worlds. (Though unfortunately
this means that code that includes <linux/udp.h> directly instead of
using <netinet/udp.h> now won't have any definition of struct udphdr.
We've taken the stance in the past that you shouldn't include a linux/
header if there's a standard equivalent --- you should rely on us
transitively including it for you.)
Change-Id: Ie625892441b0edd8df3b76d3fcf2cbe299077bc4
Yabin Cui [Tue, 22 Sep 2015 18:16:15 +0000 (11:16 -0700)]
Increase alternative signal stack size on 64-bit devices.
Bug:
23041777
Bug:
24187462
Change-Id: I7d84c0cc775a74753a3e8e101169c0fb5dbf7437
Dan Albert [Sat, 19 Sep 2015 19:59:53 +0000 (19:59 +0000)]
am
208d8e36: am
13997591: Merge "Add a hint about using --no-isolate for GDB."
* commit '
208d8e369604e76363027289c09e08c9b4fc818b':
Add a hint about using --no-isolate for GDB.
Christopher Ferris [Sat, 19 Sep 2015 19:59:52 +0000 (19:59 +0000)]
am
4ed36397: am
777bd95c: Merge "Import scsi headers."
* commit '
4ed363972e1120f924c84a56c513eb7e8077dcbc':
Import scsi headers.
Greg Hackmann [Sat, 19 Sep 2015 19:59:52 +0000 (19:59 +0000)]
am
5fb12bc2: am
96b1323a: Merge "Define WIFCONTINUED()"
* commit '
5fb12bc23273266b6afb08b61f1b5e558165c3d1':
Define WIFCONTINUED()
Greg Hackmann [Sat, 19 Sep 2015 19:59:51 +0000 (19:59 +0000)]
am
a4ab398c: am
7c460451: Merge "Fix SOCK_* flag definitions"
* commit '
a4ab398c617055f5f5895f6b9f6ca5bf0f6e520f':
Fix SOCK_* flag definitions
Dan Albert [Sat, 19 Sep 2015 19:52:23 +0000 (19:52 +0000)]
am
13997591: Merge "Add a hint about using --no-isolate for GDB."
* commit '
1399759118f50071d499f88b18828e36aa2bad00':
Add a hint about using --no-isolate for GDB.
Christopher Ferris [Sat, 19 Sep 2015 19:52:13 +0000 (19:52 +0000)]
am
777bd95c: Merge "Import scsi headers."
* commit '
777bd95c63fcbb461deac40b303d706d3b672837':
Import scsi headers.
Greg Hackmann [Sat, 19 Sep 2015 19:52:12 +0000 (19:52 +0000)]
am
96b1323a: Merge "Define WIFCONTINUED()"
* commit '
96b1323a403bbd946487e4107a076b0a307136b1':
Define WIFCONTINUED()
Greg Hackmann [Sat, 19 Sep 2015 19:52:09 +0000 (19:52 +0000)]
am
7c460451: Merge "Fix SOCK_* flag definitions"
* commit '
7c4604518bcd27e27fb305388188275f49dea468':
Fix SOCK_* flag definitions
Dan Albert [Fri, 18 Sep 2015 21:18:06 +0000 (21:18 +0000)]
Merge "Add a hint about using --no-isolate for GDB."
Christopher Ferris [Fri, 18 Sep 2015 20:44:58 +0000 (20:44 +0000)]
Merge "Import scsi headers."
Greg Hackmann [Fri, 18 Sep 2015 20:39:07 +0000 (20:39 +0000)]
Merge "Define WIFCONTINUED()"
Greg Hackmann [Fri, 18 Sep 2015 20:38:54 +0000 (20:38 +0000)]
Merge "Fix SOCK_* flag definitions"
Greg Hackmann [Wed, 26 Aug 2015 00:50:29 +0000 (17:50 -0700)]
Define WIFCONTINUED()
Change-Id: Id0feebd90d0525f3b479eb119b942eae8ca568d1
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Greg Hackmann [Wed, 26 Aug 2015 00:45:46 +0000 (17:45 -0700)]
Fix SOCK_* flag definitions
MIPS and the rest of the world only disagree on the first two SOCK_*
constants, so restructure the #ifdef accordingly.
As a deliberate side effect, this fixes SOCK_DCCP being missing on
non-MIPS platforms.
Change-Id: I2267008f1121a7eebe1ed9097afab6e612bce7f0
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Dan Albert [Fri, 18 Sep 2015 20:17:02 +0000 (13:17 -0700)]
Add a hint about using --no-isolate for GDB.
Change-Id: Ib9df5ed986a1c4082c9c7cd793a4d670be21ca66
Elliott Hughes [Fri, 18 Sep 2015 15:34:09 +0000 (15:34 +0000)]
am
c0c6bcc8: am
355f3d0c: Merge "Fix mips FP abi bug in the linker."
* commit '
c0c6bcc8f7f90a7bb65d683efc97825625f072b0':
Fix mips FP abi bug in the linker.
Elliott Hughes [Fri, 18 Sep 2015 15:29:12 +0000 (15:29 +0000)]
am
355f3d0c: Merge "Fix mips FP abi bug in the linker."
* commit '
355f3d0c12a3cca3bf8304073f81b5e0d544ac59':
Fix mips FP abi bug in the linker.
Elliott Hughes [Fri, 18 Sep 2015 15:20:40 +0000 (15:20 +0000)]
Merge "Fix mips FP abi bug in the linker."
Christopher Ferris [Fri, 18 Sep 2015 04:30:42 +0000 (04:30 +0000)]
am
577c64eb: am
d9639559: Merge "Add support for manually modified kernel headers."
* commit '
577c64ebbfc3fe183394e14b67d543d8ec0f6425':
Add support for manually modified kernel headers.
Christopher Ferris [Fri, 18 Sep 2015 04:23:55 +0000 (04:23 +0000)]
am
d9639559: Merge "Add support for manually modified kernel headers."
* commit '
d9639559ccccf055919a4d1487ca8a6cba953715':
Add support for manually modified kernel headers.
Christopher Ferris [Fri, 18 Sep 2015 04:22:44 +0000 (21:22 -0700)]
Import scsi headers.
Linux's scsi headers are a mix of userspace-facing and kernel-facing
declarations that can't be directly used by userspace. The glibc
maintainers manually copy-and-pasted these definitions into their own
scsi headers and haven't substantially updated them in 15 years. musl
has a similar set of definitions in its scsi headers.
This change generates the scsi headers from external/kernel-headers,
using the updated generation script so that the single modified scsi.h
takes the place of the non-modified one.
Change-Id: Ic14d155aa534b0edc1ee686d61113ce5cdf0e6af
Christopher Ferris [Fri, 18 Sep 2015 04:15:32 +0000 (04:15 +0000)]
Merge "Add support for manually modified kernel headers."
Christopher Ferris [Tue, 15 Sep 2015 21:13:17 +0000 (14:13 -0700)]
Add support for manually modified kernel headers.
This changes the scripts so that if some kernel files exists
in external/kernel-headers/modified, that they will be preferred
over the same files found in original. This is to support the case
where the kernel headers cannot be taken without some small modifications.
Included with this change, is a general cleanup of the python scripts.
This also modifies the generate uapi headers script to indicate if the
source of the modified headers has changed.
Change-Id: Id13523b244ced52a2ecd9f1399c43996dd8296fa
Dan Willemsen [Thu, 17 Sep 2015 22:52:33 +0000 (22:52 +0000)]
am
305af045: am
353e7e5d: Merge "Update Android.bp for setjmp cookies"
* commit '
305af04561b9b8bd612f16350f0dd41a25be7cc2':
Update Android.bp for setjmp cookies
Dan Willemsen [Thu, 17 Sep 2015 22:44:57 +0000 (22:44 +0000)]
am
353e7e5d: Merge "Update Android.bp for setjmp cookies"
* commit '
353e7e5d11fa59750c5358ad3e239765dcbeb335':
Update Android.bp for setjmp cookies
Dan Willemsen [Thu, 17 Sep 2015 22:34:35 +0000 (22:34 +0000)]
Merge "Update Android.bp for setjmp cookies"
Josh Gao [Thu, 17 Sep 2015 22:31:45 +0000 (22:31 +0000)]
am
91624eae: am
57866a6d: Merge changes Iea8d03de,I2014f959
* commit '
91624eae9aa90e123ae37843d94861120d2433a4':
Implement setjmp cookies on x86_64.
Implement setjmp cookies on x86.
Dan Willemsen [Thu, 17 Sep 2015 22:28:45 +0000 (15:28 -0700)]
Update Android.bp for setjmp cookies
Change-Id: I57245e4eedf9b8e1edc7de46208be5aa47c94b28
Josh Gao [Thu, 17 Sep 2015 22:22:33 +0000 (22:22 +0000)]
am
57866a6d: Merge changes Iea8d03de,I2014f959
* commit '
57866a6ddef66e9c331df4f20e6c39920aba2a99':
Implement setjmp cookies on x86_64.
Implement setjmp cookies on x86.
Douglas Leung [Thu, 17 Sep 2015 22:16:53 +0000 (15:16 -0700)]
Fix mips FP abi bug in the linker.
Change-Id: I1ffab938eb06f9dc0963ee15bc10eca216618792
Josh Gao [Thu, 17 Sep 2015 22:14:41 +0000 (22:14 +0000)]
Merge changes Iea8d03de,I2014f959
* changes:
Implement setjmp cookies on x86_64.
Implement setjmp cookies on x86.
Josh Gao [Thu, 17 Sep 2015 01:42:45 +0000 (18:42 -0700)]
Implement setjmp cookies on x86_64.
Bug: http://b/
23942752
Change-Id: Iea8d03de1dd9ca5a128c072c94b10de3a8056348
Josh Gao [Tue, 15 Sep 2015 18:30:35 +0000 (11:30 -0700)]
Implement setjmp cookies on x86.
Bug: http://b/
23942752
Change-Id: I2014f95989d0ab094b225234d98ccee477166c9d
Josh Gao [Thu, 17 Sep 2015 21:22:32 +0000 (21:22 +0000)]
am
9e3d8730: am
823cff84: Merge changes I81408ef0,Id0eb8d06
* commit '
9e3d873036b581b9986f42cc40f2d43f057ed7f1':
Implement setjmp cookies on AArch64.
Implement setjmp cookies on ARM.
Josh Gao [Thu, 17 Sep 2015 21:15:57 +0000 (21:15 +0000)]
am
823cff84: Merge changes I81408ef0,Id0eb8d06
* commit '
823cff847b3b202b235ddd84650338f07bc61511':
Implement setjmp cookies on AArch64.
Implement setjmp cookies on ARM.
Josh Gao [Thu, 17 Sep 2015 21:09:23 +0000 (21:09 +0000)]
Merge changes I81408ef0,Id0eb8d06
* changes:
Implement setjmp cookies on AArch64.
Implement setjmp cookies on ARM.
Josh Gao [Fri, 11 Sep 2015 22:23:32 +0000 (15:23 -0700)]
Implement setjmp cookies on AArch64.
Bug: http://b/
23942752
Change-Id: I81408ef0dd53010140b51e3083d357d3f2961112
Josh Gao [Thu, 10 Sep 2015 22:40:24 +0000 (15:40 -0700)]
Implement setjmp cookies on ARM.
Reuse the top bits of _JB_SIGFLAG field previously used to store a
boolean to store a cookie that's validated by [sig]longjmp to make it
harder to use as a ROP gadget. Additionally, encrypt saved registers
with the cookie so that an attacker can't modify a register's value to
a specific value without knowing the cookie.
Bug: http://b/
23942752
Change-Id: Id0eb8d06916e89d5d776bfcaa9458f8826717ba3
Dan Willemsen [Thu, 17 Sep 2015 19:52:53 +0000 (19:52 +0000)]
am
64ce4787: am
90fc8e24: Merge "Add Android.bp for libc/libm/libdl"
* commit '
64ce4787e593a547dab41210b28bc74e19318820':
Add Android.bp for libc/libm/libdl
Dan Willemsen [Thu, 17 Sep 2015 19:40:42 +0000 (19:40 +0000)]
am
90fc8e24: Merge "Add Android.bp for libc/libm/libdl"
* commit '
90fc8e24876412a816776d44bedc77e1f1888a13':
Add Android.bp for libc/libm/libdl
Dan Willemsen [Thu, 17 Sep 2015 19:31:07 +0000 (19:31 +0000)]
Merge "Add Android.bp for libc/libm/libdl"
Yabin Cui [Thu, 17 Sep 2015 02:50:56 +0000 (02:50 +0000)]
am
72e678c8: am
cbd0a15b: Merge "Fix the way to get main thread stack start address."
* commit '
72e678c8a7f78a04dffc57a6b2add45aeee4d1ec':
Fix the way to get main thread stack start address.
Yabin Cui [Thu, 17 Sep 2015 02:42:52 +0000 (02:42 +0000)]
am
cbd0a15b: Merge "Fix the way to get main thread stack start address."
* commit '
cbd0a15be881abb8ce1feb5b389da2f517a9a4c6':
Fix the way to get main thread stack start address.
Yabin Cui [Thu, 17 Sep 2015 02:37:20 +0000 (02:37 +0000)]
Merge "Fix the way to get main thread stack start address."
Dan Willemsen [Wed, 16 Sep 2015 23:33:27 +0000 (16:33 -0700)]
Add Android.bp for libc/libm/libdl
Change-Id: I3537363849ba1244348996ff17c5ace1b95dbeee
Mor-sarid, Nitzan [Fri, 11 Sep 2015 05:31:36 +0000 (05:31 +0000)]
Fix the way to get main thread stack start address.
For previous way to get the stack using the [stack] string from
/proc/self/task/<pid>/maps is not enough. On x86/x86_64, if an
alternative signal stack is used while a task switch happens,
the [stack] indicator may no longer be correct.
Instead, stack_start from /proc/self/stat which is always inside
the main stack, is used to find the main stack in /proc/self/maps.
Change-Id: Ieb010e71518b57560d541cd3b3563e5aa9660750
Signed-off-by: Nitzan Mor-sarid <nitzan.mor-sarid@intel.com>
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
Elliott Hughes [Tue, 15 Sep 2015 15:25:18 +0000 (15:25 +0000)]
am
bab1044d: am
14545d4c: Merge "Move several FreeBSD functions to OpenBSD."
* commit '
bab1044d27cc5b88809f2fc0e5be7e23f2ab6623':
Move several FreeBSD functions to OpenBSD.
Elliott Hughes [Tue, 15 Sep 2015 15:19:20 +0000 (15:19 +0000)]
am
14545d4c: Merge "Move several FreeBSD functions to OpenBSD."
* commit '
14545d4ce3dd446f20a14dcff37d60ff8d756f7a':
Move several FreeBSD functions to OpenBSD.
Elliott Hughes [Tue, 15 Sep 2015 15:18:56 +0000 (15:18 +0000)]
am
364dbb3c: am
44c8ac8b: Merge "Sync with upstream NetBSD lib/libc/regex."
* commit '
364dbb3cf493b00e48d8f29e4a845e78f8139f4f':
Sync with upstream NetBSD lib/libc/regex.
Elliott Hughes [Tue, 15 Sep 2015 15:13:35 +0000 (15:13 +0000)]
Merge "Move several FreeBSD functions to OpenBSD."
Elliott Hughes [Tue, 15 Sep 2015 15:12:36 +0000 (15:12 +0000)]
am
44c8ac8b: Merge "Sync with upstream NetBSD lib/libc/regex."
* commit '
44c8ac8bd7747d907720c63538625a4b95245234':
Sync with upstream NetBSD lib/libc/regex.
Elliott Hughes [Tue, 15 Sep 2015 15:05:21 +0000 (15:05 +0000)]
Merge "Sync with upstream NetBSD lib/libc/regex."
Elliott Hughes [Tue, 15 Sep 2015 02:01:58 +0000 (19:01 -0700)]
Move several FreeBSD functions to OpenBSD.
There's no difference between the two BSDs for these functions, so let's go
with the majority.
Change-Id: Ic296f23153a48bed5ad152f5b31989c4e00e60bd
Elliott Hughes [Tue, 15 Sep 2015 01:45:52 +0000 (18:45 -0700)]
Sync with upstream NetBSD lib/libc/regex.
Bug: http://b/
22850181
Change-Id: I11a51a2031e68a953ccd5691da98c699c7d01904
Dan Albert [Fri, 11 Sep 2015 23:04:58 +0000 (23:04 +0000)]
am
a1a46a8e: am
cd0ed2f1: Merge "CMSG_DATA should return an unsigned char*."
* commit '
a1a46a8e946d1fd1c50f44e7e23f462e179ddbb1':
CMSG_DATA should return an unsigned char*.
Dan Albert [Fri, 11 Sep 2015 22:14:07 +0000 (22:14 +0000)]
am
cd0ed2f1: Merge "CMSG_DATA should return an unsigned char*."
* commit '
cd0ed2f174d9015da5ae7206bc4c5190cd0bb51e':
CMSG_DATA should return an unsigned char*.
Dan Albert [Fri, 11 Sep 2015 17:39:12 +0000 (17:39 +0000)]
Merge "CMSG_DATA should return an unsigned char*."
Dan Albert [Fri, 11 Sep 2015 16:47:27 +0000 (09:47 -0700)]
CMSG_DATA should return an unsigned char*.
http://pubs.opengroup.org/onlinepubs/
9699919799/basedefs/sys_socket.h.html
> CMSG_DATA(cmsg)
> If the argument is a pointer to a cmsghdr structure, this macro
> shall return an unsigned character pointer to the data array
> associated with the cmsghdr structure.
Change-Id: I3f89ba19cbca4e6727abc65a2bbcd59267892ba8
Dan Albert [Tue, 8 Sep 2015 20:38:46 +0000 (20:38 +0000)]
am
32ec7498: am
1c7b84ca: Merge changes Ia1777fd4,I3998d88b
* commit '
32ec74987344cedb5596e6da1891a9d54962f149':
Unify unistd.h.
Use attribute availability.
Dan Albert [Tue, 8 Sep 2015 20:32:37 +0000 (20:32 +0000)]
am
1c7b84ca: Merge changes Ia1777fd4,I3998d88b
* commit '
1c7b84ca0095e0dc4da8434e9e0c59cd2326f763':
Unify unistd.h.
Use attribute availability.
Dan Albert [Tue, 8 Sep 2015 20:24:39 +0000 (20:24 +0000)]
Merge changes Ia1777fd4,I3998d88b
* changes:
Unify unistd.h.
Use attribute availability.
Dan Albert [Fri, 4 Sep 2015 19:59:53 +0000 (12:59 -0700)]
Unify unistd.h.
Make unistd.h usable from all platform versions.
Also name all function parameters for Android Studio.
Bug: http://b/
21952040
Change-Id: Ia1777fd4a6d4e37f25cc402c28fb78c003e481e3
Dan Albert [Thu, 6 Aug 2015 21:32:25 +0000 (14:32 -0700)]
Use attribute availability.
Bug: http://b/
21952040
Change-Id: I3998d88bc6076d60ae5cf7efd112817f80f17971
Elliott Hughes [Fri, 4 Sep 2015 18:21:34 +0000 (18:21 +0000)]
am
edc73f62: am
ba9c1705: Merge "linker: don\'t pass dlextinfo to dependent loads"
* commit '
edc73f6286bcd1f7d0278d25d4484bf23a0e53b2':
linker: don't pass dlextinfo to dependent loads
Elliott Hughes [Fri, 4 Sep 2015 18:12:33 +0000 (18:12 +0000)]
am
ba9c1705: Merge "linker: don\'t pass dlextinfo to dependent loads"
* commit '
ba9c17053456aed4452a349cf45c5960d9231f25':
linker: don't pass dlextinfo to dependent loads
Elliott Hughes [Fri, 4 Sep 2015 18:02:18 +0000 (18:02 +0000)]
Merge "linker: don't pass dlextinfo to dependent loads"
Christopher Ferris [Fri, 4 Sep 2015 01:31:18 +0000 (01:31 +0000)]
am
2fe50aa3: am
cb0d96e6: Merge "Only close stdin/stdout/stderr for debug malloc."
* commit '
2fe50aa3806f2c367dddfc5ddedd1c636223b823':
Only close stdin/stdout/stderr for debug malloc.
Christopher Ferris [Fri, 4 Sep 2015 01:17:48 +0000 (01:17 +0000)]
am
cb0d96e6: Merge "Only close stdin/stdout/stderr for debug malloc."
* commit '
cb0d96e6a218cc37eb0ab764740a8bf1ea385511':
Only close stdin/stdout/stderr for debug malloc.
Christopher Ferris [Fri, 4 Sep 2015 01:09:11 +0000 (01:09 +0000)]
Merge "Only close stdin/stdout/stderr for debug malloc."
Christopher Ferris [Thu, 3 Sep 2015 22:01:59 +0000 (15:01 -0700)]
Only close stdin/stdout/stderr for debug malloc.
The debug malloc code unconditionally closes stdin/stdout/stderr,
which means that other atexit functions cannot use them. Only
close these if there is a debug malloc final function to call.
This doesn't appear to be a problem on most normal applications or the
atexit_exit bionic unit test would be failing. However, if you
enable stat dumping in jemalloc, nothing prints. Most likely trying
to add an atexit function from within libc is causing that atexit
to run after the debug malloc atexit function.
Change-Id: I963720d4ccaaa511e44af07a7461f17eb3f84e8e
Christopher Ferris [Thu, 3 Sep 2015 18:14:10 +0000 (18:14 +0000)]
am
7bb544cc: am
b423ffa6: Merge "Update to v3.18.21 kernel headers."
* commit '
7bb544cc7c3d70af5f06dd5cf8b33e841b816ded':
Update to v3.18.21 kernel headers.
Christopher Ferris [Thu, 3 Sep 2015 18:00:09 +0000 (18:00 +0000)]
am
b423ffa6: Merge "Update to v3.18.21 kernel headers."
* commit '
b423ffa6c27ade8485f1f061fd3775553e9bb457':
Update to v3.18.21 kernel headers.
Christopher Ferris [Thu, 3 Sep 2015 17:52:47 +0000 (17:52 +0000)]
Merge "Update to v3.18.21 kernel headers."
Christopher Ferris [Thu, 3 Sep 2015 00:23:31 +0000 (17:23 -0700)]
Update to v3.18.21 kernel headers.
Change-Id: I4ade68d62981c7f6f361750cc811e8d84be9d5b9
Dmitriy Ivanov [Wed, 2 Sep 2015 23:32:02 +0000 (16:32 -0700)]
linker: don't pass dlextinfo to dependent loads
Don't pass the parent load's dlextinfo to dependent loads, since this
causes the linker to try to load the dependencies using the same
addresses/relro/fds/etc as the main library, which is never going to
work. This was how it worked before
ae69a95 which broke this.
Bug: http://b/
23742664
Bug: http://b/
20948231
Bug: http://b/
20841817
Change-Id: I340ebae1127666d5c6c6f9c6521b89fb93f15bdd
Elliott Hughes [Wed, 2 Sep 2015 04:00:02 +0000 (04:00 +0000)]
am
67c6da80: am
cc251966: Merge "Rename debug_stacktrace to debug_backtrace."
* commit '
67c6da80bb3b6b4febc783db04ce19cdeb187092':
Rename debug_stacktrace to debug_backtrace.