Wink Saville
b9e49ad56e
Use a recursive lock for pthread_once. DO NOT MERGE.
...
Backport change I9fc8b790 from Master to Gingerbread
Change-Id: I5cf48fcd4efb7991ed82f87d9365c19655dc9b7f
2010-09-22 14:51:53 -07:00
Brian Carlstrom
d1714c29fc
Merge commit 'fedbcde6ef552e84bf7ce7598bca7dddf1722d6a' into mm
2010-09-20 10:30:10 -07:00
Brian Swetland
c6d4084ad0
am f3833b67
: am fedbcde6
: add /vendor support
...
Merge commit 'f3833b67ee4773f2732814efe9e099558167976e'
* commit 'f3833b67ee4773f2732814efe9e099558167976e':
add /vendor support
2010-09-19 04:46:14 -07:00
Brian Swetland
f3833b67ee
am fedbcde6
: add /vendor support
...
Merge commit 'fedbcde6ef552e84bf7ce7598bca7dddf1722d6a' into gingerbread-plus-aosp
* commit 'fedbcde6ef552e84bf7ce7598bca7dddf1722d6a':
add /vendor support
2010-09-19 03:51:34 -07:00
Brian Swetland
fedbcde6ef
add /vendor support
...
- add /vendor/lib to front of default library search path
- remove long-obsolete /lib from default library search path
Change-Id: I7d33bf899be018e7cc4c213d5790bbd991023a62
2010-09-19 03:39:13 -07:00
Brian Carlstrom
9c49fee3f2
Merge commit 'cb99ab98c99291a6c90043009ab8d64ec8058f9d' into mm
2010-09-15 12:09:01 -07:00
Kenny Root
6b0e8b5e20
am b6e3fb0f
: am cb99ab98
: Add wmemcmp to Android.mk
...
Merge commit 'b6e3fb0f3ffee60e7cf810117e78b81abaeb5046'
* commit 'b6e3fb0f3ffee60e7cf810117e78b81abaeb5046':
Add wmemcmp to Android.mk
2010-09-15 11:38:40 -07:00
Kenny Root
b6e3fb0f3f
am cb99ab98
: Add wmemcmp to Android.mk
...
Merge commit 'cb99ab98c99291a6c90043009ab8d64ec8058f9d' into gingerbread-plus-aosp
* commit 'cb99ab98c99291a6c90043009ab8d64ec8058f9d':
Add wmemcmp to Android.mk
2010-09-14 12:31:03 -07:00
Jean-Baptiste Queru
e035a2d7c7
am ef3644d1
: am 312be567
: Merge "Use ARMv6 instruction for handling byte order"
...
Merge commit 'ef3644d110bcb44010672c0ad0bc7c96fd130c8f'
* commit 'ef3644d110bcb44010672c0ad0bc7c96fd130c8f':
Use ARMv6 instruction for handling byte order
2010-09-10 17:24:24 -07:00
Jean-Baptiste Queru
ef3644d110
am 312be567
: Merge "Use ARMv6 instruction for handling byte order"
...
Merge commit '312be567a03aaf851707a268807ee666b12f8c74' into gingerbread-plus-aosp
* commit '312be567a03aaf851707a268807ee666b12f8c74':
Use ARMv6 instruction for handling byte order
2010-09-10 16:37:38 -07:00
Jean-Baptiste Queru
312be567a0
Merge "Use ARMv6 instruction for handling byte order"
2010-09-10 16:02:59 -07:00
Jean-Baptiste Queru
042ebe0e32
am 6bf08d13
: am 3558834c
: Merge "Move the atom optimization flags into TARGET_linux-x86.mk."
...
Merge commit '6bf08d131f4109088b7fa1e53196513636c49e9b'
* commit '6bf08d131f4109088b7fa1e53196513636c49e9b':
Move the atom optimization flags into TARGET_linux-x86.mk.
2010-09-10 14:52:37 -07:00
Jean-Baptiste Queru
6bf08d131f
am 3558834c
: Merge "Move the atom optimization flags into TARGET_linux-x86.mk."
...
Merge commit '3558834c565bbfe96dfcf233373c3814b4655347' into gingerbread-plus-aosp
* commit '3558834c565bbfe96dfcf233373c3814b4655347':
Move the atom optimization flags into TARGET_linux-x86.mk.
2010-09-10 13:03:15 -07:00
Kenny Root
cb99ab98c9
Add wmemcmp to Android.mk
...
Change-Id: I9dc96d72b2becdd31981b4d176a13358aef6dcb9
2010-09-10 12:20:58 -07:00
Jean-Baptiste Queru
3558834c56
Merge "Move the atom optimization flags into TARGET_linux-x86.mk."
2010-09-09 14:09:41 -07:00
Erik Gilling
614628b018
update linux/tegrafb.h
...
Change-Id: I5edab909e5fe491a95729aa89b2f37c02af6bcba
2010-09-08 15:29:08 -07:00
Dmitry Shmidt
cee39c250c
Merge "Update if.h, if_vlan,h and add in_route.h"
2010-09-08 11:36:50 -07:00
Dmitry Shmidt
2a8245c914
Update if.h, if_vlan,h and add in_route.h
...
Change-Id: I557a5ab71ea8dee18f5666b660fc73889c759851
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-08 11:32:16 -07:00
Keith Deacon
8f670c8e41
am d7b156d2
: am 3a1bbee3
: Add eventfd system call support
...
Merge commit 'd7b156d2a38e58ab1e5f9e6a4b420588aeb78b46'
* commit 'd7b156d2a38e58ab1e5f9e6a4b420588aeb78b46':
Add eventfd system call support
2010-09-08 03:10:44 -07:00
Keith Deacon
d7b156d2a3
am 3a1bbee3
: Add eventfd system call support
...
Merge commit '3a1bbee36b773862e88c6f1895b607c0cd81b499' into gingerbread-plus-aosp
* commit '3a1bbee36b773862e88c6f1895b607c0cd81b499':
Add eventfd system call support
2010-09-08 03:06:26 -07:00
Andy McFadden
f0c5eeeeef
Merge "Add a memory barrier to cond var signaling."
2010-09-07 14:05:33 -07:00
Rebecca Schultz Zavin
b8faf0662b
Merge "Fix libthread_db linkage"
2010-09-03 15:24:33 -07:00
Brian Carlstrom
e0aa3967ee
Merge commit '6e42398dd66d1ec7d84257f78c07dcc7f29a2283' into mm
2010-09-03 10:53:34 -07:00
Iliyan Malchev
575d6b3f10
bionic: update processed cpcap_audio.h
...
Change-Id: I6ef25c4c95aaebdf4efc2561a726a0ce1c90032e
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-09-03 10:09:37 -07:00
Antti Hatala
94962b9c9c
Fix libthread_db linkage
...
libthread_db depends on libc but since unresolved symbols were allowed
in the makefile this problem was never realized until gdbserver tried
to link with it, failing in the runtime.
Change-Id: If2ee319a2503c81abf3010829444f920c7c0c227
2010-09-02 14:00:59 -07:00
Andy McFadden
e2ac89869f
Add a memory barrier to cond var signaling.
...
This adds an explicit memory barrier to condition variable signaling.
It's a little murky as to whether it's strictly required, but it seems
like a wise thing to do.
Change-Id: Id0faa542d61e4b8ffa775e4adf68e4d7471f4fb7
2010-09-02 13:34:53 -07:00
rich cannings
964a14d0dd
am 9579ee38
: am 6e42398d
: Merge "Fix return value." into gingerbread
...
Merge commit '9579ee380c06f1ac6ca85c78d5172c82f10555d0'
* commit '9579ee380c06f1ac6ca85c78d5172c82f10555d0':
Fix return value.
2010-08-31 15:55:44 -07:00
rich cannings
9579ee380c
am 6e42398d
: Merge "Fix return value." into gingerbread
...
Merge commit '6e42398dd66d1ec7d84257f78c07dcc7f29a2283' into gingerbread-plus-aosp
* commit '6e42398dd66d1ec7d84257f78c07dcc7f29a2283':
Fix return value.
2010-08-31 15:52:47 -07:00
rich cannings
6e42398dd6
Merge "Fix return value." into gingerbread
2010-08-31 15:48:25 -07:00
Jesse Wilson
a7a86dc553
Make timezones available to the host build.
2010-08-31 15:40:05 -07:00
rich cannings
e44cb1a35c
Fix return value.
...
Return a valid pointer (not NULL) when the character "c" is at the end of "src".
Change-Id: Iab0b677943f2c8a9fbb255c44689f5d6dc3535d7
Example:
memccpy(dest, "xzy", 'y', 3) should return dest+3 rather than null.
2010-08-31 15:19:38 -07:00
Keith Deacon
3a1bbee36b
Add eventfd system call support
2010-08-31 16:16:01 -05:00
Jesse Wilson
a93baa9fc6
am 3fda8700
: am cc6b1829
: Merge "Make timezones available to the host build." into gingerbread
...
Merge commit '3fda8700bd042fbb7ac37e2bbe7496df8a087244'
* commit '3fda8700bd042fbb7ac37e2bbe7496df8a087244':
Make timezones available to the host build.
2010-08-31 14:06:19 -07:00
Jesse Wilson
3fda8700bd
am cc6b1829
: Merge "Make timezones available to the host build." into gingerbread
...
Merge commit 'cc6b18291075a7960ad0d638d2047f41be1297e8' into gingerbread-plus-aosp
* commit 'cc6b18291075a7960ad0d638d2047f41be1297e8':
Make timezones available to the host build.
2010-08-31 14:04:15 -07:00
Jesse Wilson
cc6b182910
Merge "Make timezones available to the host build." into gingerbread
2010-08-31 14:01:13 -07:00
Jesse Wilson
e77d54d98a
Make timezones available to the host build.
...
Change-Id: Ib2c89ac13b03f07c6c712a544bc0d5d1c9dc57df
2010-08-31 13:16:25 -07:00
Jean-Baptiste Queru
2577f413fa
am 97b06ef7
: Merge (ignore) from open-source master tree
...
Merge commit '97b06ef7ddf66dae500e94b55d943cad61d28ae7'
* commit '97b06ef7ddf66dae500e94b55d943cad61d28ae7':
2010-08-31 13:13:06 -07:00
Jean-Baptiste Queru
97b06ef7dd
Merge (ignore) from open-source master tree
...
Change-Id: Ie735c3282ddc17c1e28e1069b714f3a310c221a2
2010-08-31 13:08:11 -07:00
Jim Huang
aa35095517
Use ARMv6 instruction for handling byte order
...
ARMv6 ISA has several instructions to handle data in different byte order.
For endian conversion (byte swapping) of single data words, it might be a
good idea to use the REV/REV16 instruction simply.
Change-Id: Ic4a5ed6254e082763e54aa70d428f59a0088636e
2010-08-31 14:51:44 +08:00
Jean-Baptiste Queru
c111863fbf
resolved conflicts for merge of a1727092
to gingerbread-plus-aosp
...
Change-Id: Icce8b9cb0c6ebfe2c4278c19c50aafb85a9ba4d8
2010-08-30 14:13:18 -07:00
David 'Digit' Turner
db0017e5e2
am 994b68f5
: resolved conflicts for merge of 6a51defa
to gingerbread-plus-aosp
...
Merge commit '994b68f5c7d637d2945c06260fe35b266c10379d'
* commit '994b68f5c7d637d2945c06260fe35b266c10379d':
Fix __get_tls() in static C library to use kernel helpers.
2010-08-29 17:48:55 -07:00
David 'Digit' Turner
994b68f5c7
resolved conflicts for merge of 6a51defa
to gingerbread-plus-aosp
...
Change-Id: I0367bcffe9179904ca820e3b824dddfa47594f63
2010-08-29 17:41:36 -07:00
David 'Digit' Turner
6a51defa03
Fix __get_tls() in static C library to use kernel helpers.
...
This is needed to fix gdbserver's handling of threaded programs,
among other things.
Change-Id: I823387c602cef9891532da946a01db14be780ab0
2010-08-27 08:19:19 -07:00
Nick Pelly
67b2206bbd
Merge "Add clean kernel header perf_event.h"
2010-08-26 11:31:53 -07:00
Szymon Jakubczak
75a3689b69
am 41e533af
: added missing ether_aton and ether_ntoa
...
Merge commit '41e533af4a2720c1dc228ba40b6582ca53085c3a'
* commit '41e533af4a2720c1dc228ba40b6582ca53085c3a':
added missing ether_aton and ether_ntoa
2010-08-25 09:56:25 -07:00
Szymon Jakubczak
41e533af4a
added missing ether_aton and ether_ntoa
...
Change-Id: I32ee448abde4d5693d393030ed77ddc6d2ad1dfc
2010-08-25 08:46:23 -07:00
Brian Carlstrom
8e6451ed0a
Merge commit '22f1e3d4fae7d45cc439da94690d786ed44756fb' into mm
2010-08-24 15:56:52 -07:00
Nick Pelly
976c44be65
Add clean kernel header perf_event.h
...
Change-Id: I0d0e9da7579b1cccb9492ad8d594fe24dc1296e3
Signed-off-by: Nick Pelly <npelly@google.com>
2010-08-24 11:10:05 -07:00
Iliyan Malchev
a169e31a06
bionic: add processed audio-driver (i2s & cpcap) headers
...
Change-Id: Ib7db8aded1d41f54bbd681df116571c1996c569c
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-08-23 21:01:55 -07:00
Rebecca Schultz Zavin
eae561b2ab
Merge "Headers for tegra_camera device"
2010-08-19 16:55:54 -07:00