Nick Kralevich
17d9be8ad7
Merge "disable _FORTIFY_SOURCE under clang"
2012-08-29 13:54:49 -07:00
Elliott Hughes
5fe555ecac
am b3732862
: am 8900e2de
: am e5b85f45
: am 0d7177c0
: Merge "Clean up warnings in the malloc_debug_* files."
...
* commit 'b37328627be403b9c2a2896765a7bc7a357cb073':
Clean up warnings in the malloc_debug_* files.
2012-08-29 13:23:34 -07:00
Elliott Hughes
b37328627b
am 8900e2de
: am e5b85f45
: am 0d7177c0
: Merge "Clean up warnings in the malloc_debug_* files."
...
* commit '8900e2de450726982de466bfc3639dd71630178c':
Clean up warnings in the malloc_debug_* files.
2012-08-29 13:22:18 -07:00
Elliott Hughes
8900e2de45
am e5b85f45
: am 0d7177c0
: Merge "Clean up warnings in the malloc_debug_* files."
...
* commit 'e5b85f45f9b23b4adbea5a9bb0bc29099880ed69':
Clean up warnings in the malloc_debug_* files.
2012-08-29 13:19:58 -07:00
Elliott Hughes
e5b85f45f9
am 0d7177c0
: Merge "Clean up warnings in the malloc_debug_* files."
...
* commit '0d7177c0d47517514c81713427fc28e04dc3cd37':
Clean up warnings in the malloc_debug_* files.
2012-08-29 13:15:10 -07:00
Elliott Hughes
e9b6fc6f82
Improve the dynamic linker diagnostics.
...
Lose the pid, only show the name of the function (not its whole signature),
and include the name of the library we failed to load. (I hadn't noticed
that the library name was missing before because in Java we add that into
the UnsatisfiedLinkError detail message.)
The new output looks like this:
Cannot load library: soinfo_relocate(linker.cpp:968): cannot locate symbol "__libc_malloc_default_dispatch" referenced by "libc_malloc_debug_leak.so"...
Change-Id: I3bb5c9780d9aaf3a9e4418ea55bc98122a81f80f
2012-08-29 13:10:54 -07:00
Elliott Hughes
0d7177c0d4
Merge "Clean up warnings in the malloc_debug_* files."
2012-08-29 13:08:50 -07:00
Nick Kralevich
829c089f83
disable _FORTIFY_SOURCE under clang
...
Clang and _FORTIFY_SOURCE are just plain incompatible with
each other. First of all, clang doesn't understand the
__attribute__((gnu_inline)) header. Second of all,
Clang doesn't have support for __builtin_va_arg_pack()
and __builtin_va_arg_pack_len() (see
http://clang.llvm.org/docs/UsersManual.html#c_unimpl_gcc )
Until we can resolve these issues, don't even try using
_FORTIFY_SOURCE under clang.
Change-Id: I81c2b8073bb3276fa9a4a6b93c427b641038356a
2012-08-29 12:47:41 -07:00
Elliott Hughes
c4d1fecc10
Clean up warnings in the malloc_debug_* files.
...
Also clean up cpplint.py-detected lint.
Change-Id: Ia18e89c4c6878764f8d7ed34b8247e7a8d8fe88b
2012-08-29 12:08:13 -07:00
Ian Rogers
72758a138e
am 71258e0d
: am 15afed42
: Merge "Revert "Revert "Restore posix_memalign""" into jb-mr1-dev
...
* commit '71258e0d207b9b51f1295808837df95e4dd2711a':
Revert "Revert "Restore posix_memalign""
2012-08-29 08:57:50 -07:00
Ian Rogers
31abfc3a98
am 1df8fe33
: am f71fa083
: Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
...
* commit '1df8fe33d59df1be3b1d33db033e379a32416a68':
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
2012-08-29 08:57:49 -07:00
Ian Rogers
71258e0d20
am 15afed42
: Merge "Revert "Revert "Restore posix_memalign""" into jb-mr1-dev
...
* commit '15afed42ca0b9e5954b121d1a6ca1bdb6b5dc55c':
Revert "Revert "Restore posix_memalign""
2012-08-29 08:55:24 -07:00
Ian Rogers
1df8fe33d5
am f71fa083
: Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
...
* commit 'f71fa0830a1d1280174f25309b05612af4f20fb3':
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
2012-08-29 08:55:23 -07:00
Ian Rogers
15afed42ca
Merge "Revert "Revert "Restore posix_memalign""" into jb-mr1-dev
2012-08-29 08:53:41 -07:00
Ian Rogers
f71fa0830a
Merge "Revert "Revert "Upgrade to dlmalloc 2.8.5.""" into jb-mr1-dev
2012-08-29 08:53:26 -07:00
The Android Automerger
b2d46d3632
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-29 06:33:16 -07:00
Iliyan Malchev
230752b861
am 7e585192
: am 66edcd9d
: msm_ion: switch to using legacy_ion.h
...
* commit '7e5851922ce5430ea55e3c9325386846fbedf16c':
msm_ion: switch to using legacy_ion.h
2012-08-29 01:39:28 -07:00
Iliyan Malchev
e59f4c31cb
am ba13ae76
: am 5f1d206d
: add legacy_ion.h
...
* commit 'ba13ae767207d50dd2214cd5e8a941ab4da74d56':
add legacy_ion.h
2012-08-29 01:39:28 -07:00
Iliyan Malchev
7e5851922c
am 66edcd9d
: msm_ion: switch to using legacy_ion.h
...
* commit '66edcd9dad6a10622015f6350ea9bc11a358801a':
msm_ion: switch to using legacy_ion.h
2012-08-29 01:37:21 -07:00
Iliyan Malchev
ba13ae7672
am 5f1d206d
: add legacy_ion.h
...
* commit '5f1d206de357684365a98c53b505491e18b6694a':
add legacy_ion.h
2012-08-29 01:37:20 -07:00
Iliyan Malchev
66edcd9dad
msm_ion: switch to using legacy_ion.h
...
Change-Id: I0fa64cb9684062f371bd21a1f94f6c7dad8d854d
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-08-29 01:31:34 -07:00
Iliyan Malchev
5f1d206de3
add legacy_ion.h
...
legacy_ion.h is a pre android-3.4 copy of the ion.h header, for backwards
compatibility
Change-Id: Iaf2f1659f19a3b55334df929d9500069bf8acbdd
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-08-29 01:24:49 -07:00
Ian Rogers
e0d680176f
Revert "Revert "Restore posix_memalign""
...
This reverts commit 78a3069f82
.
2012-08-28 16:36:08 -07:00
Ian Rogers
2c344d3631
Revert "Revert "Upgrade to dlmalloc 2.8.5.""
...
This reverts commit f72ee26927
.
2012-08-28 15:53:10 -07:00
Nick Kralevich
9416782be5
am 2868bbab
: am 4f90a093
: am d3d09f7d
: am 069c64cd
: Merge "ARM: make sure __on_dlclose() actually gets called"
...
* commit '2868bbabf3a3146e682f314794b8803bfd60963b':
ARM: make sure __on_dlclose() actually gets called
2012-08-28 13:46:31 -07:00
Nick Kralevich
2868bbabf3
am 4f90a093
: am d3d09f7d
: am 069c64cd
: Merge "ARM: make sure __on_dlclose() actually gets called"
...
* commit '4f90a0932c087e4bb13dab2d30a424c04c1f9f80':
ARM: make sure __on_dlclose() actually gets called
2012-08-28 13:43:57 -07:00
Nick Kralevich
4f90a0932c
am d3d09f7d
: am 069c64cd
: Merge "ARM: make sure __on_dlclose() actually gets called"
...
* commit 'd3d09f7d75726dbe7cd9dfae211427f8bebe1397':
ARM: make sure __on_dlclose() actually gets called
2012-08-28 13:41:10 -07:00
Nick Kralevich
d3d09f7d75
am 069c64cd
: Merge "ARM: make sure __on_dlclose() actually gets called"
...
* commit '069c64cdf2d3da7b7ff6ea5d1041f982fb10ab22':
ARM: make sure __on_dlclose() actually gets called
2012-08-28 13:17:00 -07:00
Nick Kralevich
97b9643c5b
am 036fa6e6
: am 54662dd4
: am 1389db8b
: am e026b1d8
: Merge "ARM: remove dummy entries from .so init_array/fini_array"
...
* commit '036fa6e66958a05fbde9fddefc5fc8e31741fe80':
ARM: remove dummy entries from .so init_array/fini_array
2012-08-28 13:09:40 -07:00
Nick Kralevich
c64bb00cdf
am 773a7832
: am d7440f37
: am 7cab2188
: am ad180738
: Merge "linker: Fix ARM_R_COPY relocations"
...
* commit '773a783295e758bdef1a7e205761bcc1f832af95':
linker: Fix ARM_R_COPY relocations
2012-08-28 13:09:39 -07:00
Nick Kralevich
036fa6e669
am 54662dd4
: am 1389db8b
: am e026b1d8
: Merge "ARM: remove dummy entries from .so init_array/fini_array"
...
* commit '54662dd4de8151383be4b518f4161f171359186f':
ARM: remove dummy entries from .so init_array/fini_array
2012-08-28 13:06:48 -07:00
Nick Kralevich
773a783295
am d7440f37
: am 7cab2188
: am ad180738
: Merge "linker: Fix ARM_R_COPY relocations"
...
* commit 'd7440f3725b196f6624f74d2cee50dbdac647372':
linker: Fix ARM_R_COPY relocations
2012-08-28 13:06:47 -07:00
Nick Kralevich
54662dd4de
am 1389db8b
: am e026b1d8
: Merge "ARM: remove dummy entries from .so init_array/fini_array"
...
* commit '1389db8b94ca0cff4744dc070d99f48c6cf53b07':
ARM: remove dummy entries from .so init_array/fini_array
2012-08-28 13:04:47 -07:00
Nick Kralevich
d7440f3725
am 7cab2188
: am ad180738
: Merge "linker: Fix ARM_R_COPY relocations"
...
* commit '7cab21885ac039375264a45b2c774106415be664':
linker: Fix ARM_R_COPY relocations
2012-08-28 13:04:46 -07:00
Nick Kralevich
069c64cdf2
Merge "ARM: make sure __on_dlclose() actually gets called"
2012-08-28 13:04:22 -07:00
Nick Kralevich
953de64819
am 88160880
: am 3ffdef19
: am c7d9c400
: am c410a961
: Merge "libc: remove ctors/dtors sections"
...
* commit '88160880953e01f4fa7523938b6448f194f598a0':
libc: remove ctors/dtors sections
2012-08-28 13:02:10 -07:00
Nick Kralevich
1389db8b94
am e026b1d8
: Merge "ARM: remove dummy entries from .so init_array/fini_array"
...
* commit 'e026b1d89a0dcada499da186d4d94cc3ce5d3ef3':
ARM: remove dummy entries from .so init_array/fini_array
2012-08-28 13:01:22 -07:00
Nick Kralevich
7cab21885a
am ad180738
: Merge "linker: Fix ARM_R_COPY relocations"
...
* commit 'ad18073897378d3a13aaa6a7e7005f254ab8c1c8':
linker: Fix ARM_R_COPY relocations
2012-08-28 13:01:21 -07:00
Nick Kralevich
e026b1d89a
Merge "ARM: remove dummy entries from .so init_array/fini_array"
2012-08-28 12:49:46 -07:00
Nick Kralevich
ad18073897
Merge "linker: Fix ARM_R_COPY relocations"
2012-08-28 12:48:01 -07:00
The Android Automerger
6fa20f8296
Revert "Update ion header"
...
This reverts commit eb75db7d83
.
2012-08-28 11:49:35 -07:00
Nick Kralevich
d39c3abd5a
linker: Fix ARM_R_COPY relocations
...
Per http://infocenter.arm.com/help/topic/com.arm.doc.ihi0044d/IHI0044D_aaelf.pdf
Section 4.7.1.10, ARM_R_COPY relocations are only suppose to reference shared
libraries, not the executable itself. When resolving an R_ARM_COPY symbol,
ensure we don't look in our own symbol.
This partially addresses
http://code.google.com/p/android/issues/detail?id=28598 . After this
patch, the printfs generated by the test program are:
global = 0x42 (0x401c7000)
global = 0x42 (0x11000)
before, the output was:
global = 0x42 (0x40071000)
global = 0x0 (0x11000)
I'm still not very happy with this patch, but I think it's an improvement
over where we were at before.
This change was modeled after https://android-review.googlesource.com/38871
Change-Id: Id7ad921e58395e76a36875bcc742ec5eeba53f08
2012-08-28 11:48:32 -07:00
Nick Kralevich
8816088095
am 3ffdef19
: am c7d9c400
: am c410a961
: Merge "libc: remove ctors/dtors sections"
...
* commit '3ffdef19b4e9c8bae4fb0591afc0074eab0e5ac6':
libc: remove ctors/dtors sections
2012-08-28 10:40:58 -07:00
Nick Kralevich
3ffdef19b4
am c7d9c400
: am c410a961
: Merge "libc: remove ctors/dtors sections"
...
* commit 'c7d9c400126f1d1159025d1005248ab556dbdb7e':
libc: remove ctors/dtors sections
2012-08-28 10:38:28 -07:00
Nick Kralevich
c7d9c40012
am c410a961
: Merge "libc: remove ctors/dtors sections"
...
* commit 'c410a9613a837790d2ea13aee3f88881e0d54c17':
libc: remove ctors/dtors sections
2012-08-28 10:34:14 -07:00
Nick Kralevich
c410a9613a
Merge "libc: remove ctors/dtors sections"
2012-08-28 10:20:27 -07:00
The Android Automerger
4be256b50b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-28 06:33:16 -07:00
Ard Biesheuvel
144c291866
ARM: warn about atexit() calls from legacy shared libraries
...
Legacy ARM shared libraries use this generic version of atexit(),
which queues exit functions for invocation at program exit, at
which time the library may have been dlclose()'d, causing the
program to crash.
Change-Id: I41ae153c23268daa65ede7fb8966fc3e9caec369
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-28 11:23:06 +02:00
Ard Biesheuvel
f3cfcd869d
ARM: make CRT_LEGACY_WORKAROUND work as intended
...
To properly support legacy ARM shared libraries, libc.so needs
to export the symbols __dso_handle and atexit, even though
these are now supplied by the crt startup code.
This patch reshuffles the existing CRT_LEGACY_WORKAROUND
conditionally compiled code slightly so it works as the
original author likely intended.
Change-Id: Id6c0e94dc65b7928324a5f0bad7eba6eb2f464b9
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-28 10:27:02 +02:00
Ard Biesheuvel
c23092887f
ARM: remove dummy entries from .so init_array/fini_array
...
The runtime linker parses the ELF section headers to
discover the size of the init_array and fini_array, so
there is no point in putting NULL terminators at the end.
Change-Id: I3246cd585efce9314155600277dd829e9f37d04f
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
2012-08-28 09:55:51 +02:00