The Android Automerger
d6b98300eb
merge in master-release history after reset to 02cf011db0
2014-04-29 05:49:22 -07:00
Elliott Hughes
02cf011db0
am c3221fb5: am 07bab525: Merge "Add mbtowc and fix mbrtowc."
...
* commit 'c3221fb531f437440646be3a6974b0e662442560':
Add mbtowc and fix mbrtowc.
2014-04-29 01:04:12 +00:00
Elliott Hughes
c3221fb531
am 07bab525: Merge "Add mbtowc and fix mbrtowc."
...
* commit '07bab525e24725aaacd71e7cc63dfc31d48ba8a7':
Add mbtowc and fix mbrtowc.
2014-04-29 01:00:57 +00:00
Elliott Hughes
07bab525e2
Merge "Add mbtowc and fix mbrtowc."
2014-04-29 00:54:43 +00:00
Elliott Hughes
0a5e26da1e
Add mbtowc and fix mbrtowc.
...
Change-Id: I48786cd82587e61188d40f6fd6e11ac05e857ae9
2014-04-28 17:51:13 -07:00
Elliott Hughes
331754c7f3
am 777078b1: am 0fd2e87a: Merge "Replace our broken wcswcs with the working upstream one."
...
* commit '777078b1a68960ae9764fe6449af5525657d6803':
Replace our broken wcswcs with the working upstream one.
2014-04-29 00:23:53 +00:00
Elliott Hughes
777078b1a6
am 0fd2e87a: Merge "Replace our broken wcswcs with the working upstream one."
...
* commit '0fd2e87a0cac56f772fe6fac4cd32de8a656a406':
Replace our broken wcswcs with the working upstream one.
2014-04-29 00:12:02 +00:00
Elliott Hughes
0fd2e87a0c
Merge "Replace our broken wcswcs with the working upstream one."
2014-04-28 23:47:18 +00:00
Elliott Hughes
d299bcfdad
Replace our broken wcswcs with the working upstream one.
...
Change-Id: I2952684df5674d10f0564d92c2cd42597725c0e3
2014-04-28 16:46:24 -07:00
The Android Automerger
13de238e93
merge in master-release history after reset to 95dfea204c
2014-04-28 05:49:09 -07:00
The Android Automerger
bf25d873ac
merge in master-release history after reset to 95dfea204c
2014-04-27 05:49:08 -07:00
Elliott Hughes
95dfea204c
am 50769026: am 3ac3f3fd: Merge "Don\'t use so much stack in tzcode."
...
* commit '50769026e8538db260a6f986edeb6d08ec295b8e':
Don't use so much stack in tzcode.
2014-04-27 03:26:11 +00:00
Elliott Hughes
50769026e8
am 3ac3f3fd: Merge "Don\'t use so much stack in tzcode."
...
* commit '3ac3f3fd0cab7b4ace8e15fd90ea869b26449df5':
Don't use so much stack in tzcode.
2014-04-27 03:22:03 +00:00
The Android Automerger
bd85f34684
merge in master-release history after reset to 12e848eb43
2014-04-26 05:49:30 -07:00
Elliott Hughes
3ac3f3fd0c
Merge "Don't use so much stack in tzcode."
2014-04-26 04:51:55 +00:00
Elliott Hughes
329103d3e2
Don't use so much stack in tzcode.
...
Bug: 14313703
Bug: https://code.google.com/p/android/issues/detail?id=61130
Change-Id: Id9b240fce20d4a6f2660792070e02b2b5f287655
2014-04-25 21:51:26 -07:00
Elliott Hughes
12e848eb43
am 8fe46b47: am f2dc7d17: Merge "Pass si_code through to debuggerd."
...
* commit '8fe46b47c2bc3b47f44580dc0e3d21335c71462d':
Pass si_code through to debuggerd.
2014-04-26 03:33:28 +00:00
Elliott Hughes
8fe46b47c2
am f2dc7d17: Merge "Pass si_code through to debuggerd."
...
* commit 'f2dc7d17196de9904df67f21aad1525b8568a705':
Pass si_code through to debuggerd.
2014-04-26 03:30:13 +00:00
Elliott Hughes
f2dc7d1719
Merge "Pass si_code through to debuggerd."
2014-04-26 03:23:22 +00:00
Elliott Hughes
b7e289ed02
Pass si_code through to debuggerd.
...
Because we re-raise various signals, we corrupt the si_code that debuggerd
sees when it ptraces our siginfo. One possible solution (shown here) is to
pass the original si_code value in the message we send to debuggerd.
Change-Id: I76f9aa2c0442e5cab611d132532409e700383907
2014-04-25 20:00:45 -07:00
Elliott Hughes
d3dc0c1831
am 4a40dea6: am 213e46f7: Merge "Fix brk/sbrk error checking."
...
* commit '4a40dea62949b7ed562bac7173962800ed89b01d':
Fix brk/sbrk error checking.
2014-04-26 02:46:37 +00:00
Elliott Hughes
4a40dea629
am 213e46f7: Merge "Fix brk/sbrk error checking."
...
* commit '213e46f7ae41f7d769087d854e061659bd0581d6':
Fix brk/sbrk error checking.
2014-04-26 02:44:29 +00:00
Elliott Hughes
213e46f7ae
Merge "Fix brk/sbrk error checking."
2014-04-26 02:39:09 +00:00
Elliott Hughes
533dde4dbf
Fix brk/sbrk error checking.
...
Note that the kernel returns the current break on error or if the requested
break is smaller than the minimum break, or the new break. I don't know where
we got the idea that the kernel could return -1.
Also optimizes the query case.
Also hides an accidentally-exported symbol for LP64.
Change-Id: I0fd6b8b14ddf1ae82935c0c3fc610da5cc74932e
2014-04-25 19:38:33 -07:00
Colin Cross
cc97b7d9cd
am e1e3430b: am eff450ff: Merge "Reserve space in pthread structures for future extensibility."
...
* commit 'e1e3430b9a4725c9506f10ab1b9b3be719e99c0c':
Reserve space in pthread structures for future extensibility.
2014-04-24 22:49:50 +00:00
Colin Cross
e1e3430b9a
am eff450ff: Merge "Reserve space in pthread structures for future extensibility."
...
* commit 'eff450ff45170ff17f17b7ceb26f54b858c39238':
Reserve space in pthread structures for future extensibility.
2014-04-24 22:47:09 +00:00
Colin Cross
eff450ff45
Merge "Reserve space in pthread structures for future extensibility."
2014-04-24 22:40:50 +00:00
Calin Juravle
b1cacd4245
Reserve space in pthread structures for future extensibility.
...
Make our structures equal in size with glibc structures. This should
give us plenty of space to implement any missing feature.
Bug: 13278744
Bug: 12875898
(cherry picked from commit cf83fd77ca
2014-04-24 22:07:52 +00:00
Elliott Hughes
2c03e8ff06
am cf57e2c6: am 08bfcff0: Merge "Allow liblog to pass failure reasons to debuggerd."
...
* commit 'cf57e2c645116eefd64801be035512621df0ba5c':
Allow liblog to pass failure reasons to debuggerd.
2014-04-24 20:47:46 +00:00
Elliott Hughes
cf57e2c645
am 08bfcff0: Merge "Allow liblog to pass failure reasons to debuggerd."
...
* commit '08bfcff0d4a931a4ed5e2a46541dc8d223482f34':
Allow liblog to pass failure reasons to debuggerd.
2014-04-24 20:42:48 +00:00
Elliott Hughes
08bfcff0d4
Merge "Allow liblog to pass failure reasons to debuggerd."
2014-04-24 20:29:43 +00:00
Greg Hackmann
da4aad855e
am 0f77d775: am ab290718: Merge "Revert "Reserve space in pthread structures for future extensibility.""
...
* commit '0f77d7758ac85a000f2ce5606051b8a7d121f6dd':
Revert "Reserve space in pthread structures for future extensibility."
2014-04-24 18:26:02 +00:00
Greg Hackmann
0f77d7758a
am ab290718: Merge "Revert "Reserve space in pthread structures for future extensibility.""
...
* commit 'ab290718e376795a51e1a09c7eb20e79b39efee8':
Revert "Reserve space in pthread structures for future extensibility."
2014-04-24 18:20:54 +00:00
Greg Hackmann
ab290718e3
Merge "Revert "Reserve space in pthread structures for future extensibility.""
2014-04-24 18:12:28 +00:00
Greg Hackmann
6b64000ef0
Revert "Reserve space in pthread structures for future extensibility."
...
This reverts commit cf83fd77ca
2014-04-24 18:11:23 +00:00
Calin Juravle
18955d6909
am 9b720750: am f2aeca50: Merge "Remove an unsed include dir"
...
* commit '9b720750c1486627d774973c51fc210a1ad9def5':
Remove an unsed include dir
2014-04-24 17:40:43 +00:00
Calin Juravle
9b720750c1
am f2aeca50: Merge "Remove an unsed include dir"
...
* commit 'f2aeca505cb5b85528981c46e0285ff3a7a70836':
Remove an unsed include dir
2014-04-24 17:32:12 +00:00
Calin Juravle
e9df9c52dc
am 123253b8: am 690401db: Merge "Removed non-existing include dir"
...
* commit '123253b86893d50f13d82f489e47924a4b69c228':
Removed non-existing include dir
2014-04-24 17:31:17 +00:00
Calin Juravle
f2aeca505c
Merge "Remove an unsed include dir"
2014-04-24 16:40:50 +00:00
Calin Juravle
fbb46a0c9a
Remove an unsed include dir
...
Change-Id: I05aa1e7e0639a5ec5576bf7646f35d2e5b157c09
2014-04-24 17:40:06 +01:00
Calin Juravle
123253b868
am 690401db: Merge "Removed non-existing include dir"
...
* commit '690401db7a57cc6794129d9a2430279d55149251':
Removed non-existing include dir
2014-04-24 16:39:06 +00:00
Calin Juravle
690401db7a
Merge "Removed non-existing include dir"
2014-04-24 16:29:50 +00:00
Calin Juravle
4b7c4f886f
Removed non-existing include dir
...
Change-Id: I3e00a8471e6d94f596a34bdfdb26a0caba23dd82
2014-04-24 17:17:02 +01:00
Calin Juravle
3b5bca823d
am 131d8e38: am 477d14b0: Merge "Reserve space in pthread structures for future extensibility."
...
* commit '131d8e38e45902a1d33ed257b62972bfcd26dd92':
Reserve space in pthread structures for future extensibility.
2014-04-24 15:43:51 +00:00
Calin Juravle
60a7622d48
am 334da4c9: am ae77f74b: Merge "Clean-up _fpmath and fake_long_doubles"
...
* commit '334da4c9a52f544bea0014da139766f2c0f7cf21':
Clean-up _fpmath and fake_long_doubles
2014-04-24 15:43:39 +00:00
Elliott Hughes
81972ddba3
am b4428762: am 563ea4e1: Merge "Fix fallout from host GCC upgrade."
...
* commit 'b442876276d1c5d701806cd02d7f0cce516caf03':
Fix fallout from host GCC upgrade.
2014-04-24 15:43:18 +00:00
The Android Automerger
90ca9f8aa4
merge in master-release history after reset to 4cec364af4
2014-04-24 05:49:35 -07:00
Calin Juravle
131d8e38e4
am 477d14b0: Merge "Reserve space in pthread structures for future extensibility."
...
* commit '477d14b09202db5c009005b622fdcdefd780b955':
Reserve space in pthread structures for future extensibility.
2014-04-24 11:43:03 +00:00
Calin Juravle
477d14b092
Merge "Reserve space in pthread structures for future extensibility."
2014-04-24 11:35:37 +00:00
Calin Juravle
334da4c9a5
am ae77f74b: Merge "Clean-up _fpmath and fake_long_doubles"
...
* commit 'ae77f74bcf51cb4199c9f7e87ec9c751fdd1842b':
Clean-up _fpmath and fake_long_doubles
2014-04-24 10:21:06 +00:00
