Dmitriy Ivanov
68a555b57e
Revert "Revert "Fix dlsym() to take into account RTLD_GLOBAL/LOCAL""
...
This reverts commit 9d3382d97a2cdc8c8f78c7825ece16f09292fc36.
2014-11-04 09:37:19 -08:00
Dmitriy Ivanov
39af759260
am 9d3382d9: Revert "Fix dlsym() to take into account RTLD_GLOBAL/LOCAL"
...
* commit '9d3382d97a2cdc8c8f78c7825ece16f09292fc36':
Revert "Fix dlsym() to take into account RTLD_GLOBAL/LOCAL"
2014-11-04 17:17:58 +00:00
Dmitriy Ivanov
e1d9881a8d
am 69c5d108: Revert "Add RTLD_NODELETE flag support"
...
* commit '69c5d108a5cb44167a04d42ffdad6a39648ed235':
Revert "Add RTLD_NODELETE flag support"
2014-11-04 17:17:57 +00:00
Dmitriy Ivanov
47fb0b7816
am 00dce525: Revert "Fix relocation to look for symbols in local group"
...
* commit '00dce525530c5d26c20750863f3e9890b468787a':
Revert "Fix relocation to look for symbols in local group"
2014-11-04 17:17:56 +00:00
Dmitriy Ivanov
ce4d16bbaa
am eae09772: Revert "Remove unnecessary lookups during relocations"
...
* commit 'eae09772558016836f1356816f4d1d0be498d74c':
Revert "Remove unnecessary lookups during relocations"
2014-11-04 17:17:55 +00:00
Dmitriy Ivanov
7cb57841a5
am 4402804c: Revert "Fix mips build"
...
* commit '4402804c35c5c5992c728c6f3cee3bdbd325819e':
Revert "Fix mips build"
2014-11-04 17:17:54 +00:00
Dmitriy Ivanov
5c9afdc0c1
am f947be28: Revert "Fix symbol lookup order during relocation"
...
* commit 'f947be2889639defc6424b1813ccc779528b7598':
Revert "Fix symbol lookup order during relocation"
2014-11-04 17:17:53 +00:00
Dmitriy Ivanov
4c9b34bd8a
am 494bee79: Revert "Fix arm64 and arm builds."
...
* commit '494bee796aa60131981308493e0e295493537e12':
Revert "Fix arm64 and arm builds."
2014-11-04 17:17:52 +00:00
Dmitriy Ivanov
9d3382d97a
Revert "Fix dlsym() to take into account RTLD_GLOBAL/LOCAL"
...
This reverts commit c85e82dde5c4b2accc50a9e17740b9005dfbae6a.
Bug: 18222321
Bug: 18211780
Change-Id: I32f4048bd5ea85dc8a3dfccce8cf141b241ab692
2014-11-03 22:15:29 -08:00
Dmitriy Ivanov
69c5d108a5
Revert "Add RTLD_NODELETE flag support"
...
This reverts commit c87f65d2cd0690d81665f8b241c1d763f72b6f80.
Bug: 18222321
Bug: 18211780
Change-Id: I00252e26a28a41ab9f1e2dd3b32f0f80d86297f1
2014-11-03 22:15:26 -08:00
Dmitriy Ivanov
00dce52553
Revert "Fix relocation to look for symbols in local group"
...
This reverts commit fd2747bb585fc51b5ad56db09c0e9b66c7091a92.
Bug: 18222321
Bug: 18211780
Change-Id: I2d4ebab1e73b7277161af76b99f8249825b22d65
2014-11-03 22:15:20 -08:00
Dmitriy Ivanov
eae0977255
Revert "Remove unnecessary lookups during relocations"
...
This reverts commit 6442dbd3bcadbd5e522465743a8d8cf56338ae1c.
Bug: 18222321
Bug: 18211780
Change-Id: I87b18a32238a1f75afe56149221b6691f50d9f56
2014-11-03 22:15:17 -08:00
Dmitriy Ivanov
4402804c35
Revert "Fix mips build"
...
This reverts commit bf3d5ef5fd240d4c5fbde1b32f9084dbc720840b.
Bug: 18222321
Bug: 18211780
Change-Id: I902ed888197b358c77303f1acb6d5ffd7ae6dcd3
2014-11-03 22:15:13 -08:00
Dmitriy Ivanov
f947be2889
Revert "Fix symbol lookup order during relocation"
...
This reverts commit 976402cca13a1f4f3aa988fd301575e134ef5f2c.
Bug: 18222321
Bug: 18211780
Change-Id: Iafdd3d843db7b1cf288be9a0232022816622c944
2014-11-03 22:15:08 -08:00
Dmitriy Ivanov
494bee796a
Revert "Fix arm64 and arm builds."
...
This reverts commit 445111a1c977e94a4233efd54f3690defa4a7582.
Bug: 18222321
Bug: 18211780
Change-Id: I4fa9e1b63ec9b528f8bfed73c2ec15046c43a2fe
2014-11-03 22:14:19 -08:00
Elliott Hughes
6bb5579b8e
resolved conflicts for merge of d18f4b25 to lmp-mr1-dev-plus-aosp
...
Change-Id: Ie1ebacd432a61d680bb1325aa369db717d39299d
2014-11-03 18:31:10 -08:00
Dan Albert
a0ba3c83ed
am 5939060b: am 695781b6: Merge "Make host tests depend on /system/etc/hosts."
...
* commit '5939060ba54fbab71c53b95310bfd798a35972ad':
Make host tests depend on /system/etc/hosts.
2014-11-04 01:04:27 +00:00
Elliott Hughes
05e3e70772
am 90138639: am e76ea9bb: Merge "Ensure we initialize stdin/stdout/stderr\'s recursive mutexes."
...
* commit '90138639a50495fd63238524e9a0a0758cd574c6':
Ensure we initialize stdin/stdout/stderr's recursive mutexes.
2014-11-04 01:04:25 +00:00
Dan Albert
5939060ba5
am 695781b6: Merge "Make host tests depend on /system/etc/hosts."
...
* commit '695781b6f0419f82939176a6ec1a240300d9f036':
Make host tests depend on /system/etc/hosts.
2014-11-04 00:53:18 +00:00
Elliott Hughes
90138639a5
am e76ea9bb: Merge "Ensure we initialize stdin/stdout/stderr\'s recursive mutexes."
...
* commit 'e76ea9bbe0a8bccf97b88d09af13a84fd34a6a76':
Ensure we initialize stdin/stdout/stderr's recursive mutexes.
2014-11-04 00:53:16 +00:00
Elliott Hughes
d18f4b2578
Ensure we initialize stdin/stdout/stderr's recursive mutexes.
...
(cherry-pick of 6a03abcfd23f31d1df06eb0059830e22621282bb.)
Bug: 18208568
Change-Id: I9da16ce0f9375bc363d1d02be706d73fd3b1e150
2014-11-03 13:46:41 -08:00
Dan Albert
695781b6f0
Merge "Make host tests depend on /system/etc/hosts."
2014-11-03 21:38:50 +00:00
Elliott Hughes
e76ea9bbe0
Merge "Ensure we initialize stdin/stdout/stderr's recursive mutexes."
2014-11-03 21:32:29 +00:00
Dan Albert
62b7279789
Make host tests depend on /system/etc/hosts.
...
Change-Id: I3e5ab1325d5e250a1d14b53f3a5a465d9f5de30c
2014-11-03 13:26:16 -08:00
Elliott Hughes
6a03abcfd2
Ensure we initialize stdin/stdout/stderr's recursive mutexes.
...
Bug: 18208568
Change-Id: I9da16ce0f9375bc363d1d02be706d73fd3b1e150
2014-11-03 12:32:17 -08:00
Dmitriy Ivanov
d3cd66185f
resolved conflicts for merge of 926797a8 to lmp-mr1-dev-plus-aosp
...
Change-Id: I3b46a714fd1236431fa08872f280e4ac4c4880d1
2014-11-01 18:02:31 -07:00
Dmitriy Ivanov
b1c019f32a
am 75cd66aa: am 38ff8822: Merge "Revert "Use local copy of the library name on dlopen""
...
* commit '75cd66aaf60f47e04359738a9c8d92588a1f7834':
Revert "Use local copy of the library name on dlopen"
2014-11-01 03:00:56 +00:00
Dmitriy Ivanov
75cd66aaf6
am 38ff8822: Merge "Revert "Use local copy of the library name on dlopen""
...
* commit '38ff8822763a30d4c9033a38ec8b71fcd17aba87':
Revert "Use local copy of the library name on dlopen"
2014-11-01 02:35:51 +00:00
Dmitriy Ivanov
38ff882276
Merge "Revert "Use local copy of the library name on dlopen""
2014-11-01 02:32:24 +00:00
Dmitriy Ivanov
9fb216f844
Revert "Use local copy of the library name on dlopen"
...
This reverts commit da8e591c3996879e41dc5f70b77d1b0fe6f9c225.
Change-Id: I3fd6f235b18c232af5cc5ecd481851486d7d68f6
2014-11-01 02:30:38 +00:00
Dmitriy Ivanov
445111a1c9
Fix arm64 and arm builds.
...
Bug: 18186310
(cherry picked from commit 4e446b19d8710cd2004785db4a00f18f249fe73f)
Change-Id: Ibc77a9ade36dc6b9bf5a316b5ab9ae5f0a70e826
2014-10-31 19:29:04 -07:00
Dmitriy Ivanov
dcafe93db2
am 6cba0e35: am 36ffc73e: Merge "Fix arm64 and arm builds."
...
* commit '6cba0e35ec62e86689556142a08f547f27b703dd':
Fix arm64 and arm builds.
2014-11-01 00:39:45 +00:00
Dmitriy Ivanov
6cba0e35ec
am 36ffc73e: Merge "Fix arm64 and arm builds."
...
* commit '36ffc73e992de77cc4bc397e41767b69ed9ac917':
Fix arm64 and arm builds.
2014-11-01 00:36:23 +00:00
Dmitriy Ivanov
36ffc73e99
Merge "Fix arm64 and arm builds."
2014-11-01 00:33:30 +00:00
Dmitriy Ivanov
4e446b19d8
Fix arm64 and arm builds.
...
Change-Id: I2c8c41626768e792f27a2616f2cd5ae66606319d
2014-10-31 17:27:02 -07:00
Dmitriy Ivanov
976402cca1
Fix symbol lookup order during relocation
...
Relocate symbol against DF_1_GLOBAL shared libraries
loaded before this shared library. This includes
main executable, ld_preloads and other libraries
that have DF_1_GLOBAL flag set.
Bug: 2643900
Bug: 15432753
Bug: 18186310
(cherry picked from commit d225a5e65223b375a63548c4b780f04d8f3d7b60)
Change-Id: I4e889cdf2dfbf8230b0790053d311ee6b0d0ee2d
2014-10-31 17:10:30 -07:00
Dmitriy Ivanov
bf3d5ef5fd
Fix mips build
...
Bug: 18186310
(cherry picked from commit 90b74fb8671db6f5512821a033e12a6248e5c804)
Change-Id: I8d4ed254e5c421b65b62c401abdb1ee07e5dc3b2
2014-10-31 17:04:00 -07:00
Dmitriy Ivanov
6442dbd3bc
Remove unnecessary lookups during relocations
...
local_group includes this library and its dependencies.
Bug: 18186310
(cherry picked from commit e47b3f8456fc34ac136e9fddef59a9ae37febcbe)
Change-Id: I93c2d873e924df7319569307444bf603d7d27bf0
2014-10-31 17:04:00 -07:00
Dmitriy Ivanov
fd2747bb58
Fix relocation to look for symbols in local group
...
The local group is a sequence of libraries in default (breadth-first)
order. It allows RTLD_LOCALLY loaded library to correctly relocate
symbols within its group (see test-cases).
Local group lookup is performed after main executable and ld_preloads.
Bug: 2643900
Bug: 15432753
Bug: 18186310
(cherry picked from commit cfa97f172dc1b10d650fefbb6ccffd88ce72a5fb)
Change-Id: I5fa8c673f929e4652c738912c7ae078d7ec286d2
2014-10-31 17:04:00 -07:00
Dmitriy Ivanov
4d0c1f673f
Correct way to specify additional dependencies
...
Previous one was not covering all the targets
Bug: 17548097
Bug: 18186310
(cherry picked from commit 4a9e1937c56511aef579312bf39ab345f9179230)
Change-Id: I2cd9e58893555d16cbfe291b2d1279621489d5ad
2014-10-31 17:04:00 -07:00
Dmitriy Ivanov
382e06ce8e
Add dlfcn_test to glibc test suite.
...
Bug: 18186310
(cherry picked from commit eb27bbae8f0edc6b62ca2db73256c7fb53b9e9bf)
Change-Id: I1d608dfa12dbafbdcdb8bc6d818c5872404c19e0
2014-10-31 17:04:00 -07:00
Dmitriy Ivanov
e4bc6f026a
Ignore DT_BIND_NOW (0x18)
...
Bug: 18186310
Bug: 17552334
(cherry picked from commit ea6eae182ad64312f80b9adddac511d8938e23e7)
Change-Id: I07d6f6fbb462fea329581d0da02f6d88be1c262f
2014-10-31 17:04:00 -07:00
Dmitriy Ivanov
1d3e81a9e7
Resolve "unused DT entry" warnings for x86_64
...
Bug: 18186310
(cherry picked from commit 513e29e16f16a6ffa1636ba282d599fd6b437aeb)
Change-Id: I1e4c5af2cdc09dc978c7a78fcdcf8796c919751e
2014-10-31 17:04:00 -07:00
Dmitriy Ivanov
c87f65d2cd
Add RTLD_NODELETE flag support
...
Bug: 18186310
Bug: https://code.google.com/p/android/issues/detail?id=64069
(cherry picked from commit 1b20dafdbe65e43b9f4c95057e8482380833ea91)
Change-Id: Ic02eec22a7c322ece65eb40730a3404f611526b1
2014-10-31 17:04:00 -07:00
Dmitriy Ivanov
210ff1b27b
Fix mips build
...
Bug: 18186310
(cherry picked from commit ecf532fa1cfe91ca946243c11ef154c602870ba6)
Change-Id: Ia12f2fa28c8cd3204eb7d6b4c7d872f4e81fb8ef
2014-10-31 17:04:00 -07:00
Dmitriy Ivanov
0f47d9c1ce
Fix unused DT entry warnings.
...
DT_STRSZ Implement strtab boundary checks
DT_FLAGS_1 Warn if flags other than DF_1_NOW|DF_1_GLOBAL are set
Bug: 17552334
Bug: 18186310
(cherry picked from commit 6cdeb5234d7f4523fe9d83974f265d80f10512a6)
Change-Id: I7ffc7bc600798308a77ad949a644949b64250ae2
2014-10-31 17:03:59 -07:00
Dmitriy Ivanov
f90e21004e
Return has_DT_SYMBOLIC flag.
...
This reverts commit 8f61d991831f0ea515fa50a5c38dbbcfbab0dd28
Despite the fact that static linker does all the work while linking
-Bsymbolic executables, according to the SCO doc following DT_SYMBOLIC
and DF_SYMBOLIC flags is still a requirement for the dynamic linker
as well.
(see http://www.sco.com/developers/gabi/2012-12-31/ch5.dynamic.html )
Bug: 18186310
(cherry picked from commit 96bc37f2e1093416a432135265fd7a4db6c3df17)
Change-Id: Ie217be4f3305d877066e4cfe91975ae1c7768330
2014-10-31 17:03:59 -07:00
Elliott Hughes
748fbe5c41
Fix a couple more cases of missing CLOEXEC.
...
The debuggerd case can probably never happen, because you're crashing at this
point anyway. The system property one seems possible though.
Bug: 18186310
(cherry picked from commit 0dc39f9952c5e3a3121ea77357bb264ef0f8ded7)
Change-Id: I3e84488fc246f6c28cbd82e96d0cd4343a12c28a
2014-10-31 17:03:21 -07:00
Dmitriy Ivanov
d5eb10875a
Temporary disable DL_WARNs for unused DT_*
...
Bug: 17552334
Bug: 18186310
(cherry picked from commit 1b77423eff21e916186fcb208f138e436e9f3052)
Change-Id: I8a9d05195a862bc287fff7156913606f0311b8bb
2014-10-31 17:02:14 -07:00
Dmitriy Ivanov
09608848ed
Fix 64bit build
...
Bug: 18186310
(cherry picked from commit f240aa8089ea1574a7d799720efb66528f6ceb99)
Change-Id: Id46f1f9be90a17a58fb44d3540095c8c685c9726
2014-10-31 17:02:14 -07:00