Jean-Baptiste Queru
8c44765841
am a9b706bd
: am 66ad3429
: Merge "gethnamaddr: make helper functions static"
...
Merge commit 'a9b706bd2b0814fcb45c4e8396c2bdddecb1f5de'
* commit 'a9b706bd2b0814fcb45c4e8396c2bdddecb1f5de':
gethnamaddr: make helper functions static
2010-10-11 18:57:22 -07:00
Jean-Baptiste Queru
a9b706bd2b
am 66ad3429
: Merge "gethnamaddr: make helper functions static"
...
Merge commit '66ad34293b84d979cae5ffda4b3b90b746127ebb' into gingerbread-plus-aosp
* commit '66ad34293b84d979cae5ffda4b3b90b746127ebb':
gethnamaddr: make helper functions static
2010-10-10 18:14:58 -07:00
Jean-Baptiste Queru
66ad34293b
Merge "gethnamaddr: make helper functions static"
2010-10-10 18:00:51 -07:00
David 'Digit' Turner
0144b0b67c
am 5dce6d19
: am 5b81b918
: libc: optimize memmove() with memcpy() if possible.
...
Merge commit '5dce6d195ac2c44614351f349e00ff5d8ebbe0bf'
* commit '5dce6d195ac2c44614351f349e00ff5d8ebbe0bf':
libc: optimize memmove() with memcpy() if possible.
2010-10-10 11:26:53 -07:00
David 'Digit' Turner
5dce6d195a
am 5b81b918
: libc: optimize memmove() with memcpy() if possible.
...
Merge commit '5b81b918173b4bf446c1a85240c094e4dd77231f' into gingerbread-plus-aosp
* commit '5b81b918173b4bf446c1a85240c094e4dd77231f':
libc: optimize memmove() with memcpy() if possible.
2010-10-07 14:48:31 -07:00
David Turner
dac542655c
Merge "get_malloc_leak_info: Fix assumption that totalMemory out parameter was initialized to zero."
2010-10-07 02:50:39 -07:00
David 'Digit' Turner
5b81b91817
libc: optimize memmove() with memcpy() if possible.
...
Change-Id: I90e578fdc82e427caee8fa4157ce3f8c6c99926d
2010-10-07 11:03:32 +02:00
Iliyan Malchev
b55ab95837
bionic: update processed kernel header cpcap_audio.h
...
Change-Id: If0aef2babd70c440456fb7f3e10c3c2ec6752c6e
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-10-06 20:34:09 -07:00
tedbo
9d8be5485c
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
2010-10-05 13:23:28 -07:00
Iliyan Malchev
fff0c58e9a
bionic: update processed kernel header tegra_audio.h
...
Change-Id: I23d03e0f651f26a1f6c170f982891dba2a2fe20d
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-10-04 23:08:21 -07:00
Marco Nelissen
abdb3695b2
am 0da2a8eb
: am af00228b
: Revert "libc: memmove(): non-overlapping block optim."
...
Merge commit '0da2a8eb8728395867ec8a669e0aee2f243113db'
* commit '0da2a8eb8728395867ec8a669e0aee2f243113db':
Revert "libc: memmove(): non-overlapping block optim."
2010-09-28 13:20:45 -07:00
repo sync
319de1758c
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.
2010-09-28 12:48:34 -07:00
David 'Digit' Turner
2336503264
am a511f245
: am 9973a564
: libc: Add missing waitid() implementation.
...
Merge commit 'a511f245614d8e6c7700df624e13a41a084ad7e4'
* commit 'a511f245614d8e6c7700df624e13a41a084ad7e4':
libc: Add missing waitid() implementation.
2010-09-28 12:48:32 -07:00
David 'Digit' Turner
37c4305633
am 052fbd88
: am a3ae60d3
: libc: Add missing fdatasync() implementation
...
Merge commit '052fbd88080c88b7f568612dcac7579092c2e3d9'
* commit '052fbd88080c88b7f568612dcac7579092c2e3d9':
libc: Add missing fdatasync() implementation
2010-09-28 12:48:28 -07:00
David 'Digit' Turner
1e95e58c91
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>
2010-09-28 12:48:25 -07:00
David 'Digit' Turner
8300a7aef9
am 16922b7e
: am 79260746
: Merge "libc: memmove(): non-overlapping block optim." into gingerbread
...
Merge commit '16922b7ebc6115e13bebed4880c6a09765410fc7'
* commit '16922b7ebc6115e13bebed4880c6a09765410fc7':
libc: memmove(): non-overlapping block optim.
2010-09-28 12:48:22 -07:00
David 'Digit' Turner
4903487555
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>
2010-09-28 12:48:19 -07:00
David 'Digit' Turner
6f39e611f3
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.
2010-09-28 12:48:15 -07:00
David 'Digit' Turner
25abeb155c
am 134f31e2
: am 9df22a5a
: Merge "libm: remove aliasing issue." into gingerbread
...
Merge commit '134f31e234128a90ee74d76f48ca12e1bfd080e7'
* commit '134f31e234128a90ee74d76f48ca12e1bfd080e7':
libm: remove aliasing issue.
2010-09-28 12:48:11 -07:00
David 'Digit' Turner
2172188923
am 9aac3824
: am bd8d987b
: libc: remove C++ comments from public headers.
...
Merge commit '9aac38249b579282ae8eaa630de3deaf97c4edff'
* commit '9aac38249b579282ae8eaa630de3deaf97c4edff':
libc: remove C++ comments from public headers.
2010-09-28 12:48:07 -07:00
Marco Nelissen
0da2a8eb87
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."
2010-09-28 10:29:50 -07:00
Marco Nelissen
af00228b70
Revert "libc: memmove(): non-overlapping block optim."
...
This reverts commit 80fba9a2fe
,
which caused the system to not boot anymore, aborting with:
"java.lang.RuntimeException: Missing static main on com.android.server.SystemServer".
Change-Id: I745e0a23c728cccf5f95a3c7642d544478a4e57e
2010-09-28 10:24:20 -07:00
repo sync
686af0b3a5
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
2010-09-28 12:23:55 +02:00
David 'Digit' Turner
a511f24561
am 9973a564
: libc: Add missing waitid() implementation.
...
Merge commit '9973a564222b842eb7497fd6e659fe8c8c49e2b3' into gingerbread-plus-aosp
* commit '9973a564222b842eb7497fd6e659fe8c8c49e2b3':
libc: Add missing waitid() implementation.
2010-09-28 00:22:25 -07:00
David 'Digit' Turner
defd162212
libc: add <sys/eventfd.h> and corresponding implementations.
...
Change-Id: Ide040884c456190226e580513099fdb8377e015b
2010-09-28 09:20:37 +02:00
David 'Digit' Turner
052fbd8808
am a3ae60d3
: libc: Add missing fdatasync() implementation
...
Merge commit 'a3ae60d343661784e3f6f4566b276d8e6b8a06a7' into gingerbread-plus-aosp
* commit 'a3ae60d343661784e3f6f4566b276d8e6b8a06a7':
libc: Add missing fdatasync() implementation
2010-09-28 00:19:31 -07:00
David 'Digit' Turner
9973a56422
libc: Add missing waitid() implementation.
...
Change-Id: I312ee608dbf9249e4886a10d45d13e3cda8a9042
2010-09-28 09:18:26 +02:00
David 'Digit' Turner
a3ae60d343
libc: Add missing fdatasync() implementation
...
Change-Id: I04bb655d77e414021e1f2a973329167ad76ca1c4
2010-09-28 09:17:17 +02:00
David 'Digit' Turner
5b5212b457
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>
2010-09-28 00:16:40 -07:00
David 'Digit' Turner
16922b7ebc
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.
2010-09-28 00:16:38 -07:00
David 'Digit' Turner
307aadb847
Merge "libc: Add missing C++ guards to <pathconf.h>" into gingerbread
2010-09-28 00:15:23 -07:00
David 'Digit' Turner
79260746db
Merge "libc: memmove(): non-overlapping block optim." into gingerbread
2010-09-28 00:15:05 -07:00
David 'Digit' Turner
5d335a1c65
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>
2010-09-28 00:13:49 -07:00
David 'Digit' Turner
914528cdc9
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.
2010-09-28 00:13:48 -07:00
David 'Digit' Turner
134f31e234
am 9df22a5a
: Merge "libm: remove aliasing issue." into gingerbread
...
Merge commit '9df22a5a5fc57d511bfde3338806ec98d0cc334f' into gingerbread-plus-aosp
* commit '9df22a5a5fc57d511bfde3338806ec98d0cc334f':
libm: remove aliasing issue.
2010-09-28 00:13:46 -07:00
David 'Digit' Turner
9aac38249b
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.
2010-09-28 00:13:43 -07:00
David 'Digit' Turner
032a713549
Merge "libc: add missing O_CLOEXEC from <fcntl.h>" into gingerbread
2010-09-28 00:12:13 -07:00
David 'Digit' Turner
223ddfcfc4
Merge "libc: Add missing pipe2() declaration and implementation." into gingerbread
2010-09-28 00:12:08 -07:00
David 'Digit' Turner
9df22a5a5f
Merge "libm: remove aliasing issue." into gingerbread
2010-09-28 00:11:58 -07:00
Elliott Hughes
d285151df6
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.
2010-09-27 11:51:39 -07:00
Elliott Hughes
8120a8df84
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.
2010-09-27 11:39:39 -07:00
Jim Huang
e5c35e075f
gethnamaddr: make helper functions static
...
In order not to conflict with the symbols defined in file
libc/netbsd/getaddrinfo.c, this patch makes the internal/helper
functions static.
Change-Id: I0f85599e0b4ce0a637d005ff1680e1805dec4380
2010-09-27 23:40:55 +08:00
David 'Digit' Turner
ce2ebf8d73
libm: remove aliasing issue.
...
See http://code.google.com/p/android/issues/detail?id=6697
for details about this change.
Change-Id: I516f00c6f3bc99b22be51669e4573246bdd6e33d
2010-09-27 17:35:48 +02:00
David 'Digit' Turner
bd8d987b3c
libc: remove C++ comments from public headers.
...
Change-Id: I4af84f912062cd2ff34711c25122fb323f20c032
2010-09-27 17:35:26 +02:00
David 'Digit' Turner
80fba9a2fe
libc: memmove(): non-overlapping block optim.
...
Change-Id: I5652f4f97ca59d95176443fc27c737ef76258183
2010-09-27 17:34:41 +02:00
David 'Digit' Turner
00eea3f8a0
libc: add missing O_CLOEXEC from <fcntl.h>
...
Change-Id: Ie7ad57898e67800a9fe92bb52589d67ec30e1cd9
2010-09-27 17:33:40 +02:00
David 'Digit' Turner
275cd48511
libc: Add missing pipe2() declaration and implementation.
...
Change-Id: Iacb914bd6ac5adc60c5671e6fef680ede21f9b0c
2010-09-27 17:33:08 +02:00
David 'Digit' Turner
f33a7700a5
libc: Add missing C++ guards to <pathconf.h>
...
Change-Id: I94dad48678181d8b02431b1c1f5d507beafb5406
2010-09-27 17:27:14 +02:00
Elliott Hughes
3cf53d1a78
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
2010-09-26 11:26:53 -07:00
Andy McFadden
eb4338e03e
Merge "Add memory barriers to pthread_once."
2010-09-24 07:42:31 -07:00