OSDN Git Service
David 'Digit' Turner [Tue, 28 Sep 2010 19:48:07 +0000 (12:48 -0700)]
am
9aac3824: am
bd8d987b: libc: remove C++ comments from public headers.
Merge commit '
9aac38249b579282ae8eaa630de3deaf97c4edff'
* commit '
9aac38249b579282ae8eaa630de3deaf97c4edff':
libc: remove C++ comments from public headers.
David 'Digit' Turner [Tue, 28 Sep 2010 07:13:43 +0000 (00:13 -0700)]
am
bd8d987b: libc: remove C++ comments from public headers.
Merge commit '
bd8d987b3c3aa6d9d00cede2cb091f00bdb42204' into gingerbread-plus-aosp
* commit '
bd8d987b3c3aa6d9d00cede2cb091f00bdb42204':
libc: remove C++ comments from public headers.
Elliott Hughes [Mon, 27 Sep 2010 18:51:39 +0000 (11:51 -0700)]
am
8120a8df: am
3cf53d1a: Fixes for the ARM-specific bswap_16, bswap_32, and bswap_64.
Merge commit '
8120a8df848e6dec31ef5f00bc0b41ed95ce1310'
* commit '
8120a8df848e6dec31ef5f00bc0b41ed95ce1310':
Fixes for the ARM-specific bswap_16, bswap_32, and bswap_64.
Elliott Hughes [Mon, 27 Sep 2010 18:39:39 +0000 (11:39 -0700)]
am
3cf53d1a: Fixes for the ARM-specific bswap_16, bswap_32, and bswap_64.
Merge commit '
3cf53d1a7814e1520df09d24b009c16f4f27db0d' into gingerbread-plus-aosp
* commit '
3cf53d1a7814e1520df09d24b009c16f4f27db0d':
Fixes for the ARM-specific bswap_16, bswap_32, and bswap_64.
David 'Digit' Turner [Sun, 26 Sep 2010 21:00:36 +0000 (23:00 +0200)]
libc: remove C++ comments from public headers.
Change-Id: I4af84f912062cd2ff34711c25122fb323f20c032
Elliott Hughes [Sat, 25 Sep 2010 00:55:58 +0000 (17:55 -0700)]
Fixes for the ARM-specific bswap_16, bswap_32, and bswap_64.
1. Make the feature test work by excluding known-deficient processors, so
we don't have to maintain a complete list of all the processors that support
REV and REV16.
2. Don't abuse 'register' to get an effect similar to GCC's +l constraint,
but which was unnecessarily restrictive.
3. Fix __swap64md so _x isn't clobbered, breaking 64-bit swaps.
4. Make <byteswap.h> (which declars bswap_16 and friends) use <endian.h>
rather than <sys/endian.h>, so we get the machine-dependent implementations.
Change-Id: I6a38fad7a9fbe394aff141489617eb3883e1e944
Andy McFadden [Fri, 24 Sep 2010 14:42:30 +0000 (07:42 -0700)]
Merge "Add memory barriers to pthread_once."
Rebecca Schultz Zavin [Fri, 24 Sep 2010 06:19:53 +0000 (23:19 -0700)]
Merge "New headers for camera"
Rebecca Schultz Zavin [Fri, 24 Sep 2010 06:19:26 +0000 (23:19 -0700)]
New headers for camera
Change-Id: I1136aba4aa0d588c7c37da9774bd69a78bcac656
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Andy McFadden [Thu, 23 Sep 2010 19:30:12 +0000 (12:30 -0700)]
Add memory barriers to pthread_once.
The implementation was using a double-checked locking approach that
could break on SMP.
In addition to the barriers I also switched to a volatile pointer. I
don't think this will matter unless gcc can conclude that _normal_lock
can't affect *once_control, but I figured it was better to be safe.
(It seems to have no impact whatsoever on the generated code.)
Bug
3022795.
Change-Id: Ib91da25d57ff5bee4288526e39d457153ef6aacd
Wink Saville [Thu, 23 Sep 2010 08:46:42 +0000 (01:46 -0700)]
am
6dbfddfe: (-s ours) am
b9e49ad5: Use a recursive lock for pthread_once. DO NOT MERGE.
Merge commit '
6dbfddfe4e76790ee57ddc0a77b64a9457ec08fb'
* commit '
6dbfddfe4e76790ee57ddc0a77b64a9457ec08fb':
Use a recursive lock for pthread_once. DO NOT MERGE.
Wink Saville [Thu, 23 Sep 2010 08:43:43 +0000 (01:43 -0700)]
am
b9e49ad5: Use a recursive lock for pthread_once. DO NOT MERGE.
Merge commit '
b9e49ad56e5776ace7c6eab2e997d5b7acb16792' into gingerbread-plus-aosp
* commit '
b9e49ad56e5776ace7c6eab2e997d5b7acb16792':
Use a recursive lock for pthread_once. DO NOT MERGE.
Iliyan Malchev [Tue, 14 Sep 2010 20:02:59 +0000 (13:02 -0700)]
bionic: update processed kernel header cpcap_audio.h
Change-Id: I1f428e6513b144b5e78233c590b4a8e276cf55b7
Signed-off-by: Iliyan Malchev <malchev@google.com>
Wink Saville [Wed, 22 Sep 2010 21:51:53 +0000 (14:51 -0700)]
Use a recursive lock for pthread_once. DO NOT MERGE.
Backport change I9fc8b790 from Master to Gingerbread
Change-Id: I5cf48fcd4efb7991ed82f87d9365c19655dc9b7f
Brian Swetland [Sun, 19 Sep 2010 11:46:14 +0000 (04:46 -0700)]
Brian Swetland [Sun, 19 Sep 2010 10:51:34 +0000 (03:51 -0700)]
am
fedbcde6: add /vendor support
Merge commit '
fedbcde6ef552e84bf7ce7598bca7dddf1722d6a' into gingerbread-plus-aosp
* commit '
fedbcde6ef552e84bf7ce7598bca7dddf1722d6a':
add /vendor support
Brian Swetland [Sun, 19 Sep 2010 10:39:13 +0000 (03:39 -0700)]
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
Kenny Root [Wed, 15 Sep 2010 18:38:40 +0000 (11:38 -0700)]
Kenny Root [Tue, 14 Sep 2010 19:31:03 +0000 (12:31 -0700)]
am
cb99ab98: Add wmemcmp to Android.mk
Merge commit '
cb99ab98c99291a6c90043009ab8d64ec8058f9d' into gingerbread-plus-aosp
* commit '
cb99ab98c99291a6c90043009ab8d64ec8058f9d':
Add wmemcmp to Android.mk
Jean-Baptiste Queru [Sat, 11 Sep 2010 00:24:24 +0000 (17:24 -0700)]
am
ef3644d1: am
312be567: Merge "Use ARMv6 instruction for handling byte order"
Merge commit '
ef3644d110bcb44010672c0ad0bc7c96fd130c8f'
* commit '
ef3644d110bcb44010672c0ad0bc7c96fd130c8f':
Use ARMv6 instruction for handling byte order
Jean-Baptiste Queru [Fri, 10 Sep 2010 23:37:38 +0000 (16:37 -0700)]
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
Jean-Baptiste Queru [Fri, 10 Sep 2010 23:02:59 +0000 (16:02 -0700)]
Merge "Use ARMv6 instruction for handling byte order"
Jean-Baptiste Queru [Fri, 10 Sep 2010 21:52:37 +0000 (14:52 -0700)]
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.
Jean-Baptiste Queru [Fri, 10 Sep 2010 20:03:15 +0000 (13:03 -0700)]
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.
Kenny Root [Fri, 10 Sep 2010 19:20:58 +0000 (12:20 -0700)]
Add wmemcmp to Android.mk
Change-Id: I9dc96d72b2becdd31981b4d176a13358aef6dcb9
Jean-Baptiste Queru [Thu, 9 Sep 2010 21:09:41 +0000 (14:09 -0700)]
Merge "Move the atom optimization flags into TARGET_linux-x86.mk."
Erik Gilling [Wed, 8 Sep 2010 22:29:08 +0000 (15:29 -0700)]
update linux/tegrafb.h
Change-Id: I5edab909e5fe491a95729aa89b2f37c02af6bcba
Dmitry Shmidt [Wed, 8 Sep 2010 18:36:50 +0000 (11:36 -0700)]
Merge "Update if.h, if_vlan,h and add in_route.h"
Dmitry Shmidt [Wed, 8 Sep 2010 18:32:16 +0000 (11:32 -0700)]
Update if.h, if_vlan,h and add in_route.h
Change-Id: I557a5ab71ea8dee18f5666b660fc73889c759851
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Keith Deacon [Wed, 8 Sep 2010 10:10:44 +0000 (03:10 -0700)]
am
d7b156d2: am
3a1bbee3: Add eventfd system call support
Merge commit '
d7b156d2a38e58ab1e5f9e6a4b420588aeb78b46'
* commit '
d7b156d2a38e58ab1e5f9e6a4b420588aeb78b46':
Add eventfd system call support
Keith Deacon [Wed, 8 Sep 2010 10:06:26 +0000 (03:06 -0700)]
am
3a1bbee3: Add eventfd system call support
Merge commit '
3a1bbee36b773862e88c6f1895b607c0cd81b499' into gingerbread-plus-aosp
* commit '
3a1bbee36b773862e88c6f1895b607c0cd81b499':
Add eventfd system call support
Andy McFadden [Tue, 7 Sep 2010 21:05:33 +0000 (14:05 -0700)]
Merge "Add a memory barrier to cond var signaling."
Rebecca Schultz Zavin [Fri, 3 Sep 2010 22:24:33 +0000 (15:24 -0700)]
Merge "Fix libthread_db linkage"
Iliyan Malchev [Fri, 3 Sep 2010 17:09:37 +0000 (10:09 -0700)]
bionic: update processed cpcap_audio.h
Change-Id: I6ef25c4c95aaebdf4efc2561a726a0ce1c90032e
Signed-off-by: Iliyan Malchev <malchev@google.com>
Antti Hatala [Thu, 2 Sep 2010 11:27:18 +0000 (04:27 -0700)]
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
Andy McFadden [Thu, 2 Sep 2010 20:34:53 +0000 (13:34 -0700)]
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
rich cannings [Tue, 31 Aug 2010 22:55:44 +0000 (15:55 -0700)]
am
9579ee38: am
6e42398d: Merge "Fix return value." into gingerbread
Merge commit '
9579ee380c06f1ac6ca85c78d5172c82f10555d0'
* commit '
9579ee380c06f1ac6ca85c78d5172c82f10555d0':
Fix return value.
rich cannings [Tue, 31 Aug 2010 22:52:47 +0000 (15:52 -0700)]
am
6e42398d: Merge "Fix return value." into gingerbread
Merge commit '
6e42398dd66d1ec7d84257f78c07dcc7f29a2283' into gingerbread-plus-aosp
* commit '
6e42398dd66d1ec7d84257f78c07dcc7f29a2283':
Fix return value.
rich cannings [Tue, 31 Aug 2010 22:48:25 +0000 (15:48 -0700)]
Merge "Fix return value." into gingerbread
rich cannings [Tue, 31 Aug 2010 22:19:38 +0000 (15:19 -0700)]
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.
Keith Deacon [Tue, 31 Aug 2010 21:16:01 +0000 (16:16 -0500)]
Add eventfd system call support
Jesse Wilson [Tue, 31 Aug 2010 21:06:19 +0000 (14:06 -0700)]
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.
Jesse Wilson [Tue, 31 Aug 2010 21:04:15 +0000 (14:04 -0700)]
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.
Jesse Wilson [Tue, 31 Aug 2010 21:01:13 +0000 (14:01 -0700)]
Merge "Make timezones available to the host build." into gingerbread
Jesse Wilson [Tue, 31 Aug 2010 20:16:25 +0000 (13:16 -0700)]
Make timezones available to the host build.
Change-Id: Ib2c89ac13b03f07c6c712a544bc0d5d1c9dc57df
Jean-Baptiste Queru [Tue, 31 Aug 2010 20:13:06 +0000 (13:13 -0700)]
Jean-Baptiste Queru [Tue, 31 Aug 2010 20:08:11 +0000 (13:08 -0700)]
Merge (ignore) from open-source master tree
Change-Id: Ie735c3282ddc17c1e28e1069b714f3a310c221a2
Jim Huang [Tue, 31 Aug 2010 06:51:44 +0000 (14:51 +0800)]
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
Jean-Baptiste Queru [Mon, 30 Aug 2010 21:13:18 +0000 (14:13 -0700)]
resolved conflicts for merge of
a1727092 to gingerbread-plus-aosp
Change-Id: Icce8b9cb0c6ebfe2c4278c19c50aafb85a9ba4d8
David 'Digit' Turner [Mon, 30 Aug 2010 00:48:55 +0000 (17:48 -0700)]
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.
David 'Digit' Turner [Mon, 30 Aug 2010 00:41:36 +0000 (17:41 -0700)]
resolved conflicts for merge of
6a51defa to gingerbread-plus-aosp
Change-Id: I0367bcffe9179904ca820e3b824dddfa47594f63
David 'Digit' Turner [Fri, 27 Aug 2010 15:19:19 +0000 (08:19 -0700)]
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
Nick Pelly [Thu, 26 Aug 2010 18:31:53 +0000 (11:31 -0700)]
Merge "Add clean kernel header perf_event.h"
Szymon Jakubczak [Wed, 25 Aug 2010 16:56:25 +0000 (09:56 -0700)]
am
41e533af: added missing ether_aton and ether_ntoa
Merge commit '
41e533af4a2720c1dc228ba40b6582ca53085c3a'
* commit '
41e533af4a2720c1dc228ba40b6582ca53085c3a':
added missing ether_aton and ether_ntoa
Szymon Jakubczak [Wed, 9 Jun 2010 19:53:28 +0000 (15:53 -0400)]
added missing ether_aton and ether_ntoa
Change-Id: I32ee448abde4d5693d393030ed77ddc6d2ad1dfc
Nick Pelly [Mon, 23 Aug 2010 21:47:38 +0000 (14:47 -0700)]
Add clean kernel header perf_event.h
Change-Id: I0d0e9da7579b1cccb9492ad8d594fe24dc1296e3
Signed-off-by: Nick Pelly <npelly@google.com>
Iliyan Malchev [Tue, 24 Aug 2010 04:01:55 +0000 (21:01 -0700)]
bionic: add processed audio-driver (i2s & cpcap) headers
Change-Id: Ib7db8aded1d41f54bbd681df116571c1996c569c
Signed-off-by: Iliyan Malchev <malchev@google.com>
Rebecca Schultz Zavin [Thu, 19 Aug 2010 23:55:54 +0000 (16:55 -0700)]
Merge "Headers for tegra_camera device"
Rebecca Schultz Zavin [Wed, 18 Aug 2010 23:20:09 +0000 (16:20 -0700)]
Headers for tegra_camera device
Change-Id: Iaea67ee157b6ecd7a4485c8f716515da5c56601f
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Brian Carlstrom [Wed, 18 Aug 2010 20:41:09 +0000 (13:41 -0700)]
am
0a4a393d: am
22f1e3d4: Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
Merge commit '
0a4a393d717a2289c9fa2036f502f97c74d56e35'
* commit '
0a4a393d717a2289c9fa2036f502f97c74d56e35':
Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
Dima Zavin [Wed, 18 Aug 2010 20:41:07 +0000 (13:41 -0700)]
am
6b8c6a26: am
a7161902: linker: fix overwriting the real linker error string
Merge commit '
6b8c6a26f1c74db02e91d0cc7ebdd65439af53b2'
* commit '
6b8c6a26f1c74db02e91d0cc7ebdd65439af53b2':
linker: fix overwriting the real linker error string
Brian Carlstrom [Wed, 18 Aug 2010 20:39:12 +0000 (13:39 -0700)]
am
22f1e3d4: Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
Merge commit '
22f1e3d4fae7d45cc439da94690d786ed44756fb' into gingerbread-plus-aosp
* commit '
22f1e3d4fae7d45cc439da94690d786ed44756fb':
Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
Dima Zavin [Wed, 18 Aug 2010 20:35:40 +0000 (13:35 -0700)]
am
a7161902: linker: fix overwriting the real linker error string
Merge commit '
a716190241da07f42cf874b04bf044261f36381c' into gingerbread-plus-aosp
* commit '
a716190241da07f42cf874b04bf044261f36381c':
linker: fix overwriting the real linker error string
Jean-Baptiste Queru [Wed, 18 Aug 2010 20:31:49 +0000 (13:31 -0700)]
am
3871d57b: Revert "added missing ether_aton and ether_ntoa"
Merge commit '
3871d57ba581236142c9bf2f8be2d34cce7c5829'
* commit '
3871d57ba581236142c9bf2f8be2d34cce7c5829':
Revert "added missing ether_aton and ether_ntoa"
Jean-Baptiste Queru [Wed, 18 Aug 2010 18:15:39 +0000 (11:15 -0700)]
Revert "added missing ether_aton and ether_ntoa"
This reverts commit
4032c1e2dfcc99613fe3e509a8153191e35aec12.
Brian Carlstrom [Wed, 18 Aug 2010 07:33:52 +0000 (00:33 -0700)]
Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
(We've been missing the zoneinfo.* files for the host dalvikvm. My fix for
gingerbread will have to wait for someone to return from vacation, but I can
commit here in advance, and I need to so that I can submit
https://android-git.corp.google.com/g/60790 which -- amongst other things --
makes lack of time zone data a hard failure, rather than just silently
pretending all time zones are UTC.)
Bug:
2870945
git cherry-pick --no-commit
18a859aff4e1b97d644429b7ecdb366b18d5a708
Change-Id: I66647e824c5fee9b8d2c63085e2a58e5910a5544
Dima Zavin [Tue, 17 Aug 2010 22:56:40 +0000 (15:56 -0700)]
linker: fix overwriting the real linker error string
Change-Id: Ia9165fd9aa1951b2bb81d0ac8f5bb3057aded8bd
Signed-off-by: Dima Zavin <dima@android.com>
Nick Pelly [Mon, 16 Aug 2010 22:31:01 +0000 (15:31 -0700)]
Add clean kernel headers for cpcap and hid.
Change-Id: I83d7395634eea8cb28c2fcf86c6855bb17f9fabb
Signed-off-by: Nick Pelly <npelly@google.com>
Jeff Hamilton [Wed, 11 Aug 2010 16:28:26 +0000 (11:28 -0500)]
Fix pwrite to take a const void* instead of void* for the buffer.
Change-Id: I10b315946b8f8f7e34825410dfef37e0220edbee
Christopher Tate [Tue, 10 Aug 2010 02:57:25 +0000 (19:57 -0700)]
am
1ff91085: am
52e7d3d9: Bulletproof leak dump against null hash entries
Merge commit '
1ff910858c8ae5863761101c673a196a6a16bca3'
* commit '
1ff910858c8ae5863761101c673a196a6a16bca3':
Bulletproof leak dump against null hash entries
Christopher Tate [Tue, 10 Aug 2010 02:53:32 +0000 (19:53 -0700)]
am
52e7d3d9: Bulletproof leak dump against null hash entries
Merge commit '
52e7d3d91ab6a5bab77c5dfb1ed47381fd52f9ba' into gingerbread-plus-aosp
* commit '
52e7d3d91ab6a5bab77c5dfb1ed47381fd52f9ba':
Bulletproof leak dump against null hash entries
Christopher Tate [Mon, 9 Aug 2010 20:43:46 +0000 (13:43 -0700)]
Bulletproof leak dump against null hash entries
Previously, the malloc leak checking code would crash in qsort()
if null entries existed in its bookkeeping table. This change
makes the comparison function detect null entries and sort them
to the end safely.
Change-Id: I88244a7df1e289dd9d7992ce29606d505bd63079
Jim Huang [Sun, 8 Aug 2010 21:35:11 +0000 (05:35 +0800)]
bionic: Rename _ARM_HAVE_LDREX_STREX to __ARM_HAVE_LDREX_STREX for consistency
The patch follows the naming manner in existing macros with prefix
__ARM_HAVE.
Change-Id: I6763ce2bf3ee85fd1da112c719543061d8d19bf4
Rebecca Schultz Zavin [Sat, 7 Aug 2010 02:14:45 +0000 (19:14 -0700)]
Adding cleaned tegrafb header
Change-Id: Iba616e64cc26fb8c2d469bdd3f9f4b048391cc53
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Dima Zavin [Fri, 6 Aug 2010 18:45:43 +0000 (11:45 -0700)]
libc: make lseek64 proto be glibc compatible (loff_t -> off64_t)
Change-Id: Ib79b99be9ca8d4b1f95ceeba416b6abc04187c3c
Signed-off-by: Dima Zavin <dima@android.com>
Thomas Tuttle [Mon, 2 Aug 2010 23:00:59 +0000 (16:00 -0700)]
ublock: add cleaned version of linux/ublock.h to libc kernel headers
Change-Id: I8ebc7530690ff47f3160c72f42b8e0822f55a57e
Dima Zavin [Fri, 30 Jul 2010 21:21:43 +0000 (14:21 -0700)]
am
91af9e64: am
18c5bcc6: Revert "Set SA_RESTORER in sigaction()"
Merge commit '
91af9e64b5d86dd5925c0fcfdb3f3db5a86aa43c'
* commit '
91af9e64b5d86dd5925c0fcfdb3f3db5a86aa43c':
Revert "Set SA_RESTORER in sigaction()"
Dima Zavin [Fri, 30 Jul 2010 21:19:08 +0000 (14:19 -0700)]
am
18c5bcc6: Revert "Set SA_RESTORER in sigaction()"
Merge commit '
18c5bcc66a9a7b2178dcdcf04a0716958798ab81' into gingerbread-plus-aosp
* commit '
18c5bcc66a9a7b2178dcdcf04a0716958798ab81':
Revert "Set SA_RESTORER in sigaction()"
Dima Zavin [Fri, 30 Jul 2010 02:12:04 +0000 (19:12 -0700)]
Revert "Set SA_RESTORER in sigaction()"
This reverts commit
e4fa46e75cd0d433b5c6c064720ed7e195cba7c8.
Wu-cheng Li [Tue, 27 Jul 2010 21:35:39 +0000 (14:35 -0700)]
am
37443edd: am
7ed132a1: bionic: update processed kernel header msm_camera.h
Merge commit '
37443edd9731dbddb1ca0181435d08bcdcafe5c8'
* commit '
37443edd9731dbddb1ca0181435d08bcdcafe5c8':
bionic: update processed kernel header msm_camera.h
Wu-cheng Li [Tue, 27 Jul 2010 21:33:18 +0000 (14:33 -0700)]
am
7ed132a1: bionic: update processed kernel header msm_camera.h
Merge commit '
7ed132a1ae6e00593918090a964f5d5b09d77f84' into gingerbread-plus-aosp
* commit '
7ed132a1ae6e00593918090a964f5d5b09d77f84':
bionic: update processed kernel header msm_camera.h
Wu-cheng Li [Tue, 27 Jul 2010 21:26:21 +0000 (14:26 -0700)]
bionic: update processed kernel header msm_camera.h
Change-Id: If66422d538d0fb0c6ae8a7399c62911635d1fd13
Eric Fischer [Tue, 27 Jul 2010 00:22:50 +0000 (17:22 -0700)]
am
a685faf3: am
cd7014fd: Update time zone data to the new version 2010k.
Merge commit '
a685faf3e3de181ca6c795b0062432c74073d024'
* commit '
a685faf3e3de181ca6c795b0062432c74073d024':
Update time zone data to the new version 2010k.
Eric Fischer [Tue, 27 Jul 2010 00:17:27 +0000 (17:17 -0700)]
am
cd7014fd: Update time zone data to the new version 2010k.
Merge commit '
cd7014fd0634f1337fc3857f1c61e0d39443c4be' into gingerbread-plus-aosp
* commit '
cd7014fd0634f1337fc3857f1c61e0d39443c4be':
Update time zone data to the new version 2010k.
Eric Fischer [Mon, 26 Jul 2010 22:53:24 +0000 (15:53 -0700)]
Update time zone data to the new version 2010k.
Change-Id: If657e1783e3f96c52bfe613bad027482d8373c67
David 'Digit' Turner [Mon, 26 Jul 2010 19:21:19 +0000 (12:21 -0700)]
am
0291b0ca: resolved conflicts for merge of
6774809b to gingerbread-plus-aosp
Merge commit '
0291b0cada30c1c8eaaa346577969ff9b4eb5195'
* commit '
0291b0cada30c1c8eaaa346577969ff9b4eb5195':
linker: Support dlopen(NULL, ...) properly.
David 'Digit' Turner [Mon, 26 Jul 2010 19:18:37 +0000 (12:18 -0700)]
resolved conflicts for merge of
6774809b to gingerbread-plus-aosp
Change-Id: I633c3067c874c215da0c6ede00af41d8e3587d8b
Chih-Wei Huang [Mon, 26 Jul 2010 03:29:08 +0000 (11:29 +0800)]
Move the atom optimization flags into TARGET_linux-x86.mk.
Setting libc_crt_target_cflags to be non-recursive is necessary.
Change-Id: I5310d86e705f23da126c21ecb33a97a074da584a
Jean-Baptiste Queru [Fri, 23 Jul 2010 22:04:24 +0000 (15:04 -0700)]
am
6d4d8cb7: resolved conflicts for merge of
4f086aeb to gingerbread-plus-aosp
Merge commit '
6d4d8cb79c5578d33ab17806d67b1e53a730fbc3'
* commit '
6d4d8cb79c5578d33ab17806d67b1e53a730fbc3':
Implemented pthread_atfork()
Jean-Baptiste Queru [Fri, 23 Jul 2010 20:53:19 +0000 (13:53 -0700)]
resolved conflicts for merge of
4f086aeb to gingerbread-plus-aosp
Change-Id: Ice2a6d41a7e9d04eca02e15ed189d648d61b5801
Matt Fischer [Fri, 25 Jun 2010 19:36:39 +0000 (14:36 -0500)]
Implemented pthread_atfork()
Change-Id: Ie6c0bf593315d3507b3c4a6c8903a74a1fa053db
David 'Digit' Turner [Wed, 21 Jul 2010 23:18:21 +0000 (16:18 -0700)]
linker: Support dlopen(NULL, ...) properly.
Change-Id: Icba37823cb350c34848cc466d144c3a0af87c94c
Wu-cheng Li [Mon, 19 Jul 2010 20:50:46 +0000 (13:50 -0700)]
am
4e69dfed: am
9d1f5afc: bionic: update processed kernel header msm_camera.h
Merge commit '
4e69dfed0b0fe672e366bb84d5c3feaedc61d630'
* commit '
4e69dfed0b0fe672e366bb84d5c3feaedc61d630':
bionic: update processed kernel header msm_camera.h
Wu-cheng Li [Mon, 19 Jul 2010 20:48:34 +0000 (13:48 -0700)]
am
9d1f5afc: bionic: update processed kernel header msm_camera.h
Merge commit '
9d1f5afc34efb8c10672f765704941036fd40da8' into gingerbread-plus-aosp
* commit '
9d1f5afc34efb8c10672f765704941036fd40da8':
bionic: update processed kernel header msm_camera.h
The Android Open Source Project [Mon, 19 Jul 2010 19:20:03 +0000 (12:20 -0700)]
am
77ec41cc: merge from open-source master
Merge commit '
77ec41cc22cf0d08e556e6afe4de1f6eae5e9662'
* commit '
77ec41cc22cf0d08e556e6afe4de1f6eae5e9662':
Add kernel header file ipv6_route.h in bionic.
The Android Open Source Project [Mon, 19 Jul 2010 19:17:17 +0000 (12:17 -0700)]
merge from open-source master
Change-Id: Ib65087940790a8d3b72d8d345a11e7c9c53896cd
Wu-cheng Li [Mon, 12 Jul 2010 17:32:11 +0000 (10:32 -0700)]
bionic: update processed kernel header msm_camera.h
Change-Id: I25598b08e9cafe98a86cdb2e40481d9aedc8dcee
Banavathu, Srinivas Naik [Tue, 29 Jun 2010 18:57:29 +0000 (11:57 -0700)]
Add kernel header file ipv6_route.h in bionic.
The header file is needed to add route to an IPv6 host from user space
Change-Id: I25c8a8d8e48013f127542199bc027f976b9672c1
The Android Open Source Project [Fri, 16 Jul 2010 20:04:30 +0000 (13:04 -0700)]
am
90e83bcc: merge from open-source master
Merge commit '
90e83bcc1c41a4d6d310b2bd5cb747a53a88fff3'
* commit '
90e83bcc1c41a4d6d310b2bd5cb747a53a88fff3':
Fix undefined reference to dl_iterate_phdr for x86
The Android Open Source Project [Fri, 16 Jul 2010 19:59:04 +0000 (12:59 -0700)]
merge from open-source master
Change-Id: Iadd4a92f0384fdb8afa015613957b7d78b3d100a