The Android Open Source Project
75931ee6e1
am 918e6a73: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '918e6a730cd059392ee6d8b5c5a0f5fa0e5bbd93':
Revert "linker: remove STB_LOCAL hack"
Revert "Reference __dso_handle in PIC way"
Revert "Use the new NativeDaemonConnector style."
libc: Add __aeabi_llsl and __aeabi_llsr to libgcc_compat
2012-05-16 08:34:13 -07:00
The Android Open Source Project
918e6a730c
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I5a5b95da6c33afbc36893e162f3b57c09c161ee2
2012-05-16 08:31:49 -07:00
Ying Wang
fc9e525fe0
Rename the misleading var name TARGET_OUT_STATIC_LIBRARIES
...
TARGET_OUT_STATIC_LIBRARIES is actually the same as
TARGET_OUT_INTERMEDIATE_LIBRARIES.
Change-Id: I11ac35256031d461d20156cd4c19ed7eae781d22
2012-05-15 15:15:11 -07:00
Elliott Hughes
1b56aaa659
am f2f7bf76: am 4f05d1c7: Merge "bionic/x86: Optimization for memcpy"
...
* commit 'f2f7bf76dfd1d6014ed3baa1e27b221388e70a09':
bionic/x86: Optimization for memcpy
2012-05-10 23:15:00 -07:00
Elliott Hughes
f2f7bf76df
am 4f05d1c7: Merge "bionic/x86: Optimization for memcpy"
...
* commit '4f05d1c758ba141c617f25251a661ecb66627e9e':
bionic/x86: Optimization for memcpy
2012-05-10 21:31:48 -07:00
Elliott Hughes
4f05d1c758
Merge "bionic/x86: Optimization for memcpy"
2012-05-10 10:14:44 -07:00
Iliyan Malchev
83a38b8c44
am 8034415d: resolved conflicts for merge of 08e72d01 to jb-dev-plus-aosp
...
* commit '8034415ddd8404f8788199ed993af89692235dc5':
bionic: add support for non-NEON memcpy() on NEON SoCs
2012-05-10 09:24:46 -07:00
Iliyan Malchev
8034415ddd
resolved conflicts for merge of 08e72d01 to jb-dev-plus-aosp
...
Change-Id: If00e354a5953ed54b31963d4f8ea77e1603c321e
2012-05-10 09:19:59 -07:00
The Android Automerger
4dc3a7e1ed
merge in jb-release history after reset to jb-dev
2012-05-10 06:59:27 -07:00
Elliott Hughes
537867aed8
am 804147cb: am edb7cad9: Merge "Actually set the header guard in "linux-syscalls.h"."
...
* commit '804147cb7d533f5635da6adc28fbca1467a3078b':
Actually set the header guard in "linux-syscalls.h".
2012-05-09 20:12:40 -07:00
Elliott Hughes
804147cb7d
am edb7cad9: Merge "Actually set the header guard in "linux-syscalls.h"."
...
* commit 'edb7cad9b764f029c5faac2750f749d3d84bd86a':
Actually set the header guard in "linux-syscalls.h".
2012-05-09 20:10:14 -07:00
Elliott Hughes
edb7cad9b7
Merge "Actually set the header guard in "linux-syscalls.h"."
2012-05-09 16:39:40 -07:00
Elliott Hughes
1928523c87
Actually set the header guard in "linux-syscalls.h".
...
Spotted while merging a MIPS change.
Change-Id: I36fb5a07d0bba0c117e9fe9733957bd37ca4b4c0
2012-05-09 16:34:11 -07:00
Elliott Hughes
2a5fab9a5f
am dbd5ecad: resolved conflicts for merge of e5408907 to jb-dev-plus-aosp
...
* commit 'dbd5ecad26e39281bb83f97664bc32555c5c071a':
[MIPS] Add support for MIPS syscalls
2012-05-09 13:57:12 -07:00
Elliott Hughes
dbd5ecad26
resolved conflicts for merge of e5408907 to jb-dev-plus-aosp
...
Change-Id: If4c3f51bf87b28da8074be2e46ae772a374b266f
2012-05-09 13:53:37 -07:00
Prajakta Gudadhe
08e72d0161
bionic: add support for non-NEON memcpy() on NEON SoCs
...
Some SoCs that support NEON nevertheless perform better with a non-NEON than a
NEON memcpy(). This patch adds build variable ARCH_ARM_USE_NON_NEON_MEMCPY,
which can be set in BoardConfig.mk. When ARCH_ARM_USE_NON_NEON_MEMCPY is
defined, we compile in the non-NEON optimized memcpy() even if the SoC supports
NEON.
Change-Id: Ia0e5bee6bad5880ffc5ff8f34a1382d567546cf9
2012-05-09 13:34:31 -07:00
Elliott Hughes
fd8bd2c432
am 58a00b49: am 7eb1cc23: Merge "bionic: allow the board to customize MALLOC_ALIGNMENT"
...
* commit '58a00b4977b6fa073a8f56d94d741b1e4cb49856':
bionic: allow the board to customize MALLOC_ALIGNMENT
2012-05-09 12:56:15 -07:00
Elliott Hughes
22167aafba
am eab2889e: am fd955033: Merge "pthread: Invalidate stale stack pointers on pthread_exit()"
...
* commit 'eab2889e66d4fe03f3c5590d7e8b14e3777179ec':
pthread: Invalidate stale stack pointers on pthread_exit()
2012-05-09 12:56:15 -07:00
Elliott Hughes
58a00b4977
am 7eb1cc23: Merge "bionic: allow the board to customize MALLOC_ALIGNMENT"
...
* commit '7eb1cc23f8976a2062ba0cf92f030216a8e64e60':
bionic: allow the board to customize MALLOC_ALIGNMENT
2012-05-09 12:53:16 -07:00
Elliott Hughes
eab2889e66
am fd955033: Merge "pthread: Invalidate stale stack pointers on pthread_exit()"
...
* commit 'fd95503347acba5c52d669a186ad2b161338a8a7':
pthread: Invalidate stale stack pointers on pthread_exit()
2012-05-09 12:53:16 -07:00
Elliott Hughes
e54089079b
Merge "[MIPS] Add support for MIPS syscalls"
2012-05-09 11:50:07 -07:00
Raghu Gandham
1fa0d84957
[MIPS] Add support for MIPS syscalls
...
Change-Id: I4deba67e15c865c4c2db03064c04098a09828ea6
Signed-off-by: Raghu Gandham <raghu@mips.com >
Signed-off-by: Chris Dearman <chris@mips.com >
2012-05-09 11:46:28 -07:00
Elliott Hughes
7d4da4ea5c
am 57f8d4b5: resolved conflicts for merge of 3919b96e to jb-dev-plus-aosp
...
* commit '57f8d4b5b5564fad7a9c7f8a6e5108f31c75056f':
Implement the "abort" stub in assembly for ARM.
2012-05-09 10:13:02 -07:00
Ben Cheng
8e38a509d2
am da0d8534: am 08b51e2c: Implement the "abort" stub in assembly for ARM.
...
* commit 'da0d8534f1a6273a383f1dc631fbaf032674bb4d':
Implement the "abort" stub in assembly for ARM.
2012-05-09 10:12:04 -07:00
Elliott Hughes
7eb1cc23f8
Merge "bionic: allow the board to customize MALLOC_ALIGNMENT"
2012-05-09 09:52:56 -07:00
Jack Ren
2fd81ef71c
bionic: allow the board to customize MALLOC_ALIGNMENT
...
Currently the dlmalloc allocates the memory with 8-byte alignment.
According to the com.aurorasoftworks.quadrant.ui.professional benchmark data:
We can get much better memory performance if we change it to be 16-byte aligned.
For example, On Nexus-S:
8-byte aligned :
1378 1070 1142 1665 1765 1163 1179 1263 1404 avg: 1336.555555556
16-byte aligned:
1691 1731 1780 1691 1671 1678 1802 1758 1780 avg: 1731.333333333
gain: 29.53%
That patch provides flexibity to customize the MALLOC_ALIGNMENT from the
board config.The macro MALLOC_ALIGNMENT defaults to 8.
To change it, please define BOARD_MALLOC_ALIGNMENT in the BoardConfig.mk:
BOARD_MALLOC_ALIGNMENT := <whatever>
Change-Id: I8da0376944a0bbcef1d0fc026bfb6d9125db9739
Signed-off-by: Jin Wei <wei.a.jin@intel.com >
Signed-off-by: Jack Ren <jack.ren@intel.com >
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com >
2012-05-09 09:52:22 -07:00
Elliott Hughes
fd95503347
Merge "pthread: Invalidate stale stack pointers on pthread_exit()"
2012-05-09 09:46:02 -07:00
Elliott Hughes
57f8d4b5b5
resolved conflicts for merge of 3919b96e to jb-dev-plus-aosp
...
Change-Id: I80571b5f024a4e1abe2606d10e07006f53bbc01f
2012-05-09 09:38:40 -07:00
The Android Automerger
e2390bff2e
merge in jb-release history after reset to jb-dev
2012-05-09 07:46:07 -07:00
Elliott Hughes
1d8b9ef92c
am a674a571: am 20bea000: Merge "Cherry-pick "generate PIC code"."
...
* commit 'a674a571dbf0eebf4825f80f3ab229b1d62d49da':
Cherry-pick "generate PIC code".
2012-05-09 01:54:16 -07:00
Ben Cheng
da0d8534f1
am 08b51e2c: Implement the "abort" stub in assembly for ARM.
...
* commit '08b51e2c091d036c124259ae59eb7be6bbe346af':
Implement the "abort" stub in assembly for ARM.
2012-05-09 01:48:40 -07:00
Elliott Hughes
a674a571db
am 20bea000: Merge "Cherry-pick "generate PIC code"."
...
* commit '20bea00090e530f2e6f4d97de4b7cf8031b86a86':
Cherry-pick "generate PIC code".
2012-05-08 19:57:58 -07:00
Bjorn Andersson
0753dc653e
pthread: Invalidate stale stack pointers on pthread_exit()
...
A call to pthread_key_delete() after pthread_exit() have unmapped the stack of a thread
but before the ongoing pthread_join() have finished executing will result in an access
to unmapped memory.
Avoid this by invalidating the stack_base and tls pointers during pthread_exit().
This is based on the investigation and proprosed solution by
Srinavasa Nagaraju <srinavasa.x.nagaraju@sonyericsson.com >
Change-Id: I145fb5d57930e91b00f1609d7b2cd16a55d5b3a9
2012-05-08 17:43:57 -07:00
Elliott Hughes
a4e84d285c
am 9c3eca7b: resolved conflicts for merge of 6cf3c7c5 to jb-dev-plus-aosp
...
* commit '9c3eca7bcee694e6a477a7d50065f11cf1e805bb':
Let pthread_create fail if schedparam can't be set
2012-05-08 15:13:20 -07:00
Elliott Hughes
3919b96ecc
Merge "Implement the "abort" stub in assembly for ARM."
2012-05-08 14:54:57 -07:00
Ben Cheng
eda7be454d
Implement the "abort" stub in assembly for ARM.
...
So that we can always get the full stack trace regardless of gcc's handling
of the "noreturn" attribute associated with abort().
(Cherry pick of Id264a5167e7cabbf11515fbc48f5469c527e34d4.)
Bug: 6455193
Conflicts:
libc/Android.mk
Change-Id: I568fc5303fd1d747075ca933355f914122f94dac
2012-05-08 14:47:20 -07:00
Ben Cheng
08b51e2c09
Implement the "abort" stub in assembly for ARM.
...
So that we can always get the full stack trace regardless of gcc's handling
of the "noreturn" attribute associated with abort().
[cherry-picked from master]
BUG:6455193
Change-Id: I0102355f5bf20e636d3feab9d1424495f38e39e2
2012-05-08 14:39:35 -07:00
Ben Cheng
12cbf0605e
Merge "Implement the "abort" stub in assembly for ARM."
2012-05-08 14:01:22 -07:00
Ben Cheng
017f438534
Implement the "abort" stub in assembly for ARM.
...
So that we can always get the full stack trace regardless of gcc's handling
of the "noreturn" attribute associated with abort().
BUG:6455193
Change-Id: Id264a5167e7cabbf11515fbc48f5469c527e34d4
2012-05-08 13:43:12 -07:00
Elliott Hughes
9c3eca7bce
resolved conflicts for merge of 6cf3c7c5 to jb-dev-plus-aosp
...
Change-Id: Ib22a8ae1ef63bf9b9c82ce6e22afd188ba7c2806
2012-05-08 13:26:28 -07:00
Jack Ren
c47703a521
bionic/x86: Optimization for memcpy
...
Signed-off-by: Liubov Dmitrieva <liubov.dmitrieva@intel.com >
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com >
Signed-off-by: Wei A Jin <wei.a.jin@intel.com >
Signed-off-by: Jack Ren <jack.ren@intel.com >
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
Conflicts:
libc/arch-x86/string/ssse3-memcpy5.S
Change-Id: I41e70d1d19d5457e65c89b64da452fbdaf3a00a7
2012-05-08 12:18:25 -07:00
Elliott Hughes
20bea00090
Merge "Cherry-pick "generate PIC code"."
2012-05-08 11:56:13 -07:00
Nick Kralevich
5982e33aca
Cherry-pick "generate PIC code".
...
Change-Id: I7d5f2e5663df263493f65e364c959e663fc4d13a
2012-05-08 11:53:28 -07:00
Elliott Hughes
2eef0ca111
am ff0d1ce4: am e3bc7192: Merge "bionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()"
...
* commit 'ff0d1ce4dfceb35a65440259c3f325106fc9e39b':
bionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()
2012-05-08 11:32:58 -07:00
Elliott Hughes
9b25457498
am 53daf475: am 73a6566d: Merge "Remove expired dns cache entries before removing oldest"
...
* commit '53daf4757d36522c132006e2f74ed81bb4ed717a':
Remove expired dns cache entries before removing oldest
2012-05-08 11:32:57 -07:00
Elliott Hughes
e34c7ffc57
am e636e1f2: am 8657eafc: Merge "Adjust memcpy for ARM Cortex A9 cache line size"
...
* commit 'e636e1f2c17d7097b6638cb4ae2b4857765b502d':
Adjust memcpy for ARM Cortex A9 cache line size
2012-05-08 11:32:55 -07:00
Elliott Hughes
6cf3c7c50a
Merge "Let pthread_create fail if schedparam can't be set"
2012-05-08 10:56:01 -07:00
Pierre Peiffer
d0c884d359
Let pthread_create fail if schedparam can't be set
...
The creation of a thread succeeds even if the requested scheduling
parameters can not be set. This is not POSIX compliant, and even
worse, it leads to a wrong behavior. Let pthread_create() fail in this
case.
Change-Id: Ice66e2a720975c6bde9fe86c2cf8f649533a169c
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com >
2012-05-08 10:54:51 -07:00
Nick Kralevich
a2758f19ce
libc: stop using the custom linker script
...
stop using the custom linker script. It prevents relro from
working on libc.
This reverts commit b091dd9bf2 .
2012-05-07 14:33:32 -07:00
Elliott Hughes
ff0d1ce4df
am e3bc7192: Merge "bionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()"
...
* commit 'e3bc7192ec4254bed00eb8b352735665c6072995':
bionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()
2012-05-07 14:00:01 -07:00