Elliott Hughes
af8d8f2c88
resolved conflicts for merge of 27d276f3 to lmp-mr1-dev-plus-aosp
...
Change-Id: I905890e17f90ca5e2b73a61176da6f6a36c0d345
2014-12-03 12:37:34 -08:00
Elliott Hughes
308c4d3fb1
am b06e125c: am 91a61f77: Merge "Switch x86 and x86-64 to __builtin_bswap*."
...
* commit 'b06e125c01ff30cc3835d6c8c025e256a82356bf':
Switch x86 and x86-64 to __builtin_bswap*.
2014-12-03 17:31:35 +00:00
Elliott Hughes
855916362c
am 58543de7: am 244299f4: Merge "Switch aarch64 to __builtin_bswap16."
...
* commit '58543de7215df81859e8ada22210773d4ab0ea82':
Switch aarch64 to __builtin_bswap16.
2014-12-03 17:31:34 +00:00
Dmitriy Ivanov
44ea65b395
am 57eed1ab: am 8408d7ef: Merge "Fix soinfo_unload"
...
* commit '57eed1ab38dc2bcc458418b57f194efda055a50b':
Fix soinfo_unload
2014-12-03 17:31:33 +00:00
Elliott Hughes
b06e125c01
am 91a61f77: Merge "Switch x86 and x86-64 to __builtin_bswap*."
...
* commit '91a61f77e203bf519c28f9331b9c8db731869499':
Switch x86 and x86-64 to __builtin_bswap*.
2014-12-03 17:23:29 +00:00
Elliott Hughes
58543de721
am 244299f4: Merge "Switch aarch64 to __builtin_bswap16."
...
* commit '244299f4e0b58e48b5fdb15fc10a7327e0c32cf9':
Switch aarch64 to __builtin_bswap16.
2014-12-03 17:23:28 +00:00
Dmitriy Ivanov
57eed1ab38
am 8408d7ef: Merge "Fix soinfo_unload"
...
* commit '8408d7efacd83c1813501954d3e199b63f350778':
Fix soinfo_unload
2014-12-03 17:23:27 +00:00
Elliott Hughes
91a61f77e2
Merge "Switch x86 and x86-64 to __builtin_bswap*."
2014-12-03 16:20:06 +00:00
Elliott Hughes
244299f4e0
Merge "Switch aarch64 to __builtin_bswap16."
2014-12-03 16:15:45 +00:00
Elliott Hughes
12f35ada43
Switch x86 and x86-64 to __builtin_bswap*.
...
Bug: 18597513
Change-Id: I0781208efb3b560d7c6fa48f41be7bc6fc83521e
2014-12-02 20:16:05 -08:00
Elliott Hughes
1de2548c8e
Switch aarch64 to __builtin_bswap16.
...
It generates the same code.
Bug: 18597513
Change-Id: I164296da8c676668983dd93697c6dfa05f10ec56
2014-12-02 19:55:38 -08:00
Dmitriy Ivanov
8408d7efac
Merge "Fix soinfo_unload"
2014-12-03 03:25:58 +00:00
Elliott Hughes
1c27acc32c
am 5f48eda7: am baf792bf: Merge "Remove __ARM_HAVE_HALFWORD_MULTIPLY."
...
* commit '5f48eda760e563e39231b1a0eaba086a5c0403a2':
Remove __ARM_HAVE_HALFWORD_MULTIPLY.
2014-12-03 02:47:47 +00:00
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
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
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
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