Dan Albert
5ffe3971e5
am f2aacebf: am ad136624: Merge "Never use ASAN."
...
* commit 'f2aacebf551da2b8d828f0618c84ac544e1398fb':
Never use ASAN.
2014-10-22 13:18:33 +00:00
Ying Wang
3c5c720b0b
Build dlext_testzip as custom module.
...
Use $(BUILD_SYSTEM)/base_rules to build it as custom module, so that
it's exposed to utilities like mm/mmma etc.
Bug: 17887283
Bug: 17762003
(cherry picked from commit 667853d47770fbdb54aaf0b3261b0d4882725770)
Change-Id: I405797d16f20dc09e5d84b93b6727b634db2fc2c
2014-10-22 08:30:43 +00:00
Christopher Ferris
0724132c32
Fix race condition in timer disarm/delete.
...
When setting a repeat timer using the SIGEV_THREAD mechanism, it's possible
that the callback can be called after the timer is disarmed or deleted.
This happens because the kernel can generate signals that the timer thread
will continue to handle even after the timer is supposed to be off.
Add two new tests to verify that disarming/deleting doesn't continue to
call the callback.
Modify the repeat test to finish more quickly than before.
Refactor the Counter implementation a bit.
Bug: 18039727
Change-Id: I73192c915cdacf608521b1792c54e5af14a34907
2014-10-21 18:31:02 -07:00
Chih-Hung Hsieh
098cf45f4e
Merge "Replace ambiguous cmp operator with cmpl."
2014-10-22 00:55:14 +00:00
Chih-Hung Hsieh
c89ee272fb
Replace ambiguous cmp operator with cmpl.
...
Clang assembler rejects ambiguous cmp instruction.
BUG: 17302482
Change-Id: Ie8dca7e4f46e0906c47076bba21c1941482ba6b3
2014-10-21 16:25:35 -07:00
Dan Albert
f2aacebf55
am ad136624: Merge "Never use ASAN."
...
* commit 'ad136624b2bed5b6971cd7ba372969b1b352c223':
Never use ASAN.
2014-10-21 21:33:59 +00:00
Dmitriy Ivanov
54d76360eb
Merge "Rename library_offset to library_fd_offset"
2014-10-21 21:06:18 +00:00
Dmitriy Ivanov
de01780f46
Add file_offset parameter to android_extinfo
...
Bug: 17762003
(cherry picked from commit 07e5bc152d8a3ad4c50808bb86f3c0f2c5e2f514)
Change-Id: I72d527831384ff5dde013a4c8dfe639fbec165f5
2014-10-21 13:52:49 -07:00
Dmitriy Ivanov
a6c1279098
Rename library_offset to library_fd_offset
...
replace lseek() and use pread() instead
add test for library_fd_offset > file_size case
Bug: 17762003
Change-Id: I4555f0be635124efe849c1f226985bcba72ffcbd
2014-10-21 13:51:08 -07:00
Dan Albert
ad136624b2
Merge "Never use ASAN."
2014-10-21 18:28:19 +00:00
Dan Albert
5ba672ebcb
Never use ASAN.
...
Unless we completely redo how we build bionic (so that the object
files for libc.so get built separately from libc.a), we can't enable
ASAN here, as libc.a gets linked into static executables.
Change-Id: I2ce4f51248bd51c4213a555ff481b6faabbf53f8
2014-10-21 11:22:26 -07:00
Hans Boehm
e3d979d45d
am 361282af: am c712ceee: Make memory_order_acquire visible in global namespace
...
* commit '361282afd81e6259fa8a62ab46b83da8b50249fe':
Make memory_order_acquire visible in global namespace
2014-10-20 23:41:37 +00:00
Hans Boehm
361282afd8
am c712ceee: Make memory_order_acquire visible in global namespace
...
* commit 'c712ceeec4c15da8488c5ce143fcc6b0a02d74f3':
Make memory_order_acquire visible in global namespace
2014-10-20 23:36:11 +00:00
Christopher Ferris
c8643850d7
am 941ee802: am 8f41d3d3: Merge "Fix generic __memcpy_chk implementation."
...
* commit '941ee80292cfdbf95a30da82f7be2e662d1f269e':
Fix generic __memcpy_chk implementation.
2014-10-20 18:44:47 +00:00
Hans Boehm
c712ceeec4
Make memory_order_acquire visible in global namespace
...
We were missing that using directive when including <atomic>.
Bug:17736764
Change-Id: Ie8ca92a952749415567bcd5fa21d56629a364660
(cherry picked from commit 76ac4d0853c3bba0c65edc98a9cdf932c452e252)
2014-10-20 11:41:34 -07:00
Christopher Ferris
941ee80292
am 8f41d3d3: Merge "Fix generic __memcpy_chk implementation."
...
* commit '8f41d3d3bc7cf2375e5dd9202da619fd67a5928f':
Fix generic __memcpy_chk implementation.
2014-10-20 18:38:43 +00:00
Christopher Ferris
bc8745cc3d
am 8f41d3d3: Merge "Fix generic __memcpy_chk implementation."
...
* commit '8f41d3d3bc7cf2375e5dd9202da619fd67a5928f':
Fix generic __memcpy_chk implementation.
2014-10-20 18:38:27 +00:00
Christopher Ferris
8f41d3d3bc
Merge "Fix generic __memcpy_chk implementation."
2014-10-20 18:21:22 +00:00
Chih-Hung Hsieh
2860a41dd0
am 2c87eba8: am 9a740482: Merge "Add -no-integrated-as at local level."
...
* commit '2c87eba8693c1c7cd03e9b90f686a1415fb2d9c0':
Add -no-integrated-as at local level.
2014-10-20 17:04:30 +00:00
Chih-Hung Hsieh
042319b908
am 9a740482: Merge "Add -no-integrated-as at local level."
...
* commit '9a7404824b3dfaad6ba14a41aab5f14132392a92':
Add -no-integrated-as at local level.
2014-10-20 17:02:32 +00:00
Chih-Hung Hsieh
2c87eba869
am 9a740482: Merge "Add -no-integrated-as at local level."
...
* commit '9a7404824b3dfaad6ba14a41aab5f14132392a92':
Add -no-integrated-as at local level.
2014-10-20 17:01:48 +00:00
Chih-Hung Hsieh
9a7404824b
Merge "Add -no-integrated-as at local level."
2014-10-20 16:51:06 +00:00
Chih-Hung Hsieh
a371750681
Add -no-integrated-as at local level.
...
Later we will enable integrated-as as default at the global level.
BUG: 17820427
BUG: 17302991
Change-Id: I233204ca04d7222b2cb1fbd0fa48a482f8b63f6f
2014-10-20 09:09:25 -07:00
Christopher Ferris
7123d4371a
Fix generic __memcpy_chk implementation.
...
- Clean up the labels (add .L to make them local).
- Change to using cfi directives.
- Fix unwinding of the __memcpy_chk fail path.
Bug: 18033671
Change-Id: I12845f10c7ce5e6699c15c558bda64c83f6a392a
2014-10-17 14:44:36 -07:00
Dmitriy Ivanov
a90660f7d0
am 68c41a89: am dec4de45: Merge "Correct way to specify additional dependencies"
...
* commit '68c41a890dc2d0d95fc1569ffb2e4bcecd603432':
Correct way to specify additional dependencies
2014-10-17 21:28:44 +00:00
Dmitriy Ivanov
68c41a890d
am dec4de45: Merge "Correct way to specify additional dependencies"
...
* commit 'dec4de456c046881fb1e8c7c7d0c27a11ef09eb7':
Correct way to specify additional dependencies
2014-10-17 20:34:39 +00:00
Dmitriy Ivanov
d8c3171172
am dec4de45: Merge "Correct way to specify additional dependencies"
...
* commit 'dec4de456c046881fb1e8c7c7d0c27a11ef09eb7':
Correct way to specify additional dependencies
2014-10-17 20:33:55 +00:00
Dmitriy Ivanov
dec4de456c
Merge "Correct way to specify additional dependencies"
android-l-preview_r2
2014-10-17 20:19:18 +00:00
Dmitriy Ivanov
4a9e1937c5
Correct way to specify additional dependencies
...
Previous one was not covering all the targets
Bug: 17548097
Change-Id: I425e0f8d6e5a43feabd29dcb327049b82754d249
2014-10-17 11:47:18 -07:00
Dmitriy Ivanov
b312428b5e
am d7407db0: am 5281e1fb: Merge "Fix misleading comment."
...
* commit 'd7407db08f528a5c0ccc96314eeced3e46a34f9d':
Fix misleading comment.
2014-10-16 18:08:45 +00:00
Dmitriy Ivanov
d7407db08f
am 5281e1fb: Merge "Fix misleading comment."
...
* commit '5281e1fb15632c8dc714d10abc6cd1a22a061782':
Fix misleading comment.
2014-10-16 18:03:07 +00:00
Dmitriy Ivanov
d932c36385
am 5281e1fb: Merge "Fix misleading comment."
...
* commit '5281e1fb15632c8dc714d10abc6cd1a22a061782':
Fix misleading comment.
2014-10-16 18:02:17 +00:00
Dmitriy Ivanov
5281e1fb15
Merge "Fix misleading comment."
2014-10-16 17:54:02 +00:00
Dan Albert
4066336a25
am 34de37e5: am 90aa7e37: Merge "Only use <atomic> for C++11 and newer."
...
* commit '34de37e553d83fb4522c1458bf82d8e8aee4c2bb':
Only use <atomic> for C++11 and newer.
2014-10-16 16:32:21 +00:00
Dan Albert
96def860ae
am 90aa7e37: Merge "Only use <atomic> for C++11 and newer."
...
* commit '90aa7e374f9000577cde64c4fb88c5dab8dac62e':
Only use <atomic> for C++11 and newer.
2014-10-16 16:27:37 +00:00
Dan Albert
34de37e553
am 90aa7e37: Merge "Only use <atomic> for C++11 and newer."
...
* commit '90aa7e374f9000577cde64c4fb88c5dab8dac62e':
Only use <atomic> for C++11 and newer.
2014-10-16 16:27:27 +00:00
Dan Albert
90aa7e374f
Merge "Only use <atomic> for C++11 and newer."
2014-10-16 16:19:44 +00:00
Dan Albert
cec6fd91cd
am 574284db: am 8bb12127: Merge "Don\'t use an STL for libm."
...
* commit '574284dbf27a58cb4c4be97a0a8a09f56fe65f52':
Don't use an STL for libm.
2014-10-16 16:10:05 +00:00
Dan Albert
574284dbf2
am 8bb12127: Merge "Don\'t use an STL for libm."
...
* commit '8bb12127e62c1fc4d9dc99ce9272008023c7c08e':
Don't use an STL for libm.
2014-10-16 16:06:10 +00:00
Dan Albert
c2d70c0f34
am 8bb12127: Merge "Don\'t use an STL for libm."
...
* commit '8bb12127e62c1fc4d9dc99ce9272008023c7c08e':
Don't use an STL for libm.
2014-10-16 16:05:31 +00:00
Dan Albert
8bb12127e6
Merge "Don't use an STL for libm."
2014-10-16 15:56:32 +00:00
Dan Albert
3ce0769aa5
Only use <atomic> for C++11 and newer.
...
Any pre-C++11 clients of stdatomic.h that use libc++ are being forced
over to <atomic>, which they don't have the language support to use.
Change-Id: I62445c1f2541410a1569498c09433c7196635537
2014-10-16 07:52:51 -07:00
Dan Albert
e91d9cd4ad
Don't use an STL for libm.
...
The default is none right now, but this will be needed when the
default becomes libc++.
Change-Id: Ib022adac2b9dc08fbfae830908128043cfffb91e
2014-10-16 07:44:47 -07:00
Dmitriy Ivanov
b2d11387c4
am ab3f96cb: am f5e02582: Merge "Ignore DT_BIND_NOW (0x18)"
...
* commit 'ab3f96cb20084cf5a9aa299a508be8c462dc9308':
Ignore DT_BIND_NOW (0x18)
2014-10-16 00:07:20 +00:00
Dmitriy Ivanov
ab3f96cb20
am f5e02582: Merge "Ignore DT_BIND_NOW (0x18)"
...
* commit 'f5e0258268b45faa4d84de34047660061720abc7':
Ignore DT_BIND_NOW (0x18)
2014-10-15 23:57:28 +00:00
Dmitriy Ivanov
bb5f4eebc0
am f5e02582: Merge "Ignore DT_BIND_NOW (0x18)"
...
* commit 'f5e0258268b45faa4d84de34047660061720abc7':
Ignore DT_BIND_NOW (0x18)
2014-10-15 23:57:28 +00:00
Dmitriy Ivanov
f5e0258268
Merge "Ignore DT_BIND_NOW (0x18)"
2014-10-15 23:46:26 +00:00
Dmitriy Ivanov
ea6eae182a
Ignore DT_BIND_NOW (0x18)
...
Bug: 17552334
Change-Id: Ibe93fd3d6580f369f9a6ef8d235bf0df00fe7607
2014-10-15 22:57:14 +00:00
Robert Grosse
4544d9f9bf
Fix misleading comment.
...
Change-Id: I9e2aa6c2ba938c8f8d7c74eba32d313c866c77b2
2014-10-15 14:32:19 -07:00
Dan Albert
2ed2148d58
am 21df7992: am 71cbcdcf: Merge "We don\'t actually need all of libc++ here."
...
* commit '21df799218eb39dd66ccdf92045a885fff5eb14e':
We don't actually need all of libc++ here.
2014-10-15 20:16:18 +00:00