Dan Albert
2c60af3e81
am 56446a6c
: am c38cee59
: Merge "Prevent the build system from hiding our ABI."
...
* commit '56446a6c8e2fd54f23a348060a2bc121c0846603':
Prevent the build system from hiding our ABI.
2015-09-23 20:22:04 +00:00
Dan Albert
56446a6c8e
am c38cee59
: Merge "Prevent the build system from hiding our ABI."
...
* commit 'c38cee59dcba23576cc01bfbb97cecc5eb01a75c':
Prevent the build system from hiding our ABI.
2015-09-23 20:15:35 +00:00
Dan Albert
c38cee59dc
Merge "Prevent the build system from hiding our ABI."
2015-09-23 20:08:09 +00:00
Elliott Hughes
678752ed2a
am 83911975
: am cb696c50
: Merge "Remove libpagemap include hack."
...
* commit '839119757d4d841359ad5f16d3bde8e4581f8322':
Remove libpagemap include hack.
2015-09-23 19:04:18 +00:00
Elliott Hughes
839119757d
am cb696c50
: Merge "Remove libpagemap include hack."
...
* commit 'cb696c50c293f387c7de46cd3c8573a335e273bf':
Remove libpagemap include hack.
2015-09-23 18:56:25 +00:00
Elliott Hughes
cb696c50c2
Merge "Remove libpagemap include hack."
2015-09-23 18:49:22 +00:00
Elliott Hughes
7660a088cd
Remove libpagemap include hack.
...
Change-Id: I4c75ae4e311342c9ab4f317026904f893e931384
2015-09-22 22:40:22 -07:00
Elliott Hughes
fff13b9196
am 12432ca4
: am 8d92afe3
: Merge "Fix another duplicate maps parser."
...
* commit '12432ca4839b4df9b040b2bd3b4401a48e1f8a06':
Fix another duplicate maps parser.
2015-09-23 00:36:13 +00:00
Elliott Hughes
12432ca483
am 8d92afe3
: Merge "Fix another duplicate maps parser."
...
* commit '8d92afe32265be8c36ea2adb3c4059298cd583eb':
Fix another duplicate maps parser.
2015-09-23 00:26:38 +00:00
Elliott Hughes
8d92afe322
Merge "Fix another duplicate maps parser."
2015-09-23 00:18:50 +00:00
Dan Albert
0aa96aedbe
Prevent the build system from hiding our ABI.
...
Unfortunately --exclude-libs (now passed globally) clobbers our
version script, so we have to prevent the build system from using this
flag.
Bug: http://b/24166967
Change-Id: I33c766d399c418fdc17983c8c0a56608d463201e
2015-09-22 16:49:40 -07:00
Elliott Hughes
15dfd63aba
Fix another duplicate maps parser.
...
Change-Id: Icb69f59ffbd0d5de7f727142260fae152d36a904
2015-09-22 16:40:14 -07:00
Elliott Hughes
afba67bd2f
am f599ea97
: am 9e3a2491
: Merge "Clean up /proc/<pid>/maps sscanfs."
...
* commit 'f599ea9743098a694262b7ab6c3b3d3f11eeb0dd':
Clean up /proc/<pid>/maps sscanfs.
2015-09-22 23:05:43 +00:00
Elliott Hughes
f599ea9743
am 9e3a2491
: Merge "Clean up /proc/<pid>/maps sscanfs."
...
* commit '9e3a24915241c07d8ea886533c8de6a85744a734':
Clean up /proc/<pid>/maps sscanfs.
2015-09-22 22:54:45 +00:00
Elliott Hughes
9e3a249152
Merge "Clean up /proc/<pid>/maps sscanfs."
2015-09-22 22:49:20 +00:00
Elliott Hughes
0dec228921
Clean up /proc/<pid>/maps sscanfs.
...
sscanf will swallow whitespace for us.
Change-Id: I59931cbad00f0144fd33ed4749ac0aaad15e6de6
2015-09-22 15:45:50 -07:00
Jorge Lucangeli Obes
eb83e971b4
am 9583f7e7
: am dd514539
: Merge "Add preliminary OEM UID/GID support."
...
* commit '9583f7e7c2863c63596429ccb23a34fdbf272102':
Add preliminary OEM UID/GID support.
2015-09-22 22:09:43 +00:00
Elliott Hughes
4e9118c25c
am 1085de1c
: am efcb5d9d
: Merge "Remove some <sys/cdefs.h> cruft."
...
* commit '1085de1cc5f56bf3538ff75ec93939b8c868eb2a':
Remove some <sys/cdefs.h> cruft.
2015-09-22 22:09:42 +00:00
Jorge Lucangeli Obes
9583f7e7c2
am dd514539
: Merge "Add preliminary OEM UID/GID support."
...
* commit 'dd51453904f609347ce7951661eff8bc12a1c0a4':
Add preliminary OEM UID/GID support.
2015-09-22 21:59:02 +00:00
Elliott Hughes
1085de1cc5
am efcb5d9d
: Merge "Remove some <sys/cdefs.h> cruft."
...
* commit 'efcb5d9d4c4b482cf21318b2bb4aec6cf6d8e0f5':
Remove some <sys/cdefs.h> cruft.
2015-09-22 21:59:00 +00:00
Jorge Lucangeli Obes
dd51453904
Merge "Add preliminary OEM UID/GID support."
2015-09-22 21:53:39 +00:00
Elliott Hughes
efcb5d9d4c
Merge "Remove some <sys/cdefs.h> cruft."
2015-09-22 21:52:28 +00:00
Yabin Cui
78f5504b92
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.
2015-09-22 20:59:44 +00:00
Yabin Cui
042a61de21
am 3d00f79f
: Merge "Increase alternative signal stack size on 64-bit devices."
...
* commit '3d00f79f98c8b981a36a79657f07a303a2288a55':
Increase alternative signal stack size on 64-bit devices.
2015-09-22 20:51:36 +00:00
Yabin Cui
3d00f79f98
Merge "Increase alternative signal stack size on 64-bit devices."
2015-09-22 20:44:05 +00:00
Elliott Hughes
cccb36036f
am d97f4224
: am 822c40a3
: Merge "<netinet/udp.h> should include <linux/udp.h>."
...
* commit 'd97f422405cfb3f1d6287f879ce828f7195e68d3':
<netinet/udp.h> should include <linux/udp.h>.
2015-09-22 20:34:32 +00:00
Jorge Lucangeli Obes
a39e30141d
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
2015-09-22 13:33:17 -07:00
Elliott Hughes
d97f422405
am 822c40a3
: Merge "<netinet/udp.h> should include <linux/udp.h>."
...
* commit '822c40a3389a953d9b43f05ad6e40640fd55f9c4':
<netinet/udp.h> should include <linux/udp.h>.
2015-09-22 20:25:03 +00:00
Elliott Hughes
822c40a338
Merge "<netinet/udp.h> should include <linux/udp.h>."
2015-09-22 20:19:14 +00:00
Elliott Hughes
44ddb31e75
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
2015-09-22 13:00:21 -07:00
Elliott Hughes
f8a2243ebe
<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
2015-09-22 12:34:13 -07:00
Yabin Cui
33ac04a215
Increase alternative signal stack size on 64-bit devices.
...
Bug: 23041777
Bug: 24187462
Change-Id: I7d84c0cc775a74753a3e8e101169c0fb5dbf7437
2015-09-22 11:18:26 -07:00
Dan Albert
a2308b7f67
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.
2015-09-19 19:59:53 +00:00
Christopher Ferris
a1ae03e21d
am 4ed36397
: am 777bd95c
: Merge "Import scsi headers."
...
* commit '4ed363972e1120f924c84a56c513eb7e8077dcbc':
Import scsi headers.
2015-09-19 19:59:52 +00:00
Greg Hackmann
672ff19c65
am 5fb12bc2
: am 96b1323a
: Merge "Define WIFCONTINUED()"
...
* commit '5fb12bc23273266b6afb08b61f1b5e558165c3d1':
Define WIFCONTINUED()
2015-09-19 19:59:52 +00:00
Greg Hackmann
51c4d51d8f
am a4ab398c
: am 7c460451
: Merge "Fix SOCK_* flag definitions"
...
* commit 'a4ab398c617055f5f5895f6b9f6ca5bf0f6e520f':
Fix SOCK_* flag definitions
2015-09-19 19:59:51 +00:00
Dan Albert
208d8e3696
am 13997591
: Merge "Add a hint about using --no-isolate for GDB."
...
* commit '1399759118f50071d499f88b18828e36aa2bad00':
Add a hint about using --no-isolate for GDB.
2015-09-19 19:52:23 +00:00
Christopher Ferris
4ed363972e
am 777bd95c
: Merge "Import scsi headers."
...
* commit '777bd95c63fcbb461deac40b303d706d3b672837':
Import scsi headers.
2015-09-19 19:52:13 +00:00
Greg Hackmann
5fb12bc232
am 96b1323a
: Merge "Define WIFCONTINUED()"
...
* commit '96b1323a403bbd946487e4107a076b0a307136b1':
Define WIFCONTINUED()
2015-09-19 19:52:12 +00:00
Greg Hackmann
a4ab398c61
am 7c460451
: Merge "Fix SOCK_* flag definitions"
...
* commit '7c4604518bcd27e27fb305388188275f49dea468':
Fix SOCK_* flag definitions
2015-09-19 19:52:09 +00:00
Dan Albert
1399759118
Merge "Add a hint about using --no-isolate for GDB."
2015-09-18 21:18:06 +00:00
Christopher Ferris
777bd95c63
Merge "Import scsi headers."
2015-09-18 20:44:58 +00:00
Greg Hackmann
96b1323a40
Merge "Define WIFCONTINUED()"
2015-09-18 20:39:07 +00:00
Greg Hackmann
7c4604518b
Merge "Fix SOCK_* flag definitions"
2015-09-18 20:38:54 +00:00
Greg Hackmann
c6043f6b27
Define WIFCONTINUED()
...
Change-Id: Id0feebd90d0525f3b479eb119b942eae8ca568d1
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-09-18 13:37:53 -07:00
Greg Hackmann
d75abb9614
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>
2015-09-18 13:37:53 -07:00
Dan Albert
1af434cc02
Add a hint about using --no-isolate for GDB.
...
Change-Id: Ib9df5ed986a1c4082c9c7cd793a4d670be21ca66
2015-09-18 13:17:02 -07:00
Elliott Hughes
10292607e4
am c0c6bcc8
: am 355f3d0c
: Merge "Fix mips FP abi bug in the linker."
...
* commit 'c0c6bcc8f7f90a7bb65d683efc97825625f072b0':
Fix mips FP abi bug in the linker.
2015-09-18 15:34:09 +00:00
Elliott Hughes
c0c6bcc8f7
am 355f3d0c
: Merge "Fix mips FP abi bug in the linker."
...
* commit '355f3d0c12a3cca3bf8304073f81b5e0d544ac59':
Fix mips FP abi bug in the linker.
2015-09-18 15:29:12 +00:00
Elliott Hughes
355f3d0c12
Merge "Fix mips FP abi bug in the linker."
2015-09-18 15:20:40 +00:00