Colin Cross
b99b3f773c
am 55f87a0c
: Merge "Force non-color output for bionic FileCheck tests"
...
* commit '55f87a0c0bb587ee85b5662967563462d52db560':
Force non-color output for bionic FileCheck tests
2015-09-25 22:33:53 +00:00
Colin Cross
0f575d4482
am 4a54ec82
: Merge "Add .PHONY for phony bionic test targets"
...
* commit '4a54ec8200356a755aeeb212c4dd9cefad39754c':
Add .PHONY for phony bionic test targets
2015-09-25 22:33:51 +00:00
Christopher Ferris
93a91f0cf4
Force cts to only run one test at a time.
...
Also, slightly increase the timeout for each test run.
Bug: 24198050
(cherry picked from commit daaaed18ce
)
Change-Id: I29e169e962da803a89abf0a28e071abcafa315b7
2015-09-25 15:33:20 -07:00
Colin Cross
55f87a0c0b
Merge "Force non-color output for bionic FileCheck tests"
2015-09-25 22:27:16 +00:00
Colin Cross
4a54ec8200
Merge "Add .PHONY for phony bionic test targets"
2015-09-25 22:25:58 +00:00
Christopher Ferris
a64bb4c172
am c1d4ba88
: am b48ca46d
: Merge "Force cts to only run one test at a time."
...
* commit 'c1d4ba88cfd824b938feed68a706d2a06e993d3a':
Force cts to only run one test at a time.
2015-09-25 22:17:12 +00:00
Christopher Ferris
c1d4ba88cf
am b48ca46d
: Merge "Force cts to only run one test at a time."
...
* commit 'b48ca46d88d9e664763eff39604f772a57d8e2fb':
Force cts to only run one test at a time.
2015-09-25 22:11:46 +00:00
Christopher Ferris
b48ca46d88
Merge "Force cts to only run one test at a time."
2015-09-25 21:50:35 +00:00
Colin Cross
840be7cb79
Force non-color output for bionic FileCheck tests
...
Turning on color output will break the bionic compilation tests that
check for expected warnings, as they will be matching color output
against non-color expected values. Turn off color locally.
Bug: 24273983
Change-Id: Ia3b3262ccece121217f0dc0997734b3ad65b928b
2015-09-25 14:42:07 -07:00
Colin Cross
b67afb3eb5
Add .PHONY for phony bionic test targets
...
Bug: 24384320
Change-Id: I41038ff8b34391d03ce1e204e30e5ae34ec56614
2015-09-25 14:36:15 -07:00
Christopher Ferris
aaff959fc0
am 4344a02a
: am 931e1399
: Merge "Add cortex-a53.a57 target for 32 bit big/little."
...
* commit '4344a02a9efc93ff4f772f5722f1a455d8ef25cd':
Add cortex-a53.a57 target for 32 bit big/little.
2015-09-25 16:44:03 +00:00
Christopher Ferris
4344a02a9e
am 931e1399
: Merge "Add cortex-a53.a57 target for 32 bit big/little."
...
* commit '931e1399f13b35a139977354e179403184c649fa':
Add cortex-a53.a57 target for 32 bit big/little.
2015-09-25 16:35:53 +00:00
Christopher Ferris
931e1399f1
Merge "Add cortex-a53.a57 target for 32 bit big/little."
2015-09-25 16:29:33 +00:00
Christopher Ferris
daaaed18ce
Force cts to only run one test at a time.
...
Also, slightly increase the timeout for each test run.
Bug: 24198050
Change-Id: I2b0ebdebb909023d0f179e0a433c564266a99161
2015-09-25 09:16:31 -07:00
Christopher Ferris
774a4703e8
am 6eb06b03
: am 70a9f0a3
: Merge "Fix over read in strcpy/stpcpy/strcat."
...
* commit '6eb06b0399c95f52cd28ff7971582ebec42f45f7':
Fix over read in strcpy/stpcpy/strcat.
2015-09-24 21:48:52 +00:00
Christopher Ferris
6eb06b0399
am 70a9f0a3
: Merge "Fix over read in strcpy/stpcpy/strcat."
...
* commit '70a9f0a3bc310c863b5c90c9860aae842f82e47f':
Fix over read in strcpy/stpcpy/strcat.
2015-09-24 21:38:47 +00:00
Christopher Ferris
70a9f0a3bc
Merge "Fix over read in strcpy/stpcpy/strcat."
2015-09-24 21:26:40 +00:00
Christopher Ferris
fdfcfce7c6
Fix over read in strcpy/stpcpy/strcat.
...
This bug will happen when these circumstances are met:
- Destination address & 0x7 == 1, strlen of src is 11, 12, 13.
- Destination address & 0x7 == 2, strlen of src is 10, 11, 12.
- Destination address & 0x7 == 3, strlen of src is 9, 10, 11.
- Destination address & 0x7 == 4, strlen of src is 8, 9, 10.
In these cases, the dest alignment code does a ldr which reads 4 bytes,
and it will read past the end of the source. In most cases, this is
probably benign, but if this crosses into a new page it could cause a
crash.
Fix the labels in the cortex-a9 strcat.
Modify the overread test to vary the dst alignment to expost this bug.
Also, shrink the strcat/strlcat overread cases since the dst alignment
variation increases the runtime too much.
Bug: 24345899
Change-Id: Ib34a559bfcebd89861985b29cae6c1e47b5b5855
2015-09-24 14:17:36 -07:00
Christopher Ferris
54ee0407dc
Add cortex-a53.a57 target for 32 bit big/little.
...
The routines optimized for cortex-a7 and cortex-a53 cause performance
drops on cortex-a57. Instead create a target that is the middle ground
that works relatively well on either core.
Change-Id: Ie2b6cc9a59a01c7b30602ee368b2b90f5e886289
2015-09-24 14:00:00 -07:00
Yabin Cui
609716ae95
am 01030c24
: Increase alternative signal stack size on 64-bit devices.
...
* commit '01030c24b0e3ace1b4cdaf415354e2f315f4f3a9':
Increase alternative signal stack size on 64-bit devices.
2015-09-24 00:21:13 +00:00
Yabin Cui
01030c24b0
Increase alternative signal stack size on 64-bit devices.
...
Bug: 23041777
Bug: 24187462
Change-Id: I7d84c0cc775a74753a3e8e101169c0fb5dbf7437
2015-09-23 16:36:20 -07:00
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