Christopher Ferris
afff4442ae
resolve merge conflicts of d676080a37 to lmp-mr1-ub-dev.
...
Change-Id: I56c1bb2adb4b6a48733c928415e788e689b4944e
2015-10-21 14:56:52 -07:00
Elliott Hughes
d676080a37
Sync with upstream NetBSD lib/libc/regex.
...
am: 055a66c9b1
* commit '055a66c9b1017c01b82c12b65a571bf9efad8b19':
Sync with upstream NetBSD lib/libc/regex.
2015-10-21 21:45:01 +00:00
Elliott Hughes
055a66c9b1
Sync with upstream NetBSD lib/libc/regex.
...
Bug: http://b/22850181
Change-Id: I11a51a2031e68a953ccd5691da98c699c7d01904
(cherry-picked from commit 71927a82379f7a72559ea96e6678d6215090937f)
2015-10-19 10:42:31 -07:00
Elliott Hughes
98384649b2
am 75316283: am 2d23418e: am 18442e02: (-s ours) am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit '753162836a0d3a82739611c9e30aa872363558b1':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 17:25:29 +00:00
Elliott Hughes
753162836a
am 2d23418e: am 18442e02: (-s ours) am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit '2d23418e68acdab7e142cc75db2850a54aa829aa':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 10:14:41 -07:00
Elliott Hughes
2d23418e68
am 18442e02: (-s ours) am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit '18442e023536c5cf205b820ed5d74b972b710acb':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 10:07:34 -07:00
Elliott Hughes
18442e0235
am beb6e08a: Sync with upstream NetBSD lib/libc/regex.
...
* commit 'beb6e08abf1393663151afde2742bb23eccab4e1':
Sync with upstream NetBSD lib/libc/regex.
2015-10-19 15:34:19 +00:00
Elliott Hughes
beb6e08abf
Sync with upstream NetBSD lib/libc/regex.
...
Bug: http://b/22850181
(cherry-picked from commit 71927a82379f7a72559ea96e6678d6215090937f)
Change-Id: I11a51a2031e68a953ccd5691da98c699c7d01904
2015-10-16 17:52:55 -07:00
Yabin Cui
a6a12a7804
am 0fdcdd00: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev
...
* commit '0fdcdd0067af88e7deef73070d0861ceb9f53c37':
Fix flaky test time.timer_settime_0.
2015-08-11 18:56:43 +00:00
Yabin Cui
0fdcdd0067
Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev
android-cts-5.1_r4
android-cts-5.1_r3
2015-08-11 18:41:17 +00:00
Yabin Cui
bf572d91b5
Fix flaky test time.timer_settime_0.
...
It fixes the problem reported in https://code.google.com/p/android/issues/detail?id=182395 .
Change-Id: Ie16aa04095dac08a62dd0d4c50e763b36526624c
2015-08-11 11:25:02 -07:00
Yabin Cui
8beb0c34da
am b245bc75: am 0f455612: Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev
...
* commit 'b245bc750021ce6d220e71625fca66620cdd1f05':
Fix flaky test of timer_create_multiple in L.
2015-06-19 18:55:51 +00:00
Yabin Cui
b245bc7500
am 0f455612: Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev
...
* commit '0f455612d3325932a851418634a17a61307948c5':
Fix flaky test of timer_create_multiple in L.
2015-06-19 18:40:59 +00:00
Yabin Cui
0f455612d3
Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev
android-cts-5.1_r2
2015-06-19 18:00:53 +00:00
Yabin Cui
410c1adf5f
Fix flaky test of timer_create_multiple in L.
...
Bug: 20677618
Change-Id: I0cb5faf77edce042b10611543180f3e2e73d3d05
2015-06-18 16:19:02 -07:00
Sharvil Nanavati
00cef82013
am 64e9e71c: Define nonportable pthread mutex macros with the _NP suffix.
...
* commit '64e9e71cdb7d88397e510e1986d494b797ed3b45':
Define nonportable pthread mutex macros with the _NP suffix.
2015-06-12 20:13:46 +00:00
Sharvil Nanavati
64e9e71cdb
Define nonportable pthread mutex macros with the _NP suffix.
...
Change-Id: I1066352e5b2607f64daf6aeb0030d0bbe88ead8d
2015-06-12 10:56:17 -07:00
Yabin Cui
61b040a570
resolved conflicts for merge of ea248d9c to lmp-mr1-ub-dev
...
Change-Id: I362ab2e25e3368c71cb1af51cee2e8fb5ce53e61
2015-06-02 16:47:42 -07:00
Yabin Cui
ea248d9ca8
Merge "Make sys_resource test more robust." into lollipop-cts-dev
...
automerge: 492a0bf
* commit '492a0bf212973baa1c33d584d57e75395774447f':
Make sys_resource test more robust.
2015-06-02 22:03:23 +00:00
Yabin Cui
492a0bf212
Merge "Make sys_resource test more robust." into lollipop-cts-dev
android-cts-5.0_r3
2015-06-02 22:02:29 +00:00
Yabin Cui
e7ece90b50
Make sys_resource test more robust.
...
Bug: 19482626
"ulimit -c xxx" command may run before bionic-unit-tests.
Make sure sys_resource test fails gently in that case.
Change-Id: Ic3b5ed8b20acba56df8c5ef082c88e5050e761aa
(cherry picked from commit 4853f40f3fb6664cb1b7af97b6b3e795717026b1)
2015-06-02 14:40:26 -07:00
Yabin Cui
fd20a8c2d6
resolved conflicts for merge of 473d96c0 to lmp-mr1-ub-dev
...
Change-Id: I48269218b152054d527d9257d40490b54205140f
2015-05-20 13:36:56 -07:00
Yabin Cui
473d96c0a8
Merge "Fix timer flaky test in lollipop-mr1-cts-dev." into lollipop-mr1-cts-dev
2015-05-09 00:07:45 +00:00
Yabin Cui
5c0996a969
Fix timer flaky test in lollipop-mr1-cts-dev.
...
It is partically cherry-pick from https://android-review.googlesource.com/#/c/123410/ .
And as lollipop-mr1-cts-dev still uses stlport, <stdatomic.h> is used instead of <atomic>.
Bug: 20677618
Change-Id: I952a6fd074facc4227c955fecf3ecbfbbaec4193
2015-05-08 13:12:01 -07:00
Nick Kralevich
bb4961cd4f
am 1d76f1cc: Merge "add a fortified implementation of realpath"
...
* commit '1d76f1cc8be1f40141adac6147cd51061f1ee0b4':
add a fortified implementation of realpath
2015-04-26 02:44:29 +00:00
Nick Kralevich
1d76f1cc8b
Merge "add a fortified implementation of realpath"
2015-04-26 02:23:04 +00:00
Nick Kralevich
73621d02ec
am 42502d70: Merge "add fortified memchr/memrchr implementations"
...
* commit '42502d702e1625c9f3337f7a18ea5fc4cfc6090c':
add fortified memchr/memrchr implementations
2015-04-25 21:41:45 +00:00
Nick Kralevich
42502d702e
Merge "add fortified memchr/memrchr implementations"
2015-04-25 21:29:57 +00:00
Dmitriy Ivanov
a644176578
am 2eaff078: Merge "Include pthread_atfork.h to mips64 crtbegin"
...
* commit '2eaff07839393485fec522fd0bd17bbf1af72ca6':
Include pthread_atfork.h to mips64 crtbegin
2015-04-25 19:42:22 +00:00
Dmitriy Ivanov
2eaff07839
Merge "Include pthread_atfork.h to mips64 crtbegin"
2015-04-25 19:20:00 +00:00
Dmitriy Ivanov
f327fae69c
Include pthread_atfork.h to mips64 crtbegin
...
Bug: http://b/20339788
Change-Id: I2a8c7881f90a05ca768cb9b4c2f8b07c74c64469
2015-04-25 11:59:32 -07:00
Elliott Hughes
ea46b36f89
am 9a2744df: Merge "Fix POSIX timer thread naming."
...
* commit '9a2744df301c509ea48361016ab441c792ec6d5a':
Fix POSIX timer thread naming.
2015-04-25 18:23:51 +00:00
Elliott Hughes
9a2744df30
Merge "Fix POSIX timer thread naming."
2015-04-25 18:01:18 +00:00
Elliott Hughes
d1aea30b2a
Fix POSIX timer thread naming.
...
Spencer Low points out that we never actually set a name because the constant
part of the string was longer than the kernel's maximum, and the kernel
rejects long names rather than truncate.
Shorten the fixed part of the string while still keeping it meaningful. 9999
POSIX timers should be enough for any process...
Bug: https://code.google.com/p/android/issues/detail?id=170089
Change-Id: Ic05f07584c1eac160743519091a540ebbf8d7eb1
2015-04-25 10:05:24 -07:00
Dmitriy Ivanov
f41ab7fa68
am 2c256a0f: Merge "Unregister pthread_atfork handlers on dlclose()"
...
* commit '2c256a0f0927abd94f2210b37c18ead210d30477':
Unregister pthread_atfork handlers on dlclose()
2015-04-25 05:52:51 +00:00
Dmitriy Ivanov
2c256a0f09
Merge "Unregister pthread_atfork handlers on dlclose()"
2015-04-25 05:36:07 +00:00
Dmitriy Ivanov
504e76055c
am 440242f0: Merge "Use bfd linker for x86/x86_64 targets"
...
* commit '440242f03805872a0c62528d763e5e98dad9b580':
Use bfd linker for x86/x86_64 targets
2015-04-25 04:27:52 +00:00
Dmitriy Ivanov
440242f038
Merge "Use bfd linker for x86/x86_64 targets"
2015-04-25 04:09:43 +00:00
Dmitriy Ivanov
e91e66f223
Use bfd linker for x86/x86_64 targets
...
ld.gold in current toolchain for x86_64
does not support -z global.
Change-Id: Iea2b192f0f0aa998a02adb356fd4eec4e10a1739
2015-04-24 21:05:49 -07:00
Dmitriy Ivanov
1f4c9067af
am ebfb55e4: Merge "Enable dlsym_df_1_global test for arm/arm64"
...
* commit 'ebfb55e4cdf03473d66eaf5928fb3c3a8b0c2f85':
Enable dlsym_df_1_global test for arm/arm64
2015-04-25 01:10:54 +00:00
Dmitriy Ivanov
ea295f68f1
Unregister pthread_atfork handlers on dlclose()
...
Bug: http://b/20339788
Change-Id: I874c87faa377645fa9e0752f4fc166d81fd9ef7e
2015-04-24 17:57:37 -07:00
Dmitriy Ivanov
ebfb55e4cd
Merge "Enable dlsym_df_1_global test for arm/arm64"
2015-04-25 00:50:05 +00:00
Dmitriy Ivanov
6612d7a347
Enable dlsym_df_1_global test for arm/arm64
...
Change-Id: I1fdebced93175cb14053e2239e79f97239fc2dc2
2015-04-24 16:26:03 -07:00
Dmitriy Ivanov
71abd9cc2f
am 2bb93482: Merge "Exit normally when relocations are already packed."
...
* commit '2bb93482a7793640205ade2f7316db5b3f5cac19':
Exit normally when relocations are already packed.
2015-04-24 20:05:05 +00:00
Dmitriy Ivanov
2bb93482a7
Merge "Exit normally when relocations are already packed."
2015-04-24 19:42:39 +00:00
Dmitriy Ivanov
b0b9338ff8
Exit normally when relocations are already packed.
...
Bug: http://b/18051137
Change-Id: Idfffac5fe965e3cdeabe6d3b2dcd8c275c6ae5df
2015-04-24 12:39:14 -07:00
Dimitry Ivanov
e5d3ad4abe
am 6c63ee41: Merge "Revert "Unregister pthread_atfork handlers on dlclose()""
...
* commit '6c63ee41ac5a246fb46c51753cd4d50ccae0dd8f':
Revert "Unregister pthread_atfork handlers on dlclose()"
2015-04-24 04:07:13 +00:00
Dimitry Ivanov
6c63ee41ac
Merge "Revert "Unregister pthread_atfork handlers on dlclose()""
2015-04-24 03:49:30 +00:00
Dimitry Ivanov
094f58fb2a
Revert "Unregister pthread_atfork handlers on dlclose()"
...
The visibility control in pthread_atfork.h is incorrect.
It breaks 64bit libc.so by hiding pthread_atfork.
This reverts commit 6df122f8528f9b9fcf7dfea14ae98b0ef66274e1.
Change-Id: I21e4b344d500c6f6de0ccb7420b916c4e233dd34
2015-04-24 03:46:57 +00:00
Dmitriy Ivanov
83ebe0c37b
am 41ebceaf: Merge "Exit normally when packing relocs saves no space."
...
* commit '41ebceaf3ad392b4a3f40d96d5750d95ef206546':
Exit normally when packing relocs saves no space.
2015-04-23 23:13:57 +00:00