Jean-Baptiste Queru
35af95026e
am 73981476
: merge from open-source master
...
Merge commit '73981476a389847e8537cca37503c43e107fadc9'
* commit '73981476a389847e8537cca37503c43e107fadc9':
Fill l_ld of linkmaps with value from soinfo::dynamic.
modified kernel headers re-generate tools to support SuperH architecture
added syscalls for SuperH which automatically generate by gensyscalls.py
2009-10-14 16:18:14 -07:00
Dima Zavin
051736be13
am 60c221cc
: am 5c328268
: libc: kernel: add linux/msm_q6venc.h kernel include for qsd8k h/w video encode
...
Merge commit '60c221ccfaf67bdd9cadfd151d0bad9d3f8482ce'
* commit '60c221ccfaf67bdd9cadfd151d0bad9d3f8482ce':
2009-10-14 16:18:06 -07:00
Iliyan Malchev
539f046a55
am 0619f2e7
: am 0e24d2c9
: update msm_camera.h
...
Merge commit '0619f2e744b239942841f7e0993d594d074a83f8'
* commit '0619f2e744b239942841f7e0993d594d074a83f8':
2009-10-14 16:18:03 -07:00
Dima Zavin
6ffc625a7a
am d704c4d7
: am 9a96aaa8
: libc: kernel: Update linux/msm_kgsl.h to latest
...
Merge commit 'd704c4d7112919f26243a2a24858332bf1fb2f5c'
* commit 'd704c4d7112919f26243a2a24858332bf1fb2f5c':
2009-10-14 16:18:00 -07:00
Mathias Agopian
72540134bd
am ab9a0025
: am e3650267
: fix [2170898] abort() doesn\'t print a stack tarce
...
Merge commit 'ab9a0025d58dde406b25d30388ecb5c9fa268e1f'
* commit 'ab9a0025d58dde406b25d30388ecb5c9fa268e1f':
2009-10-14 16:17:57 -07:00
David 'Digit' Turner
b9c37d7186
am 1f2a381e
: am fdc5c1f5
: Re-enable ARMv7 memcpy implementation.
...
Merge commit '1f2a381e844abfb364af7cfc48d8a2cb1e194637'
* commit '1f2a381e844abfb364af7cfc48d8a2cb1e194637':
2009-10-14 16:17:54 -07:00
David 'Digit' Turner
1902b53152
am 5be45ce0
: am 1e40783d
: Fix armv7-user builds by disabling the ARMv7-optimized memcpy.
...
Merge commit '5be45ce0cf81a3904c697a77fa3e73bf85aead8b'
* commit '5be45ce0cf81a3904c697a77fa3e73bf85aead8b':
2009-10-14 16:17:50 -07:00
Jean-Baptiste Queru
73981476a3
merge from open-source master
2009-10-14 08:18:23 -07:00
Dima Zavin
a8f96cf3f9
am 5c328268
: libc: kernel: add linux/msm_q6venc.h kernel include for qsd8k h/w video encode
...
Merge commit '5c32826841460294cfba98ff713b4804512bacd1'
* commit '5c32826841460294cfba98ff713b4804512bacd1':
libc: kernel: add linux/msm_q6venc.h kernel include for qsd8k h/w video encode
2009-10-14 07:56:26 -07:00
Iliyan Malchev
7fbe3c8b78
am 0e24d2c9
: update msm_camera.h
...
Merge commit '0e24d2c944e2eacd2f9ccefbfbda904fab7cf273'
* commit '0e24d2c944e2eacd2f9ccefbfbda904fab7cf273':
update msm_camera.h
2009-10-14 07:56:22 -07:00
Dima Zavin
60c221ccfa
am 5c328268
: libc: kernel: add linux/msm_q6venc.h kernel include for qsd8k h/w video encode
...
Merge commit '5c32826841460294cfba98ff713b4804512bacd1' into eclair-plus-aosp
* commit '5c32826841460294cfba98ff713b4804512bacd1':
libc: kernel: add linux/msm_q6venc.h kernel include for qsd8k h/w video encode
2009-10-13 22:40:14 -07:00
Iliyan Malchev
0619f2e744
am 0e24d2c9
: update msm_camera.h
...
Merge commit '0e24d2c944e2eacd2f9ccefbfbda904fab7cf273' into eclair-plus-aosp
* commit '0e24d2c944e2eacd2f9ccefbfbda904fab7cf273':
update msm_camera.h
2009-10-13 21:00:37 -07:00
Dima Zavin
5c32826841
libc: kernel: add linux/msm_q6venc.h kernel include for qsd8k h/w video encode
...
Change-Id: I58c6eb0d417d5a30fa245f693304a147631fd07f
Signed-off-by: Dima Zavin <dima@android.com>
2009-10-13 20:57:16 -07:00
Iliyan Malchev
0e24d2c944
update msm_camera.h
...
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-10-13 20:28:29 -07:00
Dima Zavin
f3b3c91e7d
am 9a96aaa8
: libc: kernel: Update linux/msm_kgsl.h to latest
...
Merge commit '9a96aaa8efcde245ac4ba23228b8a8d61e008d91'
* commit '9a96aaa8efcde245ac4ba23228b8a8d61e008d91':
libc: kernel: Update linux/msm_kgsl.h to latest
2009-10-13 11:51:39 -07:00
Mathias Agopian
0d19cef4c1
am e3650267
: fix [2170898] abort() doesn\'t print a stack tarce
...
Merge commit 'e36502673d98df089acbc645f077ee0c2be20c5d'
* commit 'e36502673d98df089acbc645f077ee0c2be20c5d':
fix [2170898] abort() doesn't print a stack tarce
2009-10-12 11:48:19 -07:00
David 'Digit' Turner
51192d546d
am fdc5c1f5
: Re-enable ARMv7 memcpy implementation.
...
Merge commit 'fdc5c1f56f9d21034badb8e4b092c47098f19613'
* commit 'fdc5c1f56f9d21034badb8e4b092c47098f19613':
Re-enable ARMv7 memcpy implementation.
2009-10-12 11:32:51 -07:00
David 'Digit' Turner
f406a20519
am 1e40783d
: Fix armv7-user builds by disabling the ARMv7-optimized memcpy.
...
Merge commit '1e40783d9ad29c88a4d547774e05080fc4327a2e'
* commit '1e40783d9ad29c88a4d547774e05080fc4327a2e':
Fix armv7-user builds by disabling the ARMv7-optimized memcpy.
2009-10-12 11:24:01 -07:00
Dima Zavin
d704c4d711
am 9a96aaa8
: libc: kernel: Update linux/msm_kgsl.h to latest
...
Merge commit '9a96aaa8efcde245ac4ba23228b8a8d61e008d91' into eclair-plus-aosp
* commit '9a96aaa8efcde245ac4ba23228b8a8d61e008d91':
libc: kernel: Update linux/msm_kgsl.h to latest
2009-10-07 21:43:42 -07:00
Dima Zavin
9a96aaa8ef
libc: kernel: Update linux/msm_kgsl.h to latest
...
Change-Id: I530cea1110fc6e6ccf150e6b176e708030ce8a94
Signed-off-by: Dima Zavin <dima@android.com>
2009-10-07 20:19:16 -07:00
Mathias Agopian
ab9a0025d5
am e3650267
: fix [2170898] abort() doesn\'t print a stack tarce
...
Merge commit 'e36502673d98df089acbc645f077ee0c2be20c5d' into eclair-plus-aosp
* commit 'e36502673d98df089acbc645f077ee0c2be20c5d':
fix [2170898] abort() doesn't print a stack tarce
2009-10-07 11:58:25 -07:00
David 'Digit' Turner
1f2a381e84
am fdc5c1f5
: Re-enable ARMv7 memcpy implementation.
...
Merge commit 'fdc5c1f56f9d21034badb8e4b092c47098f19613' into eclair-plus-aosp
* commit 'fdc5c1f56f9d21034badb8e4b092c47098f19613':
Re-enable ARMv7 memcpy implementation.
2009-10-07 11:48:11 -07:00
David 'Digit' Turner
5be45ce0cf
am 1e40783d
: Fix armv7-user builds by disabling the ARMv7-optimized memcpy.
...
Merge commit '1e40783d9ad29c88a4d547774e05080fc4327a2e' into eclair-plus-aosp
* commit '1e40783d9ad29c88a4d547774e05080fc4327a2e':
Fix armv7-user builds by disabling the ARMv7-optimized memcpy.
2009-10-07 11:42:33 -07:00
Mathias Agopian
e36502673d
fix [2170898] abort() doesn't print a stack tarce
...
the issue here is that abort() can be called from anywhere, in particular
from malloc or free. When we try to use the debug_log functions, these
can end up calling into some code (like malloc/free) that called abort()
in the first place and end up in an infinite recursion loop.
2009-10-06 16:02:12 -07:00
David 'Digit' Turner
fdc5c1f56f
Re-enable ARMv7 memcpy implementation.
...
Do not submit this patch before the one that modifies the Android emulator to
work-around a weird ARMv7 emulation issue. This is done to temporarily re-allow
the -user builds needed for QA.
2009-10-05 14:25:10 -07:00
Elliott Hughes
cf399f77b8
Add a GNU-compatible TEMP_FAILURE_RETRY.
...
I wondered about #ifndef, but the other macros in here don't use it.
I also wondered about __GNUC__, since this macro uses two GCC extensions.
2009-10-05 13:19:05 -07:00
David 'Digit' Turner
1e40783d9a
Fix armv7-user builds by disabling the ARMv7-optimized memcpy.
...
This is required to work-around some corny bugs in ARMv7 emulation.
The emulation itself is required to run the dex pre-optimization pass
for -user builds.
2009-10-02 19:13:27 -07:00
Iliyan Malchev
44e55ba8eb
am fe46030c
: Merge changes I3bd27087,I0c9ec550,I3a0e5e86 into eclair
...
Merge commit 'fe46030cdd97f9cf810630541df367dd2b85cae9' into eclair-plus-aosp
* commit 'fe46030cdd97f9cf810630541df367dd2b85cae9':
bionic/linker: allow resolving of symbols from library back to executable
bionic/linker: change lookup() to return soinfo, not base
Revert "Revert "bionic/linker: fix symbol lookup during relocations""
2009-09-29 15:28:53 -07:00
Android (Google) Code Review
fe46030cdd
Merge changes I3bd27087,I0c9ec550,I3a0e5e86 into eclair
...
* changes:
bionic/linker: allow resolving of symbols from library back to executable
bionic/linker: change lookup() to return soinfo, not base
Revert "Revert "bionic/linker: fix symbol lookup during relocations""
2009-09-29 18:21:53 -04:00
David 'Digit' Turner
0893d49187
am 7a9e06fa
: Merge change I2a7ad975 into eclair
...
Merge commit '7a9e06fa7e4e533074cde314f25dff3024f34a5d' into eclair-plus-aosp
* commit '7a9e06fa7e4e533074cde314f25dff3024f34a5d':
Fix ABI breakage in libc.so and libm.so between 1.6 and Eclair.
2009-09-29 15:13:15 -07:00
Android (Google) Code Review
7a9e06fa7e
Merge change I2a7ad975 into eclair
...
* changes:
Fix ABI breakage in libc.so and libm.so between 1.6 and Eclair.
2009-09-29 18:04:51 -04:00
David 'Digit' Turner
2a7ad97539
Fix ABI breakage in libc.so and libm.so between 1.6 and Eclair.
...
For a detailed description of the problem and why this fix is
needed, plrease read the comments in libgcc_compat.c
2009-09-29 14:43:38 -07:00
Iliyan Malchev
4a9afcb101
bionic/linker: allow resolving of symbols from library back to executable
...
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-09-29 14:33:46 -07:00
Iliyan Malchev
9ea64da6c5
bionic/linker: change lookup() to return soinfo, not base
2009-09-29 14:33:46 -07:00
Iliyan Malchev
6ed80c8814
Revert "Revert "bionic/linker: fix symbol lookup during relocations""
...
This reverts commit 33acbf0719
.
2009-09-29 14:33:46 -07:00
Mathias Agopian
2d77d4dbd6
am ee223d02
: NEON optimized memcpy.
...
Merge commit 'ee223d02d96815c989b62043ff1237b1cd4e14b0' into eclair-plus-aosp
* commit 'ee223d02d96815c989b62043ff1237b1cd4e14b0':
NEON optimized memcpy.
2009-09-29 13:31:57 -07:00
Mathias Agopian
ee223d02d9
NEON optimized memcpy.
...
372 MB/s for large transfers, 440 MB/s for smaller ones down to 1KB. 130 MB/s for very small transfers ( < 32 bytes )
Performance is similar with non-congruent buffers.
2009-09-28 19:08:18 -07:00
Mathias Agopian
468fc8c533
am 33acbf07
: Revert "bionic/linker: fix symbol lookup during relocations"
...
Merge commit '33acbf0719c4f3db059bc9e1f52cf554a5d0295f' into eclair-plus-aosp
* commit '33acbf0719c4f3db059bc9e1f52cf554a5d0295f':
Revert "bionic/linker: fix symbol lookup during relocations"
2009-09-27 22:20:08 -07:00
Mathias Agopian
33acbf0719
Revert "bionic/linker: fix symbol lookup during relocations"
...
This reverts commit 8d0c0334f1
.
2009-09-27 22:04:15 -07:00
Iliyan Malchev
76e3d69330
am 4e5a965d
: Merge change 27075 into eclair
...
Merge commit '4e5a965d6a4c4a0c7977cc9b90755027130c1e46' into eclair-plus-aosp
* commit '4e5a965d6a4c4a0c7977cc9b90755027130c1e46':
bionic/linker: fix symbol lookup during relocations
2009-09-27 17:35:01 -07:00
Android (Google) Code Review
4e5a965d6a
Merge change 27075 into eclair
...
* changes:
bionic/linker: fix symbol lookup during relocations
2009-09-27 20:23:22 -04:00
Iliyan Malchev
8d0c0334f1
bionic/linker: fix symbol lookup during relocations
...
When resolving relocations while loading a library, the linker used to find
symbols by looking them up in the list of all linked libraries for the current
process, as opposed to following just the library's DT_NEEDED entries. This
can cause a problem where the symbol is picked up from the wrong library.
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-09-27 17:18:06 -07:00
David 'Digit' Turner
dfa87a200f
am f355096a
: Remove NEON optimizations for memcpy
...
Merge commit 'f355096a64b74c8e869527de55f7e908873e3128' into eclair-plus-aosp
* commit 'f355096a64b74c8e869527de55f7e908873e3128':
Remove NEON optimizations for memcpy
2009-09-27 07:19:59 -07:00
David 'Digit' Turner
f355096a64
Remove NEON optimizations for memcpy
2009-09-27 07:08:46 -07:00
David 'Digit' Turner
7e5e9f4270
am bc10cd29
: Fix a typo that resulted in a crash in the boot sequence
...
Merge commit 'bc10cd2900cdb7fed077163b6a33e0f8572b2b19' into eclair-plus-aosp
* commit 'bc10cd2900cdb7fed077163b6a33e0f8572b2b19':
Fix a typo that resulted in a crash in the boot sequence
2009-09-23 16:09:39 -07:00
David 'Digit' Turner
bc10cd2900
Fix a typo that resulted in a crash in the boot sequence
2009-09-23 15:56:50 -07:00
David 'Digit' Turner
9641805419
am d154954f
: Merge change 26419 into eclair
...
Merge commit 'd154954f02691618fdf73a5a97336e64cad37af0' into eclair-plus-aosp
* commit 'd154954f02691618fdf73a5a97336e64cad37af0':
Add pthread_mutex_lock_timeout_np
2009-09-23 12:20:52 -07:00
Android (Google) Code Review
d154954f02
Merge change 26419 into eclair
...
* changes:
Add pthread_mutex_lock_timeout_np
2009-09-23 15:10:02 -04:00
David 'Digit' Turner
7910e39d19
resolved conflicts for merge of 4a05d12c
to eclair-plus-aosp
2009-09-22 15:41:36 -07:00
David 'Digit' Turner
3f56b7f65a
Add pthread_mutex_lock_timeout_np
...
This is used to perform a mutex lock for a given amount of
milliseconds before giving up. Using the _np prefix since this
is absolutely not portable.
Also remove a compiler warning in pthread_attr_getstackaddr
2009-09-22 15:17:50 -07:00