Elliott Hughes
65ba5b62c5
am 064f862d
: Merge "Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too."
...
* commit '064f862d557ab741575dfae479499a07ca0ab742':
Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too.
2012-11-01 14:14:00 -07:00
Elliott Hughes
064f862d55
Merge "Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too."
2012-11-01 13:57:00 -07:00
Elliott Hughes
1a6961650c
Stop defining our own PAGE_SIZE and PAGE_MASK, and test dlclose(3) too.
...
Also remove an unnecessary #include and a now-obsolete TODO.
Change-Id: I36d923721e349a286934b9534090a67ce0786e7b
2012-11-01 13:53:26 -07:00
Elliott Hughes
00fe4a20d7
am 3bb62578
: am 0be1819b
: Merge "Dynamically allocate soinfo-structs in linker"
...
* commit '3bb62578beb36a35d3b1d2fbe18bd34a9d4ecca4':
Dynamically allocate soinfo-structs in linker
2012-11-01 11:47:31 -07:00
Elliott Hughes
3bb62578be
am 0be1819b
: Merge "Dynamically allocate soinfo-structs in linker"
...
* commit '0be1819b22b33fbedcb150f96a196ed096abe2fc':
Dynamically allocate soinfo-structs in linker
2012-11-01 11:44:29 -07:00
Elliott Hughes
0be1819b22
Merge "Dynamically allocate soinfo-structs in linker"
2012-11-01 11:36:02 -07:00
Magnus Malmborn
ba98d9237b
Dynamically allocate soinfo-structs in linker
...
Request memory from the system when needed instead of having a fixed
array for soinfo structs. Note that malloc() et al can't be used in
linker, so use mmap() instead.
Change-Id: I4b495995931d7752b0e8c944e64d1fe41b9f7144
2012-11-01 11:31:39 -07:00
The Android Automerger
7a6ae1d667
merge in master-release history after reset to master
2012-11-01 07:49:21 -07:00
Elliott Hughes
e892414bd3
am 1de3af51
: am c0ac7eba
: Merge "Reject .so files with no sysv hash table."
...
* commit '1de3af51d459c2ced602f10e4f7e7fe704400cdc':
Reject .so files with no sysv hash table.
2012-10-31 15:15:45 -07:00
Elliott Hughes
1de3af51d4
am c0ac7eba
: Merge "Reject .so files with no sysv hash table."
...
* commit 'c0ac7eba934fb88f321c75a71312ea482e9a85e9':
Reject .so files with no sysv hash table.
2012-10-31 15:13:30 -07:00
Elliott Hughes
c0ac7eba93
Merge "Reject .so files with no sysv hash table."
2012-10-31 15:09:46 -07:00
Elliott Hughes
124fae9eab
Reject .so files with no sysv hash table.
...
Also ensure that dlopen(3) errors always include the name of the library we
failed to open.
Also fix a bug where we'd fall back to searching LD_LIBRARY_PATH and the
built-in paths for names that include slashes.
Bug: http://code.google.com/p/android/issues/detail?id=38479
Change-Id: Ib2c009ed083344a7a012749d58f8679db2f26c78
2012-10-31 14:30:50 -07:00
Elliott Hughes
a4242290a1
am f510fc78
: am b46530bd
: Merge "Start cleaning up libm."
...
* commit 'f510fc789a67344080543b9ae06d0ff3322561d5':
Start cleaning up libm.
2012-10-31 13:54:18 -07:00
Elliott Hughes
f510fc789a
am b46530bd
: Merge "Start cleaning up libm."
...
* commit 'b46530bd3e5984047bd780f5d3a6a5ebabd9f02d':
Start cleaning up libm.
2012-10-31 13:51:50 -07:00
Elliott Hughes
b46530bd3e
Merge "Start cleaning up libm."
2012-10-31 13:43:41 -07:00
Elliott Hughes
0f7809d5c3
Start cleaning up libm.
...
We have two copies of fenv.h for every architecture, one of which
isn't used. We also have unused makefiles and files for architectures
we don't support.
This patch removes all the obviously useless files.
Bug: http://code.google.com/p/android/issues/detail?id=38196
Change-Id: I1919b6621ba513aa24aa947a34815bc51191487c
2012-10-31 13:32:34 -07:00
The Android Open Source Project
b5b52e73e9
am 089111a8
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '089111a80a6a167de827bf32ae2d2a935ff5874f':
2012-10-31 09:19:14 -07:00
The Android Open Source Project
089111a80a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ice07f7813d823b0419153d5ac321ad784a690af4
2012-10-31 09:15:16 -07:00
The Android Automerger
a9b0cd68de
merge in master-release history after reset to master
2012-10-31 07:49:21 -07:00
The Android Automerger
f29c214d6a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-30 20:11:57 -07:00
Elliott Hughes
8478dbc85f
am 3cd7a165
: am 084be591
: Merge "linker: handle R_ARM_COPY relocations in a proper way"
...
* commit '3cd7a1653aa579213cb68a666bd9949e2b8fff95':
linker: handle R_ARM_COPY relocations in a proper way
2012-10-30 17:20:01 -07:00
Elliott Hughes
3cd7a1653a
am 084be591
: Merge "linker: handle R_ARM_COPY relocations in a proper way"
...
* commit '084be591923d3d509cea0a0f4b11b073e362d730':
linker: handle R_ARM_COPY relocations in a proper way
2012-10-30 17:18:04 -07:00
Elliott Hughes
084be59192
Merge "linker: handle R_ARM_COPY relocations in a proper way"
2012-10-30 17:10:30 -07:00
Ard Biesheuvel
5ae44f302b
linker: handle R_ARM_COPY relocations in a proper way
...
If an executable contain copy relocations, other references
to the symbol it points to should be preempted and made to
point to the copy instead.
Also, the linker should make sure the target area has
sufficient space to contain the copy. It also checks
whether the library that supplies the symbol is built
with -Bsymbolic, and errors out if this is the case.
Change-Id: If135c83590092741cfd8f82f54816f363a4a4a3b
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-10-30 17:09:21 -07:00
Elliott Hughes
864d48917a
am 914112ea
: am 155e8d1d
: Merge "More dynamic linker cleanup."
...
* commit '914112ea21a62c7658dc4b094a369358009be6a9':
More dynamic linker cleanup.
2012-10-30 16:59:17 -07:00
Elliott Hughes
914112ea21
am 155e8d1d
: Merge "More dynamic linker cleanup."
...
* commit '155e8d1df5b8fdfeabda3e7b61d95beb5b8d1467':
More dynamic linker cleanup.
2012-10-30 16:56:29 -07:00
Elliott Hughes
155e8d1df5
Merge "More dynamic linker cleanup."
2012-10-30 16:41:01 -07:00
Elliott Hughes
18a206c81d
More dynamic linker cleanup.
...
I still want to break linker_format out into its own library so we can reuse
it for malloc debugging and so forth. (There are many similar pieces of code
in bionic, but the linker's one seems to be the most complete/functional.)
Change-Id: If3721853d28937c8e821ca1d23cf200e228a409a
2012-10-30 16:35:38 -07:00
Elliott Hughes
08c4e30e23
am b0ac82e9
: Merge commit \'bd8ee3d3\' into mm
...
* commit 'b0ac82e9baf969236be1174b49784500b33e6f48':
Upgrade to tzdata2012h.
2012-10-30 15:24:37 -07:00
Elliott Hughes
b0ac82e9ba
Merge commit 'bd8ee3d3' into mm
2012-10-30 15:20:13 -07:00
Elliott Hughes
bd8ee3d35e
am a811d7a8
: Upgrade to tzdata2012h.
...
* commit 'a811d7a8e638ca49aee704c613cb9f1e03c3698d':
Upgrade to tzdata2012h.
2012-10-30 14:30:12 -07:00
Elliott Hughes
4d2ea14288
am 4569ab97
: am 06b59610
: Merge "Fix bug in pthread_join, pthread_exit, pthread_detach"
...
* commit '4569ab9773efb1c984bde146002975e7a3753f11':
Fix bug in pthread_join, pthread_exit, pthread_detach
2012-10-30 13:06:47 -07:00
Elliott Hughes
4569ab9773
am 06b59610
: Merge "Fix bug in pthread_join, pthread_exit, pthread_detach"
...
* commit '06b596104a9ed3ac089abd00186a5698d7e8544f':
Fix bug in pthread_join, pthread_exit, pthread_detach
2012-10-30 13:04:23 -07:00
Elliott Hughes
06b596104a
Merge "Fix bug in pthread_join, pthread_exit, pthread_detach"
2012-10-30 12:57:58 -07:00
Elliott Hughes
c7358ee57c
am 743a273e
: am 1f21ece4
: Merge "Clean up the <libgen.h> implementation a little, bring in tests."
...
* commit '743a273e40e49c199d79462338fc606ae12c999f':
Clean up the <libgen.h> implementation a little, bring in tests.
2012-10-30 10:11:44 -07:00
Elliott Hughes
7d617d0db9
am 5f787190
: am 4d36b0bd
: Merge "Fix the pthread_join on self error case."
...
* commit '5f787190a9e7a749d95f566f920b78eafcd05050':
Fix the pthread_join on self error case.
2012-10-30 10:11:43 -07:00
Elliott Hughes
5e805afa79
am 0b8fa1d4
: am 9297af94
: Merge "Fix a potential NULL pointer dereference in _init_thread()."
...
* commit '0b8fa1d456f6cf831be41a6dc6b0a67e89f01bd5':
Fix a potential NULL pointer dereference in _init_thread().
2012-10-30 10:11:42 -07:00
Elliott Hughes
d4834a217e
am 40e467ec
: am 33c4a3ad
: Merge "libc: Fix alphasort() signature (and implementation)."
...
* commit '40e467ec668b59be25491bd44bf348a884d6a68d':
libc: Fix alphasort() signature (and implementation).
2012-10-30 10:11:41 -07:00
Elliott Hughes
5ce5edd6cf
am 85765609
: am 8f9a1eb1
: Merge "Upgrade to tzdata2012h."
...
* commit '8576560979e3d126ef8204959b87336d980b390b':
Upgrade to tzdata2012h.
2012-10-30 10:11:40 -07:00
Elliott Hughes
96b52e104a
am a67cedb5
: am 9e783963
: Merge "Clean up the implementation of the <dirent.h> functions."
...
* commit 'a67cedb52cb57f116a545482bddb979d995fd634':
Clean up the implementation of the <dirent.h> functions.
2012-10-30 10:11:39 -07:00
Elliott Hughes
743a273e40
am 1f21ece4
: Merge "Clean up the <libgen.h> implementation a little, bring in tests."
...
* commit '1f21ece48a87abbbdd9fb939b79a1dd81fb867eb':
Clean up the <libgen.h> implementation a little, bring in tests.
2012-10-29 17:15:12 -07:00
Elliott Hughes
5f787190a9
am 4d36b0bd
: Merge "Fix the pthread_join on self error case."
...
* commit '4d36b0bd38559ae0376b61a0ac2f5fa8329ec56d':
Fix the pthread_join on self error case.
2012-10-29 17:15:09 -07:00
Elliott Hughes
0b8fa1d456
am 9297af94
: Merge "Fix a potential NULL pointer dereference in _init_thread()."
...
* commit '9297af943887d9d6974aaec8c45a4e7d93422965':
Fix a potential NULL pointer dereference in _init_thread().
2012-10-29 17:15:03 -07:00
Elliott Hughes
40e467ec66
am 33c4a3ad
: Merge "libc: Fix alphasort() signature (and implementation)."
...
* commit '33c4a3adde3cf1753af0661f48ce86358e105277':
libc: Fix alphasort() signature (and implementation).
2012-10-29 17:15:02 -07:00
Elliott Hughes
8576560979
am 8f9a1eb1
: Merge "Upgrade to tzdata2012h."
...
* commit '8f9a1eb108f22fc2ce7283ef184d909ec0ca1152':
Upgrade to tzdata2012h.
2012-10-29 17:15:01 -07:00
Elliott Hughes
a67cedb52c
am 9e783963
: Merge "Clean up the implementation of the <dirent.h> functions."
...
* commit '9e783963d58acf48e06902236ea64c7f5b337a0f':
Clean up the implementation of the <dirent.h> functions.
2012-10-29 17:14:59 -07:00
Elliott Hughes
1f21ece48a
Merge "Clean up the <libgen.h> implementation a little, bring in tests."
2012-10-29 15:03:36 -07:00
Elliott Hughes
58b575485c
Clean up the <libgen.h> implementation a little, bring in tests.
...
Most of these tests were in system/extras, but I've added more to cover other
cases explicitly mentioned by POSIX.
Change-Id: I5e8d77e4179028d77306935cceadbb505515dcde
2012-10-29 14:27:10 -07:00
Sergey Melnikov
10ce96944e
Fix bug in pthread_join, pthread_exit, pthread_detach
...
pthread_no_op_detach_after_join test from bionic-unit-tests hangs
on x86 emulator. There is a race in the pthread_join, pthread_exit,
pthread_detach functions:
- pthread_join waits for the non-detached thread
- pthread_detach sets the detached flag on that thread
- the thread executes pthread_exit which just kills the now-detached
thread, without sending the join notification.
This patch improves the test so it fails on ARM too, and modifies
pthread_detach to behave more like glibc, not setting the detach state if
called on a thread that's already being joined (but not returning an error).
Change-Id: I87dc688221ce979ef5178753dd63d01ac0b108e6
Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com>
2012-10-29 11:31:26 -07:00
Elliott Hughes
4d36b0bd38
Merge "Fix the pthread_join on self error case."
2012-10-29 10:30:16 -07:00