Elliott Hughes
f6116c5ea1
am 81b5f9f4: am 6bec3484: Merge "Remove __ARM_HAVE_LDREXD."
...
* commit '81b5f9f42f037690be5fbcb9501bd37e1f8bb3c1':
Remove __ARM_HAVE_LDREXD.
2014-12-03 02:47:46 +00:00
Elliott Hughes
39bf9593c4
am 52b3cbae: am f840cefa: Merge "Kill <machine/exec.h>."
...
* commit '52b3cbae58e9069eebb09b913cf51a3a2781813d':
Kill <machine/exec.h>.
2014-12-03 02:47:45 +00:00
Elliott Hughes
5f48eda760
am baf792bf: Merge "Remove __ARM_HAVE_HALFWORD_MULTIPLY."
...
* commit 'baf792bff86f9be6f631eece17d9d104cfe54b41':
Remove __ARM_HAVE_HALFWORD_MULTIPLY.
2014-12-03 02:37:35 +00:00
Elliott Hughes
81b5f9f42f
am 6bec3484: Merge "Remove __ARM_HAVE_LDREXD."
...
* commit '6bec3484ee1e90662c8c5e52c71fcdc430a7b619':
Remove __ARM_HAVE_LDREXD.
2014-12-03 02:37:34 +00:00
Elliott Hughes
52b3cbae58
am f840cefa: Merge "Kill <machine/exec.h>."
...
* commit 'f840cefaea5e482e886c81a6b56648399ceb2568':
Kill <machine/exec.h>.
2014-12-03 02:37:33 +00:00
Dmitriy Ivanov
18fa55188c
am 70a2aea6: am ad8e339a: am 6995c1dc: Merge "Extract bionic-prepare-run-on-host to inc file."
...
* commit '70a2aea6e8df5e5c24b0d83c0a3a2ff34f43e718':
Extract bionic-prepare-run-on-host to inc file.
2014-12-03 02:21:16 +00:00
Dmitriy Ivanov
5ae82cba59
Fix soinfo_unload
...
1. Take into consideration that the local_group_root_
is not set for all of not linked libraries.
2. We need to check visited list earlier to avoid double
soinfo_free.
Change-Id: Iabc0a06a97c63f7e6bd4641731f50bb1466fed4f
2014-12-02 17:28:34 -08:00
Elliott Hughes
baf792bff8
Merge "Remove __ARM_HAVE_HALFWORD_MULTIPLY."
2014-12-03 01:12:48 +00:00
Elliott Hughes
a5602c566e
Remove __ARM_HAVE_HALFWORD_MULTIPLY.
...
Bug: 18556103
Change-Id: I17e498539f77ddf7d1fb980ee93155d3c3ccd85e
2014-12-02 16:58:17 -08:00
Elliott Hughes
6bec3484ee
Merge "Remove __ARM_HAVE_LDREXD."
2014-12-03 00:57:28 +00:00
Elliott Hughes
6651aa6bc1
Remove __ARM_HAVE_LDREXD.
...
No one uses this.
Bug: 18556103
Change-Id: Icecc3a7b5cb0a36960f27d030d8f4f8ee471f86c
2014-12-03 00:57:07 +00:00
Elliott Hughes
f840cefaea
Merge "Kill <machine/exec.h>."
2014-12-03 00:42:56 +00:00
Elliott Hughes
84fb1f7ac8
am 66f7b275: Merge "Remove unnecessary #undefs from AOSP." into lmp-mr1-dev-plus-aosp
...
* commit '66f7b2758f909b981503ab228e92707f8c6b4ebc':
Remove unnecessary #undefs from AOSP.
2014-12-03 00:30:51 +00:00
Elliott Hughes
16716ba940
am c28e2797: am cc7e28f1: am 432f763c: Merge "Avoid pathological behavior in OpenBSD\'s fread."
...
* commit 'c28e2797a78f92ba49999710fa5a1cd85b27badc':
Avoid pathological behavior in OpenBSD's fread.
2014-12-03 00:30:45 +00:00
Dmitriy Ivanov
df206647a3
am 7ef5d8b8: am 5811e3fc: am 5cd127d3: Merge "Fix mips build"
...
* commit '7ef5d8b8454443e79f109a5f83ab40e4c602b88d':
Fix mips build
2014-12-03 00:30:15 +00:00
Dmitriy Ivanov
29bf489217
am 20ce0b5b: am 3a43e9f5: am 8dd25905: Merge "Create /system/lib(64)? symlinks for host tests."
...
* commit '20ce0b5b5d666dd9d0ff41375623bde22670af7b':
Create /system/lib(64)? symlinks for host tests.
2014-12-03 00:30:14 +00:00
Yabin Cui
9a4af8123a
am 864ba276: am 5fea4532: am 4e7d66dd: Merge "Use mmap to create the pthread_internal_t."
...
* commit '864ba276f96b23835938cd0875cc5fe682ff6b6d':
Use mmap to create the pthread_internal_t.
2014-12-03 00:30:01 +00:00
Dmitriy Ivanov
c652606558
am e92b30af: am 8d94e2e0: am 291dbf65: Merge "Count references for groups instead of instances"
...
* commit 'e92b30af6752104f86c564ccec66fc1d0f5be475':
Count references for groups instead of instances
2014-12-03 00:30:00 +00:00
Elliott Hughes
b514026eb2
Kill <machine/exec.h>.
...
Bug: 18546535
Change-Id: I479e003deab21e31eb5caa5393067ed1dc558387
2014-12-02 16:16:29 -08:00
Dmitriy Ivanov
70a2aea6e8
am ad8e339a: am 6995c1dc: Merge "Extract bionic-prepare-run-on-host to inc file."
...
* commit 'ad8e339a565af518bcda51e5ebbc536aa63de9e3':
Extract bionic-prepare-run-on-host to inc file.
2014-12-03 00:12:54 +00:00
Dmitriy Ivanov
ad8e339a56
am 6995c1dc: Merge "Extract bionic-prepare-run-on-host to inc file."
...
* commit '6995c1dcb5a9ad77a54d950fc24f5aba00909b69':
Extract bionic-prepare-run-on-host to inc file.
2014-12-03 00:07:38 +00:00
Dmitriy Ivanov
6995c1dcb5
Merge "Extract bionic-prepare-run-on-host to inc file."
2014-12-03 00:02:13 +00:00
Dmitriy Ivanov
06b1b8ceac
Extract bionic-prepare-run-on-host to inc file.
...
Make benchmark run-on-host depend on bionic-prepare-run-on-host.
Change-Id: I0bdbf561b2580d607a49b7c83cc273320ac55429
2014-12-02 15:15:34 -08:00
Elliott Hughes
66f7b2758f
Merge "Remove unnecessary #undefs from AOSP." into lmp-mr1-dev-plus-aosp
2014-12-02 23:00:37 +00:00
Elliott Hughes
27d276f3a6
Avoid pathological behavior in OpenBSD's fread.
...
(cherry picked from commit 20841a137beac5caa824e3586c7bd91d879ff92e)
Bug: https://code.google.com/p/android/issues/detail?id=81155
Bug: 18556607
Change-Id: Ibdfebc20dce4c34ad565014523c9b074e90ea665
2014-12-02 14:54:52 -08:00
Elliott Hughes
6c1e3f6e56
Remove unnecessary #undefs from AOSP.
...
This is a manual revert of 111461aaaec2b7d9ffa5f3baabb1bd019d2e0c1d.
git revert does the wrong thing because that patch shares lines (that we
want to keep) with 168667c972a1e9ede5b64ad6cee0666e9b96d4d8 and git
revert just removes them.
Change-Id: I83ac8c95e5c90a4137b7742a9b7536e1627f1ac7
2014-12-02 14:50:20 -08:00
Elliott Hughes
c28e2797a7
am cc7e28f1: am 432f763c: Merge "Avoid pathological behavior in OpenBSD\'s fread."
...
* commit 'cc7e28f111bfa5cd859ab7ac4eac8f98d9f10af3':
Avoid pathological behavior in OpenBSD's fread.
2014-12-02 22:49:36 +00:00
Elliott Hughes
cc7e28f111
am 432f763c: Merge "Avoid pathological behavior in OpenBSD\'s fread."
...
* commit '432f763c0c370870b653537342aff87fac862d97':
Avoid pathological behavior in OpenBSD's fread.
2014-12-02 22:45:07 +00:00
Elliott Hughes
432f763c0c
Merge "Avoid pathological behavior in OpenBSD's fread."
2014-12-02 22:40:53 +00:00
Elliott Hughes
20841a137b
Avoid pathological behavior in OpenBSD's fread.
...
Bug: https://code.google.com/p/android/issues/detail?id=81155
Bug: 18556607
Change-Id: Idc60976b79610e2202cc42dc393dcb4ca6c42e05
2014-12-02 14:22:02 -08:00
Dmitriy Ivanov
7ef5d8b845
am 5811e3fc: am 5cd127d3: Merge "Fix mips build"
...
* commit '5811e3fce16d2394654447ae9ee504149b7e1000':
Fix mips build
2014-12-02 22:13:59 +00:00
Dmitriy Ivanov
20ce0b5b5d
am 3a43e9f5: am 8dd25905: Merge "Create /system/lib(64)? symlinks for host tests."
...
* commit '3a43e9f5dbc129bdac5ca3397699a5c94dfd131d':
Create /system/lib(64)? symlinks for host tests.
2014-12-02 22:13:58 +00:00
Yabin Cui
864ba276f9
am 5fea4532: am 4e7d66dd: Merge "Use mmap to create the pthread_internal_t."
...
* commit '5fea45328f7a596ab2040c8ea2fe227cf1752a07':
Use mmap to create the pthread_internal_t.
2014-12-02 22:00:39 +00:00
Dmitriy Ivanov
e92b30af67
am 8d94e2e0: am 291dbf65: Merge "Count references for groups instead of instances"
...
* commit '8d94e2e0d7c7c4a5cc8c73d424c499db333713c8':
Count references for groups instead of instances
2014-12-02 22:00:37 +00:00
Dmitriy Ivanov
5811e3fce1
am 5cd127d3: Merge "Fix mips build"
...
* commit '5cd127d3aa4a2f225be202af01581838fdd3c721':
Fix mips build
2014-12-02 21:42:57 +00:00
Dmitriy Ivanov
5cd127d3aa
Merge "Fix mips build"
2014-12-02 21:37:50 +00:00
Dmitriy Ivanov
3a43e9f5db
am 8dd25905: Merge "Create /system/lib(64)? symlinks for host tests."
...
* commit '8dd2590549ac85b2fe20329842cf385fb3ed5c95':
Create /system/lib(64)? symlinks for host tests.
2014-12-02 21:35:11 +00:00
Dmitriy Ivanov
8dd2590549
Merge "Create /system/lib(64)? symlinks for host tests."
2014-12-02 21:30:12 +00:00
Dmitriy Ivanov
20463e3e53
Fix mips build
...
Change-Id: Iddbf06784d19556a55d833e20a68e6ccf5a7c5be
2014-12-02 13:27:40 -08:00
Dmitriy Ivanov
a55126f1f6
Create /system/lib(64)? symlinks for host tests.
...
Replace LD_LIBRARY_PATH with default path for
the tests run on host.
Bug: 18589961
Change-Id: Id4a84b73d25c2ca9c557fcfa19b8169daeaa016b
2014-12-02 12:11:08 -08:00
Yabin Cui
5fea45328f
am 4e7d66dd: Merge "Use mmap to create the pthread_internal_t."
...
* commit '4e7d66ddb55a9d5f23ae80b6e6569733adf9262a':
Use mmap to create the pthread_internal_t.
2014-12-02 19:53:14 +00:00
Yabin Cui
4e7d66ddb5
Merge "Use mmap to create the pthread_internal_t."
2014-12-02 19:45:48 +00:00
Dmitriy Ivanov
8d94e2e0d7
am 291dbf65: Merge "Count references for groups instead of instances"
...
* commit '291dbf65cadeccbb33e60b33fbe9f5f48c8763ff':
Count references for groups instead of instances
2014-12-02 19:36:09 +00:00
Elliott Hughes
a271528462
am 12b7dd09: am 152e978f: Merge "Put stdin/stdout/stderr symbols in place." into lmp-mr1-dev
...
* commit '12b7dd0900a6760a47c765decfc6cdec75883d35':
Put stdin/stdout/stderr symbols in place.
2014-12-02 19:35:04 +00:00
Elliott Hughes
12b7dd0900
am 152e978f: Merge "Put stdin/stdout/stderr symbols in place." into lmp-mr1-dev
...
* commit '152e978f73fc6cd37d0d82de69f1cf8134b34b90':
Put stdin/stdout/stderr symbols in place.
2014-12-02 19:16:51 +00:00
Dmitriy Ivanov
291dbf65ca
Merge "Count references for groups instead of instances"
2014-12-02 19:10:04 +00:00
Yabin Cui
42e664f763
am de88381c: am b2ec9cb2: am 46d0b81a: Merge "restore sigprocmask in setjmp/longjmp test."
...
* commit 'de88381c19ad9a23b5d26eb51b7591a7e7e6be50':
restore sigprocmask in setjmp/longjmp test.
2014-12-02 19:05:28 +00:00
Elliott Hughes
152e978f73
Merge "Put stdin/stdout/stderr symbols in place." into lmp-mr1-dev
2014-12-02 18:56:50 +00:00
Yabin Cui
de88381c19
am b2ec9cb2: am 46d0b81a: Merge "restore sigprocmask in setjmp/longjmp test."
...
* commit 'b2ec9cb264ed1aadd1a2d938785d28ceb9fc16c4':
restore sigprocmask in setjmp/longjmp test.
2014-12-02 18:56:12 +00:00
Dmitriy Ivanov
ab972b9adf
Count references for groups instead of instances
...
Count references on the group level to avoid
partially unloading function that might be
referenced by other libraries in the local_group
Bonus: with this change we can correctly unload recursively
linked libraries. is_recursive check is removed.
Also dynamic executables (not .so) with 0 DT_NEEDED libraries
are now correctly linked.
Change-Id: Idfa83baef402840599b93a875f2881d9f020dbcd
2014-12-02 10:54:26 -08:00