summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 04acf6c8: merge from froyo-plus-aospThe Android Open Source Project2010-06-210-0/+0
|\ | | | | | | | | | | | | Merge commit '04acf6c80ee1fbe64c3915da1255e8ce4e7798ce' * commit '04acf6c80ee1fbe64c3915da1255e8ce4e7798ce': Fix for incorrect reply from sysconf(_SC_NPROCESSORS_ONLN)
| * merge from froyo-plus-aospThe Android Open Source Project2010-06-210-0/+0
| |\ | | | | | | | | | Change-Id: I64de22c97a98ec4f1f288c619e3d66d6be261c6d
| | * merge from open-source masterThe Android Open Source Project2010-06-181-1/+1
| | |\ | | | | | | | | | | | | Change-Id: I408b5705b18d9e93e66bfbfeec0e3baefd618dec
| | | * Merge "Fix for incorrect reply from sysconf(_SC_NPROCESSORS_ONLN)"David Turner2010-06-161-1/+1
| | | |\
| | | | * Fix for incorrect reply from sysconf(_SC_NPROCESSORS_ONLN)Mikael Ohlson2010-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling sysconf with _SC_NPROCESSORS_ONLN, the value one (1) was returned on systems with two or more cores, since '/proc/stat' was incorrectly parsed. The function line_parser_getc (LineParser* p) read 128 characters of input for each invocation. The proper and probably aimed for behavior is to read 128 characters at the first call, then for each subsequent call only return the next buffered character until a new read is needed and only then read another 128 characters. Due to a flipped comparison between the two variables in_len and in_pos that track the number of bytes of data read into the input buffer and how much of it has been parsed, a new group of 128 characters were read at almost every call to line_parser_getc, overwriting the still unhandled bytes from the previous call to read. This caused the lines to be read to be sampled more than parsed. Change-Id: I93eec3c8c9b9f19ef798748579d0977111b5c0bb Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
* | | | | Just link fixes for b 2763938.Kristian Monsen2010-06-162-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added wcsxfrm.c and wmemcmp.c to the src files in Android.mk and removed wcsxfrm from wchar.c Change-Id: Iab9b45cf78c27880d2941c360340a7af6b8964fe
* | | | | am f201ae83: am 6a09cfd9: Merge "wchar.h: improve wchar_t support in Bionic" ↵David 'Digit' Turner2010-06-1535-127/+1683
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kraken Merge commit 'f201ae83fc1742f34f9b0ff248c0c6c48a55f7a4' * commit 'f201ae83fc1742f34f9b0ff248c0c6c48a55f7a4': wchar.h: improve wchar_t support in Bionic
| * | | | am 6a09cfd9: Merge "wchar.h: improve wchar_t support in Bionic" into krakenDavid 'Digit' Turner2010-06-1535-127/+1683
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6a09cfd9f916e3a60de707ff0806cdeb143d77a4' into gingerbread-plus-aosp * commit '6a09cfd9f916e3a60de707ff0806cdeb143d77a4': wchar.h: improve wchar_t support in Bionic
| | * \ \ \ Merge "wchar.h: improve wchar_t support in Bionic" into krakenDavid 'Digit' Turner2010-06-1535-127/+1683
| | |\ \ \ \
| | | * | | | wchar.h: improve wchar_t support in BionicDavid 'Digit' Turner2010-06-1535-127/+1683
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iffd41046fd0933c66542abf7627a1569522dfcb2
* | | | | | | am a37ffb0c: am a24bc688: Merge "linker: remove libcutils dependency by ↵David 'Digit' Turner2010-06-152-4/+44
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re-implementing simpler socket_local_client." into kraken Merge commit 'a37ffb0c74445fc0bc727aec887990d713d20b8e' * commit 'a37ffb0c74445fc0bc727aec887990d713d20b8e': linker: remove libcutils dependency by re-implementing simpler socket_local_client.
| * | | | | | am a24bc688: Merge "linker: remove libcutils dependency by re-implementing ↵David 'Digit' Turner2010-06-152-4/+44
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simpler socket_local_client." into kraken Merge commit 'a24bc688c037c9ecf0486747cb8d7568af8ec37b' into gingerbread-plus-aosp * commit 'a24bc688c037c9ecf0486747cb8d7568af8ec37b': linker: remove libcutils dependency by re-implementing simpler socket_local_client.
| | * | | | | Merge "linker: remove libcutils dependency by re-implementing simpler ↵David 'Digit' Turner2010-06-152-4/+44
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | socket_local_client." into kraken
| | | * | | | linker: remove libcutils dependency by re-implementing simpler ↵David 'Digit' Turner2010-06-102-4/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | socket_local_client. Change-Id: I87f29fd59454d713b9ddfb13e6cf114822f52efd
* | | | | | | am 49b53c0b: merge from froyo-plus-aospThe Android Open Source Project2010-06-144-0/+148
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '49b53c0b948595ac34a52daca5fc6ef6af336b94' * commit '49b53c0b948595ac34a52daca5fc6ef6af336b94': added missing ether_aton and ether_ntoa
| * | | | | | merge from froyo-plus-aospThe Android Open Source Project2010-06-144-0/+148
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | Change-Id: Ibbde24d8ee26259f3eff076ee4d32476f868db85
| | * | | | | merge from open-source masterThe Android Open Source Project2010-06-144-0/+148
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | Change-Id: I63e2bfcf87d190fb063c5b2457ebe6b0d50ddd26
| | | * | | | added missing ether_aton and ether_ntoaSzymon Jakubczak2010-06-114-0/+148
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Change-Id: I32ee448abde4d5693d393030ed77ddc6d2ad1dfc
* | | | | | am ef5f1ec3: am da3019b5: libc: add missing truncate() declarationDavid 'Digit' Turner2010-06-112-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ef5f1ec301f7be8c35cc073c54f41272e02ae7d2' * commit 'ef5f1ec301f7be8c35cc073c54f41272e02ae7d2': libc: add missing truncate() declaration
| * | | | | am da3019b5: libc: add missing truncate() declarationDavid 'Digit' Turner2010-06-112-0/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'da3019b55305ce51b1b483d8727641e791ce0941' into gingerbread-plus-aosp * commit 'da3019b55305ce51b1b483d8727641e791ce0941': libc: add missing truncate() declaration
| | * | | | libc: add missing truncate() declarationDavid 'Digit' Turner2010-06-112-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb3601bbc9365b75b05ff443a39192f9cd3cbfb7
* | | | | | am 1b5b2305: am ecb6d413: libc: Add missing <termio.h> headerDavid 'Digit' Turner2010-06-112-0/+34
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1b5b23059304cfcc8d7d180ffa28ad48d5f20ac5' * commit '1b5b23059304cfcc8d7d180ffa28ad48d5f20ac5': libc: Add missing <termio.h> header
| * | | | | am ecb6d413: libc: Add missing <termio.h> headerDavid 'Digit' Turner2010-06-112-0/+34
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ecb6d4133477fef90c2fa23a40637d3c62681ee0' into gingerbread-plus-aosp * commit 'ecb6d4133477fef90c2fa23a40637d3c62681ee0': libc: Add missing <termio.h> header
| | * | | | libc: Add missing <termio.h> headerDavid 'Digit' Turner2010-06-112-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id4e020ed330b3eabf09324f9b6d44d3a0f336d87
* | | | | | am c0b91e65: am 6c8a2f2a: libc: remove cutils dependenciesDavid 'Digit' Turner2010-06-114-4/+116
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c0b91e659abab740e99832a0dce7f9fd3e35d765' * commit 'c0b91e659abab740e99832a0dce7f9fd3e35d765': libc: remove cutils dependencies
| * | | | | am 6c8a2f2a: libc: remove cutils dependenciesDavid 'Digit' Turner2010-06-114-4/+116
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6c8a2f2a5bc8d612ee953f528f2b5eb35983656a' into gingerbread-plus-aosp * commit '6c8a2f2a5bc8d612ee953f528f2b5eb35983656a': libc: remove cutils dependencies
| | * | | | libc: remove cutils dependenciesDavid 'Digit' Turner2010-06-114-4/+116
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We simply copy the stuff we need from cutils headers. A future patch will change cutils to include the private <bionic_atomic_inline.h> Change-Id: Ib6fd9a03bc9e337ce867bd606dc94c2b4438480a
* | | | | Merge "Add headers for new sensors"Colin Cross2010-06-113-0/+122
|\ \ \ \ \
| * | | | | Add headers for new sensorsColin Cross2010-06-093-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1de2bf65310920b3496c58f05b3c39158de4c51d
* | | | | | resolved conflicts for merge of 43a3d66f to masterDavid 'Digit' Turner2010-06-092-1/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I5e09ee0778f6971ae2c34de23f719328035c61ed
| * | | | | am 038fbae5: sysconf(): Fix line parser for /proc files.David 'Digit' Turner2010-06-092-1/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | sysconf(): Fix line parser for /proc files.David 'Digit' Turner2010-06-092-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2678010ee95933de19c8a8e3b2fe65ceb9b86400
* | | | | | am cd11be09: (-s ours) am 9205fdf8: Add missing termios defns to bring on ↵Bruce Beare2010-06-090-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | par with ARM - DO NOT MERGE
| * | | | | am 9205fdf8: Add missing termios defns to bring on par with ARM - DO NOT MERGEBruce Beare2010-06-090-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add missing termios defns to bring on par with ARM - DO NOT MERGEBruce Beare2010-06-091-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6e16e7ab117b6df07ef24f092de1511fe1e9e7b1
* | | | | | am 59e778eb: (-s ours) am 2beac0f5: DO NOT MERGE - add sincos.c to libm ↵David 'Digit' Turner2010-06-090-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | compilation
| * | | | am 2beac0f5: DO NOT MERGE - add sincos.c to libm compilationDavid 'Digit' Turner2010-06-091-0/+1
| |\ \ \ \ | | |/ / /
| | * | | DO NOT MERGE - add sincos.c to libm compilationDavid 'Digit' Turner2010-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, a previous backport from master didn't get this. Change-Id: I59eb96ad9de495a659808fdfb557033476c3d123
* | | | | am 2837863f: (-s ours) am 20783c14: Update libthread_db for gdb-7.0 - DO NOT ↵David 'Digit' Turner2010-06-090-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | MERGE
| * | | | am 20783c14: Update libthread_db for gdb-7.0 - DO NOT MERGEDavid 'Digit' Turner2010-06-092-11/+73
| |\ \ \ \ | | |/ / /
| | * | | Update libthread_db for gdb-7.0 - DO NOT MERGEDavid 'Digit' Turner2010-06-092-11/+73
| | | | | | | | | | | | | | | | | | | | Change-Id: Id02b29314109ad1bf6de3388f856af6da3f90d33
* | | | | am 0f9a0a02: (-s ours) am 410b2ae7: Add sincosl() function to bionic. So ↵David 'Digit' Turner2010-06-090-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | that sincos optimization can - DO NOT MERGE be enabled.
| * | | | am 410b2ae7: Add sincosl() function to bionic. So that sincos optimization ↵David 'Digit' Turner2010-06-093-0/+55
| |\ \ \ \ | | |/ / / | | | | | | | | | | can - DO NOT MERGE be enabled.
| | * | | Add sincosl() function to bionic. So that sincos optimization can - DO NOT MERGEDavid 'Digit' Turner2010-06-093-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be enabled. Change-Id: I672cb319689aa4fb3f1f7cd868dda76842bebae9
* | | | | am 4b043b56: am 506b13d9: Remove a gcc-4.5 compilation warning: ↵Jing Yu2010-06-090-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | bionic/libc/include/../include/stdlib.h: In function \'int grantpt(int)\': bionic/libc/include/../include/stdlib.h:138:23: warning: parameter \'__fd\' set but not used [-Wunused-but-set-parameter]
| * | | | am 506b13d9: Remove a gcc-4.5 compilation warning: ↵Jing Yu2010-06-091-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | bionic/libc/include/../include/stdlib.h: In function \'int grantpt(int)\': bionic/libc/include/../include/stdlib.h:138:23: warning: parameter \'__fd\' set but not used [-Wunused-but-set-parameter]
| | * | | Remove a gcc-4.5 compilation warning:Jing Yu2010-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic/libc/include/../include/stdlib.h: In function 'int grantpt(int)': bionic/libc/include/../include/stdlib.h:138:23: warning: parameter '__fd' set but not used [-Wunused-but-set-parameter] By adding __attribute((unused)) to __fd, the warning is gone, and this attribute is compatible with gcc-4.4.0, gcc-4.3.1 gcc-4.2.1. There is no any side effect. Change-Id: I385f0f4da1013ffd1499e391eac9123aafe1f7a5
* | | | | am 8946da4f: (-s ours) am b8e6c50c: Fix setjmp()/longjmp() to save FP ↵David 'Digit' Turner2010-06-090-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | registers on ARMv7. - DO NOT MERGE
| * | | | am b8e6c50c: Fix setjmp()/longjmp() to save FP registers on ARMv7. - DO NOT ↵David 'Digit' Turner2010-06-095-125/+144
| |\ \ \ \ | | |/ / / | | | | | | | | | | MERGE
| | * | | Fix setjmp()/longjmp() to save FP registers on ARMv7. - DO NOT MERGEDavid 'Digit' Turner2010-06-095-125/+144
| | | | | | | | | | | | | | | | | | | | Change-Id: I3a0c2c05e295ac05ed51a531dabda668be204ca0