Dimitry Ivanov
8bd9e9ec69
Merge "Move some utility functions to linker_utils"
...
am: fb3219fbd1
* commit 'fb3219fbd1dbb0a369d52cbd0200330fd8852bc1':
Move some utility functions to linker_utils
2015-11-20 21:45:36 +00:00
Dimitry Ivanov
fb3219fbd1
Merge "Move some utility functions to linker_utils"
2015-11-20 21:42:18 +00:00
Dmitriy Ivanov
84bab5a955
Move some utility functions to linker_utils
...
Also adds unit-tests for page_start, page_offset, and safe_add
Change-Id: Ia1325b4682d367328a01599a19848e4ffcd2c0ea
2015-11-20 21:37:51 +00:00
Dimitry Ivanov
d34c33764e
Merge "Improve error message for files with no sections"
...
am: a1ab0d8ed1
* commit 'a1ab0d8ed1c4025233b0d816164eefb1b84159b9':
Improve error message for files with no sections
2015-11-20 19:19:40 +00:00
Dimitry Ivanov
a1ab0d8ed1
Merge "Improve error message for files with no sections"
2015-11-20 19:16:14 +00:00
Chih-hung Hsieh
bb06a84672
Merge "Disable clang for mips/mips64 libc."
...
am: 8d5fb0d787
* commit '8d5fb0d78716379d07eddbd75c88c9b7082436ef':
Disable clang for mips/mips64 libc.
2015-11-20 18:57:17 +00:00
Dmitriy Ivanov
b76123fed8
Improve error message for files with no sections
...
Bug: http://b/25801618
Change-Id: I4f4f368e727ff48c84781279e3d17d4ac2d1b6b0
2015-11-20 10:49:12 -08:00
Chih-hung Hsieh
8d5fb0d787
Merge "Disable clang for mips/mips64 libc."
2015-11-20 18:27:14 +00:00
Chih-Hung Hsieh
b4bc156c6c
Disable clang for mips/mips64 libc.
...
* Many processes, including adbd, failed to start in mips/mips64
emulator when libc.so was compiled by clang.
BUG: 25291096
Change-Id: If3434ebdca4a3a6bf6102b120ee838a7ab66cd74
2015-11-20 09:55:35 -08:00
Elliott Hughes
cb3af215dc
Merge "mmap: fix calculation of is_private_anonymous variable"
...
am: 43c9045017
* commit '43c90450174ab8839c05702ac01c4092f5b6cd19':
mmap: fix calculation of is_private_anonymous variable
2015-11-20 17:34:03 +00:00
Elliott Hughes
43c9045017
Merge "mmap: fix calculation of is_private_anonymous variable"
2015-11-20 17:19:19 +00:00
Vitaly Vul
ee67dd75e2
mmap: fix calculation of is_private_anonymous variable
...
Currently is_private_anonymous is calculated as true if _either_
MAP_PRIVATE or MAP_ANONYMOUS is set, which is a mistake.
According to Documentation/vm/ksm.txt, "KSM only merges anonymous
(private) pages, never pagecache (file) pages". MAP_PRIVATE can
still be set on file cache pages so in order to not redundantly
set MADV_MERGEABLE on pages that are not fitted for it, both
MAP_PRIVATE and MAP_ANONYMOUS should be set.
Along with this fix, add an extra check that the mapped page is
not a stack page before setting MADV_MERGEABLE for it. Stack pages
change too quickly and always end up in KSM 'page_volatile' list.
Change-Id: If4954142852f17cc61f02985ea1cb625a7f3dec6
2015-11-20 09:16:59 -08:00
Josh Gao
8af9a739c9
Merge changes I73a39c6d,Iab2af242
...
am: f30170dfa5
* commit 'f30170dfa514266a0bf007091aa54a866920208c':
Fix test build break.
extend the PTRDIFF_MAX size check to mremap
2015-11-20 02:00:16 +00:00
Josh Gao
f30170dfa5
Merge changes I73a39c6d,Iab2af242
...
* changes:
Fix test build break.
extend the PTRDIFF_MAX size check to mremap
2015-11-20 01:55:56 +00:00
Yabin Cui
b690cae8dd
Merge "Fix tsan abort for lake of __libc_auxv initialization."
...
am: 79f8d64632
* commit '79f8d64632a57ccd62315286b809819de09e0317':
Fix tsan abort for lake of __libc_auxv initialization.
2015-11-20 00:48:40 +00:00
Yabin Cui
79f8d64632
Merge "Fix tsan abort for lake of __libc_auxv initialization."
2015-11-20 00:40:00 +00:00
Colin Cross
75ba57de43
Merge "Update libc/Android.bp to match libc/Android.mk"
...
am: 9c6157c81d
* commit '9c6157c81d123d8c6ba1aa8d7ee5c67b0840666c':
Update libc/Android.bp to match libc/Android.mk
2015-11-19 22:58:20 +00:00
Colin Cross
9c6157c81d
Merge "Update libc/Android.bp to match libc/Android.mk"
2015-11-19 22:48:33 +00:00
Yabin Cui
284068f44f
Fix tsan abort for lake of __libc_auxv initialization.
...
If tsan is used, the following callchain can happen:
__libc_preinit() -> __libc_init_globals() ->
__libc_init_vdso() -> strcmp() -> __tsan_init()
-> sysconf(_SC_PAGE_SIZE) -> getauxval().
But __libc_auxv is initialized in __libc_init_common(),
after __libc_init_globals(). One simple way to fix
this is to initialize __libc_auxv at __libc_init_globals().
Bug: 25392375
Change-Id: I3893b1f567d5f3b7a8c881c0c1b8234b06b7751b
2015-11-19 14:24:06 -08:00
Colin Cross
a35d23d251
Update libc/Android.bp to match libc/Android.mk
...
Change-Id: I4dfadc55688213f095949c56306e5071b2ab6135
2015-11-19 14:18:06 -08:00
Josh Gao
2feb9dde60
Fix test build break.
...
Change-Id: I73a39c6d4bb9baebbfb5572e9259bcd405116039
2015-11-19 13:44:20 -08:00
Hung-ying Tyan
ce77e47b2f
Merge "Add /odm/lib to shared lib search path"
...
am: 0ebe2f07c3
* commit '0ebe2f07c35d4b764bc5d8b5226004e3db46da91':
Add /odm/lib to shared lib search path
2015-11-19 16:45:08 +00:00
Hung-ying Tyan
0ebe2f07c3
Merge "Add /odm/lib to shared lib search path"
2015-11-19 16:38:51 +00:00
Daniel Micay
c22a7de798
extend the PTRDIFF_MAX size check to mremap
...
This removes another way to obtain objects larger than PTRDIFF_MAX. The
only known remaining hole is now jemalloc's merging of virtual memory
spans.
Technically this could be wrapped in an __LP64__ ifndef since it can't
occur on 64-bit due to the 1:1 split. It doesn't really matter either
way.
Change-Id: Iab2af242b775bc98a59421994d87aca0433215bd
2015-11-19 08:57:47 -05:00
Junichi Uekawa
1ab4088062
Merge "Do not depend on host bits to get the right size to write."
...
am: 313632db57
* commit '313632db574d101275206ca025d21a5a3cd62150':
Do not depend on host bits to get the right size to write.
2015-11-19 12:51:01 +00:00
Junichi Uekawa
313632db57
Merge "Do not depend on host bits to get the right size to write."
2015-11-19 12:44:19 +00:00
Junichi Uekawa
ff35b1e659
Do not depend on host bits to get the right size to write.
...
x86_64 32-bit or 64-bit relocations do not depend on ELF bit size, they
are 32-bit or 64-bit respectively.
Known compiler that emits such code is nacl-clang which emits
R_X86_64_PC32 which should write 32 bits but ended up writing 64 bits.
Change-Id: Ibb6b484c0fea6a7e291362148e8ac749d6674529
2015-11-19 11:28:20 +09:00
Yabin Cui
f091c1f2f1
Merge "Implement pthread spin."
...
am: 2c09e5de29
* commit '2c09e5de299ca87a9e68807e2b4af41ba61710f3':
Implement pthread spin.
2015-11-19 02:03:24 +00:00
Yabin Cui
9d4bd6f0ca
Merge "Avoid tsan warning about pthread_mutex_destroy."
...
am: ea5bb151af
* commit 'ea5bb151af5e1e364968cb1eac70c8a2c13ca7a7':
Avoid tsan warning about pthread_mutex_destroy.
2015-11-19 02:03:13 +00:00
Yabin Cui
2c09e5de29
Merge "Implement pthread spin."
2015-11-19 01:55:37 +00:00
Yabin Cui
ea5bb151af
Merge "Avoid tsan warning about pthread_mutex_destroy."
2015-11-19 01:55:25 +00:00
Yabin Cui
fe3a83a934
Implement pthread spin.
...
In order to run tsan unit tests, we need to support pthread spin APIs.
Bug: 18623621
Bug: 25392375
Change-Id: Icbb4a74e72e467824b3715982a01600031868e29
2015-11-18 17:51:21 -08:00
Hung-ying Tyan
f74b041cce
Add /odm/lib to shared lib search path
...
ODM's shared libs should live in /odm/lib on the ODM partition.
BUG: 25654402
Change-Id: I3f5c26f208af87ff2817e490e51d0b4f5b8ec98e
2015-11-18 23:45:25 +08:00
Dimitry Ivanov
3f539a1655
Merge "Ignore target sdk version for the public namespace"
...
am: 63f0e0db76
* commit '63f0e0db768ea9be4db3dd6a2fb62ea942afb9d6':
Ignore target sdk version for the public namespace
2015-11-18 03:52:50 +00:00
Dimitry Ivanov
63f0e0db76
Merge "Ignore target sdk version for the public namespace"
2015-11-18 03:43:59 +00:00
Dmitriy Ivanov
3cc35e224c
Ignore target sdk version for the public namespace
...
This fixes the bug with using the libraries loaded
prior to android_set_target_sdk_version call.
Bug: http://b/22548808
Change-Id: I3ca2d367b0fa930a437bbb65f780834803d2ef0a
2015-11-17 18:45:12 -08:00
Yabin Cui
0307eee293
Avoid tsan warning about pthread_mutex_destroy.
...
If calling pthread_mutex_trylock from pthread_mutex_destroy, tsan
warns about an attempt to destroy a locked mutex.
Bug: 25392375
Change-Id: I5feee20e7a0d0915adad24da874ec1ccce241381
2015-11-17 16:17:44 -08:00
Yabin Cui
278fe431b6
Merge "Implement pthread barrier."
...
am: b804b9d67b
* commit 'b804b9d67b9e3a8c63471ff9892f6abea2a58684':
Implement pthread barrier.
2015-11-17 00:28:20 +00:00
Yabin Cui
b804b9d67b
Merge "Implement pthread barrier."
2015-11-17 00:22:54 +00:00
Dimitry Ivanov
159c3d617f
Merge "Remove the warning about empty LD_LIBRARY_PATH"
...
am: 3c8c16022a
* commit '3c8c16022a513a32eb6b92cf23f4ef43ccf7ad6d':
Remove the warning about empty LD_LIBRARY_PATH
2015-11-16 22:30:32 +00:00
Dimitry Ivanov
3c8c16022a
Merge "Remove the warning about empty LD_LIBRARY_PATH"
2015-11-16 22:25:50 +00:00
Dmitriy Ivanov
fbfba64068
Remove the warning about empty LD_LIBRARY_PATH
...
Change-Id: I3eca11512d8055ab94dd0a6badcd83ce6440d675
2015-11-16 14:23:37 -08:00
Yabin Cui
e7c2fffa16
Implement pthread barrier.
...
Bug: 24341262
Change-Id: I5472549e5d7545c1c3f0bef78235f545557b9630
2015-11-16 14:02:26 -08:00
Chih-hung Hsieh
4d87f17621
Merge "Enable clang to compile more tests."
...
am: 949bfb9e3c
* commit '949bfb9e3cceac7913fe1debc39617c9ec01ae5e':
Enable clang to compile more tests.
2015-11-16 21:36:51 +00:00
Chih-hung Hsieh
949bfb9e3c
Merge "Enable clang to compile more tests."
2015-11-16 21:31:36 +00:00
Dimitry Ivanov
b061c9250d
Merge "Fix arm64 and x86 builds"
...
am: 61f186d067
* commit '61f186d067a3efb6a86450092a567fb18c1641c3':
Fix arm64 and x86 builds
2015-11-16 21:25:31 +00:00
Dimitry Ivanov
61f186d067
Merge "Fix arm64 and x86 builds"
2015-11-16 21:23:18 +00:00
Dmitriy Ivanov
d9b08a0bc0
Fix arm64 and x86 builds
...
Change-Id: Ic3746b2f200f42218b6ac857c1631e873c767c17
2015-11-16 13:17:27 -08:00
Dimitry Ivanov
2616cdcdb9
Merge "Introducing linker namespaces"
...
am: 1f0ccbb59c
* commit '1f0ccbb59cd32dfad0e6d9fd9619905e067076a6':
Introducing linker namespaces
2015-11-16 20:21:05 +00:00
Dimitry Ivanov
1f0ccbb59c
Merge "Introducing linker namespaces"
2015-11-16 20:14:37 +00:00