The Android Open Source Project
e93c115ab1
am 04acf6c8
: merge from froyo-plus-aosp
...
Merge commit '04acf6c80ee1fbe64c3915da1255e8ce4e7798ce'
* commit '04acf6c80ee1fbe64c3915da1255e8ce4e7798ce':
Fix for incorrect reply from sysconf(_SC_NPROCESSORS_ONLN)
2010-06-21 10:54:48 -07:00
The Android Open Source Project
04acf6c80e
merge from froyo-plus-aosp
...
Change-Id: I64de22c97a98ec4f1f288c619e3d66d6be261c6d
2010-06-21 10:52:43 -07:00
David 'Digit' Turner
6a9b888d7c
Allow static C++ destructors to be properly called on dlclose().
...
With this patch, _and_ an upcoming build/ patch, the destruction
of static C++ objects contained in shared libraries will happen
properly when dlclose() is called.
Note that this change introduces crtbegin_so.S and crtend_so.S which
are currently ignored by the build system.
+ move definition of __dso_handle to the right place
(before that, all shared libraries used the __dso_handle
global variable from the C library).
Note that we keep a 'weak' __dso_handle in aeabi.c to avoid
breaking the build until the next patch to build/core/combo/
appears. We will be able to remove that later.
+ move bionic/aeabi.c to arch-arm/bionic/ (its proper location)
Change-Id: Ie771aa204e3acbdf02fd30ebd4150373a1398f39
NOTE: The NDK will need to be modified to enable this feature in
the shared libraries that are generated through it.
2010-06-18 16:07:10 -07:00
The Android Open Source Project
e8f79c1f5d
merge from open-source master
...
Change-Id: I408b5705b18d9e93e66bfbfeec0e3baefd618dec
2010-06-18 11:33:00 -07:00
David Turner
c6b5cd8d76
Merge "Fix for incorrect reply from sysconf(_SC_NPROCESSORS_ONLN)"
2010-06-16 17:36:32 -07:00
Mikael Ohlson
b44fcd6e8f
Fix for incorrect reply from sysconf(_SC_NPROCESSORS_ONLN)
...
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>
2010-06-16 22:02:20 +00:00
Kristian Monsen
70465614e1
Just link fixes for b 2763938.
...
Added wcsxfrm.c and wmemcmp.c to the src files in Android.mk and removed wcsxfrm from wchar.c
Change-Id: Iab9b45cf78c27880d2941c360340a7af6b8964fe
2010-06-16 14:51:52 +01:00
David 'Digit' Turner
c0141a2bdd
am f201ae83
: am 6a09cfd9
: Merge "wchar.h: improve wchar_t support in Bionic" into kraken
...
Merge commit 'f201ae83fc1742f34f9b0ff248c0c6c48a55f7a4'
* commit 'f201ae83fc1742f34f9b0ff248c0c6c48a55f7a4':
wchar.h: improve wchar_t support in Bionic
2010-06-15 07:09:33 -07:00
David 'Digit' Turner
f201ae83fc
am 6a09cfd9
: Merge "wchar.h: improve wchar_t support in Bionic" into kraken
...
Merge commit '6a09cfd9f916e3a60de707ff0806cdeb143d77a4' into gingerbread-plus-aosp
* commit '6a09cfd9f916e3a60de707ff0806cdeb143d77a4':
wchar.h: improve wchar_t support in Bionic
2010-06-15 07:07:44 -07:00
David 'Digit' Turner
6a09cfd9f9
Merge "wchar.h: improve wchar_t support in Bionic" into kraken
2010-06-15 07:05:21 -07:00
David 'Digit' Turner
3527fd6f0d
wchar.h: improve wchar_t support in Bionic
...
Change-Id: Iffd41046fd0933c66542abf7627a1569522dfcb2
2010-06-15 07:04:41 -07:00
David 'Digit' Turner
9bd7922e5d
am a37ffb0c
: am a24bc688
: Merge "linker: remove libcutils dependency by re-implementing simpler socket_local_client." into kraken
...
Merge commit 'a37ffb0c74445fc0bc727aec887990d713d20b8e'
* commit 'a37ffb0c74445fc0bc727aec887990d713d20b8e':
linker: remove libcutils dependency by re-implementing simpler socket_local_client.
2010-06-15 07:03:55 -07:00
David 'Digit' Turner
a37ffb0c74
am a24bc688
: Merge "linker: remove libcutils dependency by re-implementing 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.
2010-06-15 07:01:02 -07:00
David 'Digit' Turner
a24bc688c0
Merge "linker: remove libcutils dependency by re-implementing simpler socket_local_client." into kraken
2010-06-15 06:54:45 -07:00
The Android Open Source Project
9903f1a79a
am 49b53c0b
: merge from froyo-plus-aosp
...
Merge commit '49b53c0b948595ac34a52daca5fc6ef6af336b94'
* commit '49b53c0b948595ac34a52daca5fc6ef6af336b94':
added missing ether_aton and ether_ntoa
2010-06-14 11:20:52 -07:00
The Android Open Source Project
49b53c0b94
merge from froyo-plus-aosp
...
Change-Id: Ibbde24d8ee26259f3eff076ee4d32476f868db85
2010-06-14 11:18:38 -07:00
The Android Open Source Project
04ed4a1c88
merge from open-source master
...
Change-Id: I63e2bfcf87d190fb063c5b2457ebe6b0d50ddd26
2010-06-14 10:49:00 -07:00
Szymon Jakubczak
4032c1e2df
added missing ether_aton and ether_ntoa
...
Change-Id: I32ee448abde4d5693d393030ed77ddc6d2ad1dfc
2010-06-11 20:48:40 -04:00
David 'Digit' Turner
0db9a39e2a
am ef5f1ec3
: am da3019b5
: libc: add missing truncate() declaration
...
Merge commit 'ef5f1ec301f7be8c35cc073c54f41272e02ae7d2'
* commit 'ef5f1ec301f7be8c35cc073c54f41272e02ae7d2':
libc: add missing truncate() declaration
2010-06-11 14:44:27 -07:00
David 'Digit' Turner
1120749f04
am 1b5b2305
: am ecb6d413
: libc: Add missing <termio.h> header
...
Merge commit '1b5b23059304cfcc8d7d180ffa28ad48d5f20ac5'
* commit '1b5b23059304cfcc8d7d180ffa28ad48d5f20ac5':
libc: Add missing <termio.h> header
2010-06-11 14:44:20 -07:00
David 'Digit' Turner
ef5f1ec301
am da3019b5
: libc: add missing truncate() declaration
...
Merge commit 'da3019b55305ce51b1b483d8727641e791ce0941' into gingerbread-plus-aosp
* commit 'da3019b55305ce51b1b483d8727641e791ce0941':
libc: add missing truncate() declaration
2010-06-11 14:42:58 -07:00
David 'Digit' Turner
1b5b230593
am ecb6d413
: libc: Add missing <termio.h> header
...
Merge commit 'ecb6d4133477fef90c2fa23a40637d3c62681ee0' into gingerbread-plus-aosp
* commit 'ecb6d4133477fef90c2fa23a40637d3c62681ee0':
libc: Add missing <termio.h> header
2010-06-11 14:42:56 -07:00
David 'Digit' Turner
da3019b553
libc: add missing truncate() declaration
...
Change-Id: Icb3601bbc9365b75b05ff443a39192f9cd3cbfb7
2010-06-11 14:40:02 -07:00
David 'Digit' Turner
ecb6d41334
libc: Add missing <termio.h> header
...
Change-Id: Id4e020ed330b3eabf09324f9b6d44d3a0f336d87
2010-06-11 14:39:39 -07:00
David 'Digit' Turner
8ebb9caa83
am c0b91e65
: am 6c8a2f2a
: libc: remove cutils dependencies
...
Merge commit 'c0b91e659abab740e99832a0dce7f9fd3e35d765'
* commit 'c0b91e659abab740e99832a0dce7f9fd3e35d765':
libc: remove cutils dependencies
2010-06-11 14:01:16 -07:00
David 'Digit' Turner
c0b91e659a
am 6c8a2f2a
: libc: remove cutils dependencies
...
Merge commit '6c8a2f2a5bc8d612ee953f528f2b5eb35983656a' into gingerbread-plus-aosp
* commit '6c8a2f2a5bc8d612ee953f528f2b5eb35983656a':
libc: remove cutils dependencies
2010-06-11 13:58:56 -07:00
David 'Digit' Turner
6c8a2f2a5b
libc: remove cutils dependencies
...
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
2010-06-11 13:49:09 -07:00
Colin Cross
87d44baab4
Merge "Add headers for new sensors"
2010-06-11 12:01:46 -07:00
David 'Digit' Turner
8bff9a31aa
linker: remove libcutils dependency by re-implementing simpler socket_local_client.
...
Change-Id: I87f29fd59454d713b9ddfb13e6cf114822f52efd
2010-06-10 22:58:22 -07:00
David 'Digit' Turner
5ccaf62090
resolved conflicts for merge of 43a3d66f
to master
...
Change-Id: I5e09ee0778f6971ae2c34de23f719328035c61ed
2010-06-09 18:26:37 -07:00
David 'Digit' Turner
43a3d66f13
am 038fbae5
: sysconf(): Fix line parser for /proc files.
2010-06-09 18:19:10 -07:00
David 'Digit' Turner
038fbae518
sysconf(): Fix line parser for /proc files.
...
Change-Id: I2678010ee95933de19c8a8e3b2fe65ceb9b86400
2010-06-09 18:15:57 -07:00
Bruce Beare
f45d94425b
am cd11be09
: (-s ours) am 9205fdf8
: Add missing termios defns to bring on par with ARM - DO NOT MERGE
2010-06-09 15:57:10 -07:00
David 'Digit' Turner
ab37bb30c6
am 59e778eb
: (-s ours) am 2beac0f5
: DO NOT MERGE - add sincos.c to libm compilation
2010-06-09 15:55:25 -07:00
Bruce Beare
cd11be09cb
am 9205fdf8
: Add missing termios defns to bring on par with ARM - DO NOT MERGE
2010-06-09 15:54:41 -07:00
David 'Digit' Turner
59e778eba7
am 2beac0f5
: DO NOT MERGE - add sincos.c to libm compilation
2010-06-09 15:53:03 -07:00
Bruce Beare
9205fdf8c6
Add missing termios defns to bring on par with ARM - DO NOT MERGE
...
Change-Id: I6e16e7ab117b6df07ef24f092de1511fe1e9e7b1
2010-06-09 15:52:28 -07:00
Colin Cross
b508876e4c
Add headers for new sensors
...
Change-Id: I1de2bf65310920b3496c58f05b3c39158de4c51d
2010-06-09 15:51:43 -07:00
David 'Digit' Turner
2beac0f5c6
DO NOT MERGE - add sincos.c to libm compilation
...
For some reason, a previous backport from master didn't get this.
Change-Id: I59eb96ad9de495a659808fdfb557033476c3d123
2010-06-09 15:49:35 -07:00
David 'Digit' Turner
7b6334c3bc
am 2837863f
: (-s ours) am 20783c14
: Update libthread_db for gdb-7.0 - DO NOT MERGE
2010-06-09 14:47:39 -07:00
David 'Digit' Turner
2837863f35
am 20783c14
: Update libthread_db for gdb-7.0 - DO NOT MERGE
2010-06-09 14:45:34 -07:00
David 'Digit' Turner
20783c1428
Update libthread_db for gdb-7.0 - DO NOT MERGE
...
Change-Id: Id02b29314109ad1bf6de3388f856af6da3f90d33
2010-06-09 14:43:39 -07:00
David 'Digit' Turner
fde04556fe
am 0f9a0a02
: (-s ours) am 410b2ae7
: Add sincosl() function to bionic. So that sincos optimization can - DO NOT MERGE be enabled.
2010-06-09 14:39:57 -07:00
David 'Digit' Turner
0f9a0a025a
am 410b2ae7
: Add sincosl() function to bionic. So that sincos optimization can - DO NOT MERGE be enabled.
2010-06-09 14:38:40 -07:00
David 'Digit' Turner
410b2ae7fb
Add sincosl() function to bionic. So that sincos optimization can - DO NOT MERGE
...
be enabled.
Change-Id: I672cb319689aa4fb3f1f7cd868dda76842bebae9
2010-06-09 14:35:29 -07:00
Jing Yu
8e37eda84d
am 4b043b56
: am 506b13d9
: Remove a gcc-4.5 compilation warning: 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]
2010-06-09 13:28:48 -07:00
Jing Yu
4b043b56f7
am 506b13d9
: Remove a gcc-4.5 compilation warning: 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]
2010-06-09 13:27:29 -07:00
Jing Yu
506b13d910
Remove a gcc-4.5 compilation warning:
...
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
2010-06-09 13:24:22 -07:00
David 'Digit' Turner
04ce2b3606
am 8946da4f
: (-s ours) am b8e6c50c
: Fix setjmp()/longjmp() to save FP registers on ARMv7. - DO NOT MERGE
2010-06-09 13:23:12 -07:00
David 'Digit' Turner
8946da4fe1
am b8e6c50c
: Fix setjmp()/longjmp() to save FP registers on ARMv7. - DO NOT MERGE
2010-06-09 13:21:51 -07:00