OSDN Git Service
Ying Wang [Sat, 9 Oct 2010 00:09:55 +0000 (17:09 -0700)]
Remove duplicate item
This elimates the makefile warning at the beginning of each build:
libc_common_intermediates/arch-arm/syscalls/eventfd.o' given more than once in the same rule.
Change-Id: I25cc0c373d55b5036dd17811a595c097fd6ca69a
David Turner [Thu, 7 Oct 2010 09:50:39 +0000 (02:50 -0700)]
Merge "get_malloc_leak_info: Fix assumption that totalMemory out parameter was initialized to zero."
Iliyan Malchev [Thu, 7 Oct 2010 03:34:09 +0000 (20:34 -0700)]
bionic: update processed kernel header cpcap_audio.h
Change-Id: If0aef2babd70c440456fb7f3e10c3c2ec6752c6e
Signed-off-by: Iliyan Malchev <malchev@google.com>
tedbo [Tue, 5 Oct 2010 20:06:06 +0000 (13:06 -0700)]
get_malloc_leak_info: Fix assumption that totalMemory out parameter was initialized to zero.
The get_malloc_leak_info() currently asssumes that the totalMemory out parameter
was pre-initialized to zero before the routine is called. If it is not then the
accumulated totalMemory value will be incorrect. It is likely that many callers
will simply allocate totalMemory on the stack with no initialization and assume
that get_malloc_leak_info will set the proper value.
As an example, the caller in frameworks/base/core/jni/android_os_Debug.cpp
calls get_malloc_leak_info() with the address uninitiazed stack variable
for totalMemory. It is probably best to fix this in get_malloc_leak_info.
Change-Id: I84c927c3781419585794726115b7d34d8fdd24ae
Iliyan Malchev [Tue, 5 Oct 2010 05:54:47 +0000 (22:54 -0700)]
bionic: update processed kernel header tegra_audio.h
Change-Id: I23d03e0f651f26a1f6c170f982891dba2a2fe20d
Signed-off-by: Iliyan Malchev <malchev@google.com>
Marco Nelissen [Tue, 28 Sep 2010 20:20:45 +0000 (13:20 -0700)]
am
0da2a8eb: am
af00228b: Revert "libc: memmove(): non-overlapping block optim."
Merge commit '
0da2a8eb8728395867ec8a669e0aee2f243113db'
* commit '
0da2a8eb8728395867ec8a669e0aee2f243113db':
Revert "libc: memmove(): non-overlapping block optim."
repo sync [Tue, 28 Sep 2010 19:48:34 +0000 (12:48 -0700)]
am
686af0b3: resolved conflicts for merge of
defd1622 to gingerbread-plus-aosp
Merge commit '
686af0b3a5978356be3b1a97187c765d63f11623'
* commit '
686af0b3a5978356be3b1a97187c765d63f11623':
libc: add <sys/eventfd.h> and corresponding implementations.
David 'Digit' Turner [Tue, 28 Sep 2010 19:48:32 +0000 (12:48 -0700)]
am
a511f245: am
9973a564: libc: Add missing waitid() implementation.
Merge commit '
a511f245614d8e6c7700df624e13a41a084ad7e4'
* commit '
a511f245614d8e6c7700df624e13a41a084ad7e4':
libc: Add missing waitid() implementation.
David 'Digit' Turner [Tue, 28 Sep 2010 19:48:28 +0000 (12:48 -0700)]
am
052fbd88: am
a3ae60d3: libc: Add missing fdatasync() implementation
Merge commit '
052fbd88080c88b7f568612dcac7579092c2e3d9'
* commit '
052fbd88080c88b7f568612dcac7579092c2e3d9':
libc: Add missing fdatasync() implementation
David 'Digit' Turner [Tue, 28 Sep 2010 19:48:25 +0000 (12:48 -0700)]
am
5b5212b4: am
307aadb8: Merge "libc: Add missing C++ guards to <pathconf.h>" into gingerbread
Merge commit '
5b5212b457f7308f9d7d4011c02af71ef1cad9c4'
* commit '
5b5212b457f7308f9d7d4011c02af71ef1cad9c4':
libc: Add missing C++ guards to <pathconf.h>
David 'Digit' Turner [Tue, 28 Sep 2010 19:48:22 +0000 (12:48 -0700)]
am
16922b7e: am
79260746: Merge "libc: memmove(): non-overlapping block optim." into gingerbread
Merge commit '
16922b7ebc6115e13bebed4880c6a09765410fc7'
* commit '
16922b7ebc6115e13bebed4880c6a09765410fc7':
libc: memmove(): non-overlapping block optim.
David 'Digit' Turner [Tue, 28 Sep 2010 19:48:19 +0000 (12:48 -0700)]
am
5d335a1c: am
032a7135: Merge "libc: add missing O_CLOEXEC from <fcntl.h>" into gingerbread
Merge commit '
5d335a1c6552f74e7da2c5f2d97f65eea8cb8c72'
* commit '
5d335a1c6552f74e7da2c5f2d97f65eea8cb8c72':
libc: add missing O_CLOEXEC from <fcntl.h>
David 'Digit' Turner [Tue, 28 Sep 2010 19:48:15 +0000 (12:48 -0700)]
am
914528cd: am
223ddfcf: Merge "libc: Add missing pipe2() declaration and implementation." into gingerbread
Merge commit '
914528cdc90dced0c07055d4d986e68adc8da60c'
* commit '
914528cdc90dced0c07055d4d986e68adc8da60c':
libc: Add missing pipe2() declaration and implementation.
David 'Digit' Turner [Tue, 28 Sep 2010 19:48:11 +0000 (12:48 -0700)]
am
134f31e2: am
9df22a5a: Merge "libm: remove aliasing issue." into gingerbread
Merge commit '
134f31e234128a90ee74d76f48ca12e1bfd080e7'
* commit '
134f31e234128a90ee74d76f48ca12e1bfd080e7':
libm: remove aliasing issue.
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.
Marco Nelissen [Tue, 28 Sep 2010 17:29:50 +0000 (10:29 -0700)]
am
af00228b: Revert "libc: memmove(): non-overlapping block optim."
Merge commit '
af00228b705b53165c132a22b30c2d6cbb9acd13' into gingerbread-plus-aosp
* commit '
af00228b705b53165c132a22b30c2d6cbb9acd13':
Revert "libc: memmove(): non-overlapping block optim."
Marco Nelissen [Tue, 28 Sep 2010 17:24:20 +0000 (10:24 -0700)]
Revert "libc: memmove(): non-overlapping block optim."
This reverts commit
80fba9a2fe4eacaabee99cf0bbead872c2792231,
which caused the system to not boot anymore, aborting with:
"java.lang.RuntimeException: Missing static main on com.android.server.SystemServer".
Change-Id: I745e0a23c728cccf5f95a3c7642d544478a4e57e
repo sync [Tue, 28 Sep 2010 10:23:55 +0000 (12:23 +0200)]
resolved conflicts for merge of
defd1622 to gingerbread-plus-aosp
Conflicts:
libc/arch-arm/syscalls/eventfd.S
libc/include/sys/eventfd.h
libc/include/sys/linux-syscalls.h
Change-Id: I02f6e9536aa5478322240c199ff4c2f4367922d0
David 'Digit' Turner [Tue, 28 Sep 2010 07:22:25 +0000 (00:22 -0700)]
am
9973a564: libc: Add missing waitid() implementation.
Merge commit '
9973a564222b842eb7497fd6e659fe8c8c49e2b3' into gingerbread-plus-aosp
* commit '
9973a564222b842eb7497fd6e659fe8c8c49e2b3':
libc: Add missing waitid() implementation.
David 'Digit' Turner [Sun, 26 Sep 2010 20:29:14 +0000 (22:29 +0200)]
libc: add <sys/eventfd.h> and corresponding implementations.
Change-Id: Ide040884c456190226e580513099fdb8377e015b
David 'Digit' Turner [Tue, 28 Sep 2010 07:19:31 +0000 (00:19 -0700)]
am
a3ae60d3: libc: Add missing fdatasync() implementation
Merge commit '
a3ae60d343661784e3f6f4566b276d8e6b8a06a7' into gingerbread-plus-aosp
* commit '
a3ae60d343661784e3f6f4566b276d8e6b8a06a7':
libc: Add missing fdatasync() implementation
David 'Digit' Turner [Mon, 27 Sep 2010 15:30:33 +0000 (17:30 +0200)]
libc: Add missing waitid() implementation.
Change-Id: I312ee608dbf9249e4886a10d45d13e3cda8a9042
David 'Digit' Turner [Mon, 27 Sep 2010 15:28:38 +0000 (17:28 +0200)]
libc: Add missing fdatasync() implementation
Change-Id: I04bb655d77e414021e1f2a973329167ad76ca1c4
David 'Digit' Turner [Tue, 28 Sep 2010 07:16:40 +0000 (00:16 -0700)]
am
307aadb8: Merge "libc: Add missing C++ guards to <pathconf.h>" into gingerbread
Merge commit '
307aadb8473744c3d946add8b3e4947ada5481aa' into gingerbread-plus-aosp
* commit '
307aadb8473744c3d946add8b3e4947ada5481aa':
libc: Add missing C++ guards to <pathconf.h>
David 'Digit' Turner [Tue, 28 Sep 2010 07:16:38 +0000 (00:16 -0700)]
am
79260746: Merge "libc: memmove(): non-overlapping block optim." into gingerbread
Merge commit '
79260746dbed91babab415ea86fba0e3eb086429' into gingerbread-plus-aosp
* commit '
79260746dbed91babab415ea86fba0e3eb086429':
libc: memmove(): non-overlapping block optim.
David 'Digit' Turner [Tue, 28 Sep 2010 07:15:23 +0000 (00:15 -0700)]
Merge "libc: Add missing C++ guards to <pathconf.h>" into gingerbread
David 'Digit' Turner [Tue, 28 Sep 2010 07:15:05 +0000 (00:15 -0700)]
Merge "libc: memmove(): non-overlapping block optim." into gingerbread
David 'Digit' Turner [Tue, 28 Sep 2010 07:13:49 +0000 (00:13 -0700)]
am
032a7135: Merge "libc: add missing O_CLOEXEC from <fcntl.h>" into gingerbread
Merge commit '
032a713549c12b79b5dde6ef3dff323b7698110d' into gingerbread-plus-aosp
* commit '
032a713549c12b79b5dde6ef3dff323b7698110d':
libc: add missing O_CLOEXEC from <fcntl.h>
David 'Digit' Turner [Tue, 28 Sep 2010 07:13:48 +0000 (00:13 -0700)]
am
223ddfcf: Merge "libc: Add missing pipe2() declaration and implementation." into gingerbread
Merge commit '
223ddfcfc4cb354641e70da31a60556248db5036' into gingerbread-plus-aosp
* commit '
223ddfcfc4cb354641e70da31a60556248db5036':
libc: Add missing pipe2() declaration and implementation.
David 'Digit' Turner [Tue, 28 Sep 2010 07:13:46 +0000 (00:13 -0700)]
am
9df22a5a: Merge "libm: remove aliasing issue." into gingerbread
Merge commit '
9df22a5a5fc57d511bfde3338806ec98d0cc334f' into gingerbread-plus-aosp
* commit '
9df22a5a5fc57d511bfde3338806ec98d0cc334f':
libm: remove aliasing issue.
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.
David 'Digit' Turner [Tue, 28 Sep 2010 07:12:13 +0000 (00:12 -0700)]
Merge "libc: add missing O_CLOEXEC from <fcntl.h>" into gingerbread
David 'Digit' Turner [Tue, 28 Sep 2010 07:12:08 +0000 (00:12 -0700)]
Merge "libc: Add missing pipe2() declaration and implementation." into gingerbread
David 'Digit' Turner [Tue, 28 Sep 2010 07:11:58 +0000 (00:11 -0700)]
Merge "libm: remove aliasing issue." into gingerbread
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:17:21 +0000 (23:17 +0200)]
libm: remove aliasing issue.
See http://code.google.com/p/android/issues/detail?id=6697
for details about this change.
Change-Id: I516f00c6f3bc99b22be51669e4573246bdd6e33d
David 'Digit' Turner [Sun, 26 Sep 2010 21:00:36 +0000 (23:00 +0200)]
libc: remove C++ comments from public headers.
Change-Id: I4af84f912062cd2ff34711c25122fb323f20c032
David 'Digit' Turner [Sun, 26 Sep 2010 20:40:02 +0000 (22:40 +0200)]
libc: memmove(): non-overlapping block optim.
Change-Id: I5652f4f97ca59d95176443fc27c737ef76258183
David 'Digit' Turner [Sun, 26 Sep 2010 18:03:16 +0000 (20:03 +0200)]
libc: add missing O_CLOEXEC from <fcntl.h>
Change-Id: Ie7ad57898e67800a9fe92bb52589d67ec30e1cd9
David 'Digit' Turner [Mon, 27 Sep 2010 15:33:08 +0000 (17:33 +0200)]
libc: Add missing pipe2() declaration and implementation.
Change-Id: Iacb914bd6ac5adc60c5671e6fef680ede21f9b0c
David 'Digit' Turner [Mon, 27 Sep 2010 15:27:14 +0000 (17:27 +0200)]
libc: Add missing C++ guards to <pathconf.h>
Change-Id: I94dad48678181d8b02431b1c1f5d507beafb5406
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
OSDN Git Service
