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
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
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
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
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
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
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
Elliott Hughes
53daf4757d
am 73a6566d: Merge "Remove expired dns cache entries before removing oldest"
...
* commit '73a6566da337db50cfc73c369d774ac1905a30c2':
Remove expired dns cache entries before removing oldest
2012-05-07 13:59:59 -07:00
Elliott Hughes
e636e1f2c1
am 8657eafc: Merge "Adjust memcpy for ARM Cortex A9 cache line size"
...
* commit '8657eafc3552f36c176667c1591beab255308da6':
Adjust memcpy for ARM Cortex A9 cache line size
2012-05-07 13:59:58 -07:00
Elliott Hughes
e3bc7192ec
Merge "bionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()"
2012-05-07 10:51:29 -07:00
Xi Wang
7f5aa4f35e
bionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()
...
The allocation size in chk_malloc(), leak_malloc(), and leak_memalign()
functions may be rounded up to a small value, leading to buffer overflows.
The code only runs in debugging mode.
This patch complements commit 6f04a0f4 (CVE-2009-0607).
Change-Id: Id899bcd2bcd2ea2205e5753c433390710032dc83
Signed-off-by: Xi Wang <xi.wang@gmail.com>
2012-05-07 10:50:21 -07:00
Elliott Hughes
73a6566da3
Merge "Remove expired dns cache entries before removing oldest"
2012-05-07 10:41:53 -07:00
Elliott Hughes
8657eafc35
Merge "Adjust memcpy for ARM Cortex A9 cache line size"
2012-05-07 09:13:35 -07:00
Henrik Smiding
fe6338da91
Adjust memcpy for ARM Cortex A9 cache line size
...
ARM Cortex A8 use 64 bytes and ARM Cortex A9 use 32 bytes cache line
size.
The following patch:
Adds code to adjust memcpy cache line size to match A9 cache line
size.
Adds a flag to select between 32 bytes and 64 bytes cache line
size.
Copyright (C) ST-Ericsson SA 2010
Modified neon implementation to fit Cortex A9 cache line size
Author: Henrik Smiding henrik.smiding@stericsson.com for
ST-Ericsson.
Change-Id: I8a55946bfb074e6ec0a14805ed65f73fcd0984a3
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
2012-05-07 14:18:02 +02:00
Elliott Hughes
2ddea18f81
am f7db5ecc: Merge "MIPS support to libm, libdl and libthread_db"
...
* commit 'f7db5ecc4d662da8368f31d57401ca1a39690e40':
MIPS support to libm, libdl and libthread_db
2012-05-04 18:07:11 -07:00
Elliott Hughes
f7db5ecc4d
Merge "MIPS support to libm, libdl and libthread_db"
2012-05-04 12:00:19 -07:00
Chris Dearman
726800e8f4
MIPS support to libm, libdl and libthread_db
...
Change-Id: I9106721af7fe0cd45df82976250db0d300a20117
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-05-04 11:34:40 -07:00
Elliott Hughes
5a6c96396b
am 10579fc4: Merge "Update s_fabsl.c to upstream head."
...
* commit '10579fc43d3ade285eed7318aee062a999f2784d':
Update s_fabsl.c to upstream head.
2012-05-01 04:56:57 -07:00
Elliott Hughes
10579fc43d
Merge "Update s_fabsl.c to upstream head."
2012-04-30 22:35:02 -07:00
Elliott Hughes
7735a38935
Update s_fabsl.c to upstream head.
...
Bug: http://code.google.com/p/android/issues/detail?id=29539
Change-Id: I843dcfcbfe49e8e9f43c49aae6ade1edb57a3053
2012-04-30 16:12:43 -07:00
Ken Sumrall
3f31504db9
am 6baffed2: Add the posix_memalign(3) function to bionic
...
* commit '6baffed252d0efbce5a79f356c2f156f4f818996':
Add the posix_memalign(3) function to bionic
2012-04-27 10:49:42 -07:00
Ken Sumrall
6baffed252
Add the posix_memalign(3) function to bionic
...
The posix_memalign(3) function is very similar to the traditional
memalign(3) function, but with better error reporting and a guarantee
that the memory it allocates can be freed. In bionic, memalign(3)
allocated memory can be freed, so posix_memalign(3) is just a wrapper
around memalign(3).
Change-Id: I62ee908aa5ba6b887d8446a00d8298d080a6a299
2012-04-27 09:34:53 -07:00
Mike Lockwood
4fab6f901c
am efcf8893: Merge "Update f_accessory.h kernel header" into jb-dev
...
* commit 'efcf8893a97df2eb2ecb7aab305998878771d2f2':
Update f_accessory.h kernel header
2012-04-26 13:12:54 -07:00
Mike Lockwood
efcf8893a9
Merge "Update f_accessory.h kernel header" into jb-dev
2012-04-26 13:10:25 -07:00
Nick Kralevich
2cc0894992
am b091dd9b: libc: continue to use Android\'s custom linker script
...
* commit 'b091dd9bf27a9132c4ac9da55f2f4a87ffe3b59f':
libc: continue to use Android's custom linker script
2012-04-26 11:58:48 -07:00
Nick Kralevich
b091dd9bf2
libc: continue to use Android's custom linker script
...
By default, Android no longer compiles code using it's custom
linker script /build/core/armelf.xsc. However, this causes
problems for libc. Certain programs linked using older versions
of GOLD expect libc.so to export __exidx_start and __exidx_end.
Removing the custom linker script causes libc.so not to export
those symbols.
For now, continue using the old linker script, until we can
figure out a better solution.
Change-Id: Iaf002afd63a58b848818da24e5a4525620dc4d74
2012-04-26 11:04:44 -07:00
Mike Lockwood
ed87404c44
Update f_accessory.h kernel header
...
Change-Id: I29ec4aa4843b9308cbfa412df88e026e8475b715
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-04-25 09:57:32 -07:00
Jean-Baptiste Queru
203aae7d79
Merge from AOSP
...
Change-Id: If2e8e4305d10df738cc4ebcf226077f273a48cbf
2012-04-25 09:29:40 -07:00
Andrew Hsieh
1e343cb119
Merge "[MIPS] Fix the warning originating from the kernel header signal.h. This is a clean header generated from the corresponding change in external/kernel-headers repository. (CL 35760)"
2012-04-24 23:44:18 -07:00
Raghu Gandham
e328ce6c55
[MIPS] Fix the warning originating from the kernel header signal.h.
...
This is a clean header generated from the corresponding change in
external/kernel-headers repository. (CL 35760)
2012-04-23 18:59:41 -07:00
Nick Kralevich
94179a509e
linker: remove STB_LOCAL hack
...
The ARM static linker wasn't properly handling __exidx_start
and __exidx_end symbols. Now that the static linker has been fixed,
we don't need the dynamic linker to work around this problem.
Change-Id: I041b94903609fafab33663a7d441a5e70b7ffcdd
2012-04-23 16:50:34 -07:00
Erik Gilling
baeacba04d
add linux/sw_sync.h
...
Change-Id: I79de18d04b950c21b985d5ebc01cd3306a43d318
Signed-off-by: Erik Gilling <konkers@android.com>
2012-04-18 15:37:01 -07:00
Erik Gilling
6b99103c31
add linux/sync.h
...
Change-Id: I38bb9498e18cb2b2e84a97487d4ad1e15fabd9d4
Signed-off-by: Erik Gilling <konkers@android.com>
2012-04-18 14:23:04 -07:00
Evgeniy Stepanov
4a9d6e50bb
Fix segv when unwinding stack past __libc_init.
...
This change mirrors cd15bac for statically-linked binaries.
Change-Id: Id870832a50b37f0ef3e79e1ed03ed31390bfc9ef
2012-04-18 12:59:38 +04:00
Elliott Hughes
762a4fe2ee
resolved conflicts for merge of 35d592cc to master
...
Change-Id: I8184302daf61814d26c837f9920b4e68d96d7f65
2012-04-16 14:40:26 -07:00
Elliott Hughes
f848321c4f
resolved conflicts for merge of ef987656 to master
...
Change-Id: I3854de8f4cddaf344444efa6f9da027642a237d9
2012-04-16 14:26:43 -07:00
Elliott Hughes
8ecb4770a0
resolved conflicts for merge of 6b8fd054 to master
...
Change-Id: Ifc5a10d9c2f7764ad80d64cc552aad81d5fbf5eb
2012-04-16 14:16:42 -07:00
Elliott Hughes
8266cf94d3
am ff219e57: am 6435d27f: Merge "bionic: fix NULL parameter failure in getcwd()"
...
* commit 'ff219e57c0ffe5ac2816f79677ce4f1afa677277':
bionic: fix NULL parameter failure in getcwd()
2012-04-16 13:15:13 -07:00
Elliott Hughes
35d592cc5a
am 418e647a: Merge "libstdc++: Fix x86 thread-safe one-time-construction implementation."
...
* commit '418e647a8300bb8e62b6b73814a5211152cbaacd':
libstdc++: Fix x86 thread-safe one-time-construction implementation.
2012-04-16 13:12:47 -07:00
Elliott Hughes
ef9876569a
am 4994deae: Merge "Bionic: Fix wrong prototype of system call clock_nanosleep"
...
* commit '4994deaef51d5fa1ac12e6160b47d9cbe3b2bc43':
Bionic: Fix wrong prototype of system call clock_nanosleep
2012-04-16 13:12:46 -07:00
Elliott Hughes
6b8fd05414
am 7b8666e6: Merge "bionic: Fix wrong prototype of system call getresuid/getresgid"
...
* commit '7b8666e683e56549091b86fd7b9c421fd0124dbc':
bionic: Fix wrong prototype of system call getresuid/getresgid
2012-04-16 13:12:46 -07:00
Elliott Hughes
ff219e57c0
am 6435d27f: Merge "bionic: fix NULL parameter failure in getcwd()"
...
* commit '6435d27f9d45d01fbd15bcc3dcd9617b86b825bb':
bionic: fix NULL parameter failure in getcwd()
2012-04-16 13:12:45 -07:00
Elliott Hughes
418e647a83
Merge "libstdc++: Fix x86 thread-safe one-time-construction implementation."
2012-04-16 09:13:13 -07:00
Elliott Hughes
4994deaef5
Merge "Bionic: Fix wrong prototype of system call clock_nanosleep"
2012-04-16 09:09:05 -07:00
Elliott Hughes
7b8666e683
Merge "bionic: Fix wrong prototype of system call getresuid/getresgid"
2012-04-16 09:06:22 -07:00