Commit graph

263 commits

Author SHA1 Message Date
Mathias Agopian
50d233fdce am 581f4305: am 76ef331c: am 7e7d6c48: use local symbols in memset so it doesn\'t screw up profiling
Merge commit '581f43056b594429b3df4678d87989c93d8f81d2'

* commit '581f43056b594429b3df4678d87989c93d8f81d2':
  use local symbols in memset so it doesn't screw up profiling
2009-10-19 17:30:11 -07:00
Mathias Agopian
581f43056b am 76ef331c: am 7e7d6c48: use local symbols in memset so it doesn\'t screw up profiling
Merge commit '76ef331cd6967ca8f5af779d25c8b634f8cdd2b6' into eclair-mr2-plus-aosp

* commit '76ef331cd6967ca8f5af779d25c8b634f8cdd2b6':
  use local symbols in memset so it doesn't screw up profiling
2009-10-19 17:19:37 -07:00
Mathias Agopian
76ef331cd6 am 7e7d6c48: use local symbols in memset so it doesn\'t screw up profiling
Merge commit '7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c' into eclair-mr2

* commit '7e7d6c48a064af82f0ec39f47b9eb803a6e1df4c':
  use local symbols in memset so it doesn't screw up profiling
2009-10-19 17:09:31 -07:00
Mathias Agopian
7e7d6c48a0 use local symbols in memset so it doesn't screw up profiling 2009-10-19 16:34:38 -07:00
David 'Digit' Turner
dfb93b8914 am b3cfdb62: am eeaf6544: Merge change I7934a799 into eclair-mr2
Merge commit 'b3cfdb6220b9ce8ec6d25984ef086fa06f157236'

* commit 'b3cfdb6220b9ce8ec6d25984ef086fa06f157236':
  Prevent spurious EINTR to freeze process debugging
2009-10-19 15:15:52 -07:00
David 'Digit' Turner
b3cfdb6220 am eeaf6544: Merge change I7934a799 into eclair-mr2
Merge commit 'eeaf6544b676f68ccdd70a3fa78f44789a1bf69c' into eclair-mr2-plus-aosp

* commit 'eeaf6544b676f68ccdd70a3fa78f44789a1bf69c':
  Prevent spurious EINTR to freeze process debugging
2009-10-19 15:03:31 -07:00
Android (Google) Code Review
eeaf6544b6 Merge change I7934a799 into eclair-mr2
* changes:
  Prevent spurious EINTR to freeze process debugging
2009-10-19 17:55:08 -04:00
David 'Digit' Turner
79d23e28ed am 5d436ddc: am 8213d5c3: am ff7b46b8: Merge change I3c998761 into eclair
Merge commit '5d436ddcae640e2b2af30a5654bec33273b7a9c3'

* commit '5d436ddcae640e2b2af30a5654bec33273b7a9c3':
  Allow the dynamic linker to relocate references to thumb symbols in NDK libraries.
2009-10-16 12:57:19 -07:00
David 'Digit' Turner
5d436ddcae am 8213d5c3: am ff7b46b8: Merge change I3c998761 into eclair
Merge commit '8213d5c3c072b23f5cc1922d232efe7338091d9b' into eclair-mr2-plus-aosp

* commit '8213d5c3c072b23f5cc1922d232efe7338091d9b':
  Allow the dynamic linker to relocate references to thumb symbols in NDK libraries.
2009-10-16 12:46:51 -07:00
David 'Digit' Turner
8213d5c3c0 am ff7b46b8: Merge change I3c998761 into eclair
Merge commit 'ff7b46b87c4d85881d88c2105a94be6c6accb628' into eclair-mr2

* commit 'ff7b46b87c4d85881d88c2105a94be6c6accb628':
  Allow the dynamic linker to relocate references to thumb symbols in NDK libraries.
2009-10-16 12:35:31 -07:00
Android (Google) Code Review
ff7b46b87c Merge change I3c998761 into eclair
* changes:
  Allow the dynamic linker to relocate references to thumb symbols in NDK libraries.
2009-10-16 15:27:36 -04:00
David 'Digit' Turner
7934a799e1 Prevent spurious EINTR to freeze process debugging 2009-10-16 12:14:04 -07:00
Andy McFadden
9c46315800 am b63e4e88: am 5f32207a: Wrap ARM abort() to improve stack trace.
Merge commit 'b63e4e88b0d13afa431864190b3515a549c16d85'

* commit 'b63e4e88b0d13afa431864190b3515a549c16d85':
  Wrap ARM abort() to improve stack trace.
2009-10-16 07:38:41 -07:00
Andy McFadden
b63e4e88b0 am 5f32207a: Wrap ARM abort() to improve stack trace.
Merge commit '5f32207a3db0bea3ca1c7f4b2b563c11b895f276' into eclair-mr2-plus-aosp

* commit '5f32207a3db0bea3ca1c7f4b2b563c11b895f276':
  Wrap ARM abort() to improve stack trace.
2009-10-16 07:28:34 -07:00
Andy McFadden
5f32207a3d Wrap ARM abort() to improve stack trace.
The code generated for Thumb and Thumb2 targets has different handling
for abort().  Because abort() is "noreturn", it doesn't need to preserve
the callee-save registers.  The Thumb2 version trashes LR and makes it
impossible to figure out who called abort().

This inserts a trivial stub function; net effect is stack traces are
reasonable after an abort().

For bug 2191452.
2009-10-15 16:29:22 -07:00
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
David 'Digit' Turner
3c99876116 Allow the dynamic linker to relocate references to thumb symbols in NDK libraries.
The lowest bit of the symbol's value should be ignored when looking at UNDEF symbols
for correctness. It is used as an ARM/Thumb flag by the linker.
2009-10-13 16:55:18 -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