Dmitriy Ivanov
f851d60c13
am 8f3b8f52: Merge "Fix arm64 build"
...
* commit '8f3b8f523ed594b48d28ca0b9a2651d209f29e26':
Fix arm64 build
2014-09-03 23:47:01 +00:00
Elliott Hughes
d05ad93003
am 58bb54c3: Merge "Add back a dummy arc4random_stir for compatibility."
...
* commit '58bb54c38bf31fa5cdad8ddbdc44bbed04aaf0cf':
Add back a dummy arc4random_stir for compatibility.
2014-09-03 23:47:00 +00:00
Dmitriy Ivanov
8f3b8f523e
Merge "Fix arm64 build"
2014-09-03 23:36:35 +00:00
Elliott Hughes
58bb54c38b
Merge "Add back a dummy arc4random_stir for compatibility."
2014-09-03 23:34:05 +00:00
Dmitriy Ivanov
5c1a7fdbd5
Fix arm64 build
...
Bug: 14611536
Change-Id: I4f7f4d1f5c0a37ef38fa0956778393f8d7668512
2014-09-03 16:33:08 -07:00
Elliott Hughes
5dea47221a
Add back a dummy arc4random_stir for compatibility.
...
The current arc4random implementation stirs itself as needed, but we
need to keep an arc4random_stir symbol around for binary compatibility.
(cherry-pick of 1e010d60397db706cd3d1c4d5701a2bced441aa8.)
Bug: 17291075
Change-Id: Iaf6171c3ec65c39c1868364d5b35ea280e29a363
2014-09-03 16:30:22 -07:00
Elliott Hughes
1e010d6039
Add back a dummy arc4random_stir for compatibility.
...
The current arc4random implementation stirs itself as needed, but we
need to keep an arc4random_stir symbol around for binary compatibility.
Bug: 17291075
Change-Id: Iaf6171c3ec65c39c1868364d5b35ea280e29a363
2014-09-03 15:53:11 -07:00
Dmitriy Ivanov
af9b0c4dab
am bd00ae89: am 450aaa01: Merge "Register __libc_fini as early as possible."
...
* commit 'bd00ae89921e3715ddbf89a1aac069347e5cf3d4':
Register __libc_fini as early as possible.
2014-09-03 22:49:59 +00:00
Dmitriy Ivanov
bd00ae8992
am 450aaa01: Merge "Register __libc_fini as early as possible."
...
* commit '450aaa018df19464cb4e01ea3059a2a075ebde52':
Register __libc_fini as early as possible.
2014-09-03 22:44:15 +00:00
Dmitriy Ivanov
43ecbc8520
am 40412333: am 8da304b9: Merge "Make string tests check all alignment combinations"
...
* commit '40412333b42910e3edde20072aaf32afe3aaca7f':
Make string tests check all alignment combinations
2014-09-03 22:38:53 +00:00
Dmitriy Ivanov
450aaa018d
Merge "Register __libc_fini as early as possible."
2014-09-03 22:29:59 +00:00
Dmitriy Ivanov
40412333b4
am 8da304b9: Merge "Make string tests check all alignment combinations"
...
* commit '8da304b997bc0f81ebb30fadc79249fafc1c6fce':
Make string tests check all alignment combinations
2014-09-03 22:29:23 +00:00
Dmitriy Ivanov
e880c736d6
Register __libc_fini as early as possible.
...
We want __libc_fini to be called after all the destructors.
Bug: 14611536
Change-Id: Ibb83a94436795ec178fd605fa531ac29608f4a3e
2014-09-03 15:27:29 -07:00
Dmitriy Ivanov
8da304b997
Merge "Make string tests check all alignment combinations"
2014-09-03 22:08:57 +00:00
Dmitriy Ivanov
a3ad450a2e
Load libraries in breadth-first order
...
This patch fixes the problem with symbol search order
for dlsym(RTLD_DEFAULT/RTLD_NEXT, .) by loading libraries
and ld_preloads in correct order.
Bug: https://code.google.com/p/android/issues/detail?id=74255
Change-Id: I4cf84c70dbaabe99310230dfda12385ae5401859
2014-09-03 15:06:14 -07:00
Dan Albert
77ed51e266
am c71129a4: am 28f17701: Merge "Don\'t fail a test just because we aren\'t root."
...
* commit 'c71129a4e82211bc2db62ea10311548da5e2c20f':
Don't fail a test just because we aren't root.
2014-09-03 20:09:51 +00:00
Dan Albert
c71129a4e8
am 28f17701: Merge "Don\'t fail a test just because we aren\'t root."
...
* commit '28f1770101d84153e100ad7bc0628b4ef3b6e85c':
Don't fail a test just because we aren't root.
2014-09-03 19:59:14 +00:00
Dan Albert
28f1770101
Merge "Don't fail a test just because we aren't root."
2014-09-03 18:37:11 +00:00
Dan Albert
69fb9f3f40
Don't fail a test just because we aren't root.
...
If the tests are not being run as root, emit a message and don't
continue with the test.
Change-Id: I352e1a4162caaeb18b81b8daf44797009756dcd9
2014-09-03 11:30:21 -07:00
Elliott Hughes
cf9c3aec2b
am ce19b10f: am cb093d1f: Merge "Upgrade bionic to tzdata2014g." into lmp-dev
...
* commit 'ce19b10f5f9db0e73d911faa3ce35ddd2b0837bf':
Upgrade bionic to tzdata2014g.
2014-09-03 09:12:52 +00:00
Hans Boehm
fd77e895ac
am 5c2c5443: am 9ac60bf8: Make stdatomic.h work with gcc4.6 host compiler
...
* commit '5c2c5443823e30bfb02394f4fc2da06a74bd58df':
Make stdatomic.h work with gcc4.6 host compiler
2014-09-03 09:12:51 +00:00
Andreas Gampe
4e092df34a
am c16f0486: resolved conflicts for merge of 2b10e2f1 to lmp-dev-plus-aosp
...
* commit 'c16f0486fca0df1125cc381d3f4ef3b652d72d29':
Undefine _Atomic before redefining
2014-09-03 09:12:50 +00:00
Elliott Hughes
ce19b10f5f
am cb093d1f: Merge "Upgrade bionic to tzdata2014g." into lmp-dev
...
* commit 'cb093d1f55701da419d1013cc3e6fbb8aea3e957':
Upgrade bionic to tzdata2014g.
2014-09-03 05:07:24 +00:00
Hans Boehm
5c2c544382
am 9ac60bf8: Make stdatomic.h work with gcc4.6 host compiler
...
* commit '9ac60bf82b1f0e316666b862e9924f90caa60342':
Make stdatomic.h work with gcc4.6 host compiler
2014-09-03 05:07:24 +00:00
Dmitriy Ivanov
763d17e22f
am 69fde6b4: am 3b10ba6f: Merge "Add some missing dlclose(.)"
...
* commit '69fde6b4a7c7674c8bbc8fba0b82bcc25fdf0539':
Add some missing dlclose(.)
2014-09-03 05:04:25 +00:00
Dan Albert
6df7c2c80a
am f3ba9f71: am c7de9191: Merge "Start math tests with a clean fenv."
...
* commit 'f3ba9f7171021417a0b6373ecf52136fb5cc9a76':
Start math tests with a clean fenv.
2014-09-03 05:04:20 +00:00
Dan Albert
7681554de8
am 95742d36: am 847e52b9: Merge "Prevent a few test pthread keys from leaking."
...
* commit '95742d36038b459704bdd32e22df35956b5aca0d':
Prevent a few test pthread keys from leaking.
2014-09-03 05:04:17 +00:00
Hans Boehm
cd7f163176
am e8d77291: resolved conflicts for merge of c8cf3513 to lmp-dev-plus-aosp
...
* commit 'e8d77291670ad435491a08f6c3d83881063e2e12':
Fix, generalize stdatomic.h; improve test.
2014-09-03 05:04:16 +00:00
Elliott Hughes
6d84bc4c43
am 6c696754: am ec95a9cf: Merge "MIPS64 syscall() arguments"
...
* commit '6c69675423f3375ba4d9dadfaf9502a15576158c':
MIPS64 syscall() arguments
2014-09-03 05:03:49 +00:00
Andreas Gampe
c16f0486fc
resolved conflicts for merge of 2b10e2f1 to lmp-dev-plus-aosp
...
Change-Id: Ia41583773abbbe1f52d72d1e7f4b925e621d28ff
2014-09-02 22:02:48 -07:00
Dmitriy Ivanov
69fde6b4a7
am 3b10ba6f: Merge "Add some missing dlclose(.)"
...
* commit '3b10ba6f1b743ddced32474891ff6d1cb83c027a':
Add some missing dlclose(.)
2014-09-03 01:08:16 +00:00
Dmitriy Ivanov
3b10ba6f1b
Merge "Add some missing dlclose(.)"
2014-09-03 00:36:22 +00:00
Dmitriy Ivanov
319356e39c
Add some missing dlclose(.)
...
Bug: 17358010
Change-Id: I9e427b7681f1a8fe890b0b47812d9e65ab95c792
2014-09-02 17:31:44 -07:00
Dan Albert
f3ba9f7171
am c7de9191: Merge "Start math tests with a clean fenv."
...
* commit 'c7de919129098bac259f66f973888b1814ae0d1a':
Start math tests with a clean fenv.
2014-09-02 23:35:33 +00:00
Dan Albert
c7de919129
Merge "Start math tests with a clean fenv."
2014-09-02 23:11:42 +00:00
Dan Albert
95742d3603
am 847e52b9: Merge "Prevent a few test pthread keys from leaking."
...
* commit '847e52b9b7bca9dee20e33d1006dfc23885e7494':
Prevent a few test pthread keys from leaking.
2014-09-02 23:02:57 +00:00
Dan Albert
6676a7d4ee
Start math tests with a clean fenv.
...
We always want the default floating point environment when running these
tests.
Bug: 17358010
Change-Id: I6ca2552e9f2d3e07d7b9dcaf0aec66905401c466
2014-09-02 16:00:10 -07:00
Dan Albert
847e52b9b7
Merge "Prevent a few test pthread keys from leaking."
2014-09-02 22:43:18 +00:00
Hans Boehm
e8d7729167
resolved conflicts for merge of c8cf3513 to lmp-dev-plus-aosp
...
Change-Id: If1181e3496d0309eebbaa1f1d2696269e61c64bc
2014-09-02 15:24:33 -07:00
Dan Albert
1d53ae2a01
Prevent a few test pthread keys from leaking.
...
Bug: 17358010
Change-Id: Ie718dc215ddfd431650295a1630c1b1716760c3d
2014-09-02 15:24:26 -07:00
Elliott Hughes
cb093d1f55
Merge "Upgrade bionic to tzdata2014g." into lmp-dev
2014-09-02 21:39:03 +00:00
Elliott Hughes
6c69675423
am ec95a9cf: Merge "MIPS64 syscall() arguments"
...
* commit 'ec95a9cf11f7c4d2211c61da7ce05262a54409d1':
MIPS64 syscall() arguments
2014-09-02 21:18:55 +00:00
Elliott Hughes
ec95a9cf11
Merge "MIPS64 syscall() arguments"
2014-09-02 20:53:31 +00:00
Dmitriy Ivanov
32ef431b6c
am a1d14f62: am 86f594b1: Merge "Encapsulate soinfo_link_image and soinfo_relocate"
...
* commit 'a1d14f62f6efb78dbb601c0c2be79a036da05854':
Encapsulate soinfo_link_image and soinfo_relocate
2014-09-02 19:53:32 +00:00
Dmitriy Ivanov
a1d14f62f6
am 86f594b1: Merge "Encapsulate soinfo_link_image and soinfo_relocate"
...
* commit '86f594b19bc51ffe87bfacb6b42687af94c3c648':
Encapsulate soinfo_link_image and soinfo_relocate
2014-09-02 19:45:29 +00:00
Chris Dearman
296895f1a9
MIPS64 syscall() arguments
...
The seventh argument for syscall is passed in a register, not on the stack
Change-Id: Idb69fac77d1f710cff5a3ab4ae1259feb61ae69d
2014-09-02 12:41:01 -07:00
Dmitriy Ivanov
86f594b19b
Merge "Encapsulate soinfo_link_image and soinfo_relocate"
2014-09-02 19:25:09 +00:00
Dmitriy Ivanov
29bbc9dd4c
Encapsulate soinfo_link_image and soinfo_relocate
...
Also get rid of needed[] array for these functions
Change-Id: I8d12887dbec0724309bb171e6bbd9b9ceb32cc70
2014-09-02 11:47:23 -07:00
Elliott Hughes
299647b814
am a5d70a4b: am 4625dd75: Merge "Upgrade bionic to tzdata2014g."
...
* commit 'a5d70a4b15c3c6a7eddd2a4593ad28fa8846f383':
Upgrade bionic to tzdata2014g.
2014-09-02 18:42:28 +00:00
Hans Boehm
9ac60bf82b
Make stdatomic.h work with gcc4.6 host compiler
...
This is needed to make L work correctly, and bionic tests pass
again, after applying the equivalent of
commit 00aaea364501b3b0abe58dae461136159df1e356 there.
It makes the preexisting code that uses __sync implementations
much more useful, although we should no longer be exercising that
code in AOSP.
Specifically fixes:
We were invoking __has_extension and __has_builtin for GCC compilations.
They're clang specific. Restructured the tests.
The __sync implementation was not defining the LOCK_FREE macros.
ATOMIC_VAR_INIT was using named field initializations. These are a
C, not C++, feature, that is not supported by g++ 4.6.
The stdatomic bionic test still failed with 4.6 and glibc with our
questionable LOCK_FREE macro implementation. Don't run that piece
with 4.6.
In L, this is a prerequisite for fixing:
Bug:16880454
Bug:16513433
Change-Id: I9b61e42307f96a114dce7552b6ead4ad1c544eab
(cherry picked from commit 32429606bf696d3b2ca555f132a0d60c566d0bd0)
2014-09-02 11:37:02 -07:00