OSDN Git Service
The Android Open Source Project [Fri, 2 Jul 2010 18:40:56 +0000 (11:40 -0700)]
am
d6f31851: merge from open-source master
Merge commit '
d6f3185148933e4bae17e8f6efe7610cd1cf7769'
* commit '
d6f3185148933e4bae17e8f6efe7610cd1cf7769':
Allow dlclose() to properly call static C++ destructors.
The Android Open Source Project [Fri, 2 Jul 2010 18:37:54 +0000 (11:37 -0700)]
merge from open-source master
Change-Id: I6a15428fd9ce1f1dbbb702ff13c6af8da8f54a1e
David 'Digit' Turner [Fri, 2 Jul 2010 06:09:28 +0000 (23:09 -0700)]
Allow dlclose() to properly call static C++ destructors.
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)
NOTE: The NDK will need to be modified to enable this feature in
the shared libraries that are generated through it.
Change-Id: I99cd801375bbaef0581175893d1aa0943211b9bc
David 'Digit' Turner [Tue, 29 Jun 2010 19:55:34 +0000 (12:55 -0700)]
am
7d1d98b9: am
a02b93bd: libc: add sanity checks to pthread_mutex_destroy()
Merge commit '
7d1d98b97e947de22aff4c0b67eec7ae68c822ee'
* commit '
7d1d98b97e947de22aff4c0b67eec7ae68c822ee':
libc: add sanity checks to pthread_mutex_destroy()
David 'Digit' Turner [Tue, 29 Jun 2010 19:53:13 +0000 (12:53 -0700)]
am
a02b93bd: libc: add sanity checks to pthread_mutex_destroy()
Merge commit '
a02b93bd75a9d156117264d88069566e447397e2' into gingerbread-plus-aosp
* commit '
a02b93bd75a9d156117264d88069566e447397e2':
libc: add sanity checks to pthread_mutex_destroy()
David 'Digit' Turner [Mon, 28 Jun 2010 21:20:22 +0000 (14:20 -0700)]
libc: add sanity checks to pthread_mutex_destroy()
Change-Id: Iddb2204fa792fa9aca5f19838926dddbb09b74a2
Wink Saville [Mon, 28 Jun 2010 19:13:00 +0000 (12:13 -0700)]
Merge "Use a recursive lock for pthread_once."
Wink Saville [Mon, 28 Jun 2010 18:41:16 +0000 (11:41 -0700)]
Use a recursive lock for pthread_once.
bug:
2292366
Change-Id: I9fc8b790dcfcb30ca94a0beb340d43fe5cd6c22e
David 'Digit' Turner [Mon, 28 Jun 2010 18:29:50 +0000 (11:29 -0700)]
am
4a927712: am
0621a279: libstdc++: use extern "C++" in all our C++ system headers.
Merge commit '
4a927712b7375844bb6c10eb0e495fcc4904d805'
* commit '
4a927712b7375844bb6c10eb0e495fcc4904d805':
libstdc++: use extern "C++" in all our C++ system headers.
David 'Digit' Turner [Mon, 28 Jun 2010 18:27:32 +0000 (11:27 -0700)]
am
0621a279: libstdc++: use extern "C++" in all our C++ system headers.
Merge commit '
0621a279adfb981ea1f0564e7fc8280cda78e043' into gingerbread-plus-aosp
* commit '
0621a279adfb981ea1f0564e7fc8280cda78e043':
libstdc++: use extern "C++" in all our C++ system headers.
David 'Digit' Turner [Fri, 25 Jun 2010 23:53:37 +0000 (16:53 -0700)]
libstdc++: use extern "C++" in all our C++ system headers.
This is needed to build an independent toolchain with g++ that doesn't think
that all these headers are in C.
Change-Id: Ie9a8ccfcab7780d6a4e5722777d61c2b1b312001
Nick Pelly [Thu, 24 Jun 2010 01:01:01 +0000 (18:01 -0700)]
am
0a79d213: am
fa5755ae: Merge "Add clean headers for 7x30 video codec." into gingerbread
Merge commit '
0a79d2135cf607b257319fb6d4638c0313cab388'
* commit '
0a79d2135cf607b257319fb6d4638c0313cab388':
Add clean headers for 7x30 video codec.
Nick Pelly [Thu, 24 Jun 2010 00:58:38 +0000 (17:58 -0700)]
am
fa5755ae: Merge "Add clean headers for 7x30 video codec." into gingerbread
Merge commit '
fa5755ae980b6f4ac5df37b263ba20f472db31ca' into gingerbread-plus-aosp
* commit '
fa5755ae980b6f4ac5df37b263ba20f472db31ca':
Add clean headers for 7x30 video codec.
Nick Pelly [Thu, 24 Jun 2010 00:56:38 +0000 (17:56 -0700)]
Merge "Add clean headers for 7x30 video codec." into gingerbread
Nick Pelly [Wed, 23 Jun 2010 23:17:58 +0000 (16:17 -0700)]
Add clean headers for 7x30 video codec.
Change-Id: Id4faa5bacb03cc42377527e05c53c6392c776e7d
David 'Digit' Turner [Wed, 23 Jun 2010 19:41:50 +0000 (12:41 -0700)]
am
cb0f5ed8: am
50ace4fe: Remove compiler warnings when building Bionic.
Merge commit '
cb0f5ed8111d4305cf6798aefdb4f9623570c83a'
* commit '
cb0f5ed8111d4305cf6798aefdb4f9623570c83a':
Remove compiler warnings when building Bionic.
David 'Digit' Turner [Wed, 23 Jun 2010 18:17:07 +0000 (11:17 -0700)]
am
50ace4fe: Remove compiler warnings when building Bionic.
Merge commit '
50ace4fec5e8cb5afcbc656a4556fa528adfd760' into gingerbread-plus-aosp
* commit '
50ace4fec5e8cb5afcbc656a4556fa528adfd760':
Remove compiler warnings when building Bionic.
David 'Digit' Turner [Wed, 23 Jun 2010 17:32:05 +0000 (10:32 -0700)]
am
e1a739ec: am
6a9b888d: Allow static C++ destructors to be properly called on dlclose().
Merge commit '
e1a739ec38a39fea9e66038dfc7cea364cb6a256'
* commit '
e1a739ec38a39fea9e66038dfc7cea364cb6a256':
Allow static C++ destructors to be properly called on dlclose().
David 'Digit' Turner [Wed, 16 Jun 2010 23:36:41 +0000 (16:36 -0700)]
Remove compiler warnings when building Bionic.
Also add missing declarations to misc. functions.
Fix clearerr() implementation (previous was broken).
Handle feature test macros like _POSIX_C_SOURCE properly.
Change-Id: Icdc973a6b9d550a166fc2545f727ea837fe800c4
David 'Digit' Turner [Tue, 22 Jun 2010 18:19:25 +0000 (11:19 -0700)]
am
6a9b888d: Allow static C++ destructors to be properly called on dlclose().
Merge commit '
6a9b888d7c4b246f6f66360789c72b754ff85021' into gingerbread-plus-aosp
* commit '
6a9b888d7c4b246f6f66360789c72b754ff85021':
Allow static C++ destructors to be properly called on dlclose().
The Android Open Source Project [Mon, 21 Jun 2010 17:54:48 +0000 (10:54 -0700)]
am
04acf6c8: merge from froyo-plus-aosp
Merge commit '
04acf6c80ee1fbe64c3915da1255e8ce4e7798ce'
* commit '
04acf6c80ee1fbe64c3915da1255e8ce4e7798ce':
Fix for incorrect reply from sysconf(_SC_NPROCESSORS_ONLN)
The Android Open Source Project [Mon, 21 Jun 2010 17:52:43 +0000 (10:52 -0700)]
merge from froyo-plus-aosp
Change-Id: I64de22c97a98ec4f1f288c619e3d66d6be261c6d
David 'Digit' Turner [Fri, 18 Jun 2010 21:47:22 +0000 (14:47 -0700)]
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.
The Android Open Source Project [Fri, 18 Jun 2010 18:33:00 +0000 (11:33 -0700)]
merge from open-source master
Change-Id: I408b5705b18d9e93e66bfbfeec0e3baefd618dec
David Turner [Thu, 17 Jun 2010 00:36:32 +0000 (17:36 -0700)]
Merge "Fix for incorrect reply from sysconf(_SC_NPROCESSORS_ONLN)"
Mikael Ohlson [Fri, 21 May 2010 09:20:39 +0000 (11:20 +0200)]
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>
Kristian Monsen [Wed, 16 Jun 2010 13:51:52 +0000 (14:51 +0100)]
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
David 'Digit' Turner [Tue, 15 Jun 2010 14:09:33 +0000 (07:09 -0700)]
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
David 'Digit' Turner [Tue, 15 Jun 2010 14:07:44 +0000 (07:07 -0700)]
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
David 'Digit' Turner [Tue, 15 Jun 2010 14:05:21 +0000 (07:05 -0700)]
Merge "wchar.h: improve wchar_t support in Bionic" into kraken
David 'Digit' Turner [Tue, 15 Jun 2010 00:18:35 +0000 (17:18 -0700)]
wchar.h: improve wchar_t support in Bionic
Change-Id: Iffd41046fd0933c66542abf7627a1569522dfcb2
David 'Digit' Turner [Tue, 15 Jun 2010 14:03:55 +0000 (07:03 -0700)]
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.
David 'Digit' Turner [Tue, 15 Jun 2010 14:01:02 +0000 (07:01 -0700)]
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.
David 'Digit' Turner [Tue, 15 Jun 2010 13:54:45 +0000 (06:54 -0700)]
Merge "linker: remove libcutils dependency by re-implementing simpler socket_local_client." into kraken
The Android Open Source Project [Mon, 14 Jun 2010 18:20:52 +0000 (11:20 -0700)]
am
49b53c0b: merge from froyo-plus-aosp
Merge commit '
49b53c0b948595ac34a52daca5fc6ef6af336b94'
* commit '
49b53c0b948595ac34a52daca5fc6ef6af336b94':
added missing ether_aton and ether_ntoa
The Android Open Source Project [Mon, 14 Jun 2010 18:18:38 +0000 (11:18 -0700)]
merge from froyo-plus-aosp
Change-Id: Ibbde24d8ee26259f3eff076ee4d32476f868db85
The Android Open Source Project [Mon, 14 Jun 2010 17:49:00 +0000 (10:49 -0700)]
merge from open-source master
Change-Id: I63e2bfcf87d190fb063c5b2457ebe6b0d50ddd26
Szymon Jakubczak [Wed, 9 Jun 2010 19:53:28 +0000 (15:53 -0400)]
added missing ether_aton and ether_ntoa
Change-Id: I32ee448abde4d5693d393030ed77ddc6d2ad1dfc
David 'Digit' Turner [Fri, 11 Jun 2010 21:44:27 +0000 (14:44 -0700)]
am
ef5f1ec3: am
da3019b5: libc: add missing truncate() declaration
Merge commit '
ef5f1ec301f7be8c35cc073c54f41272e02ae7d2'
* commit '
ef5f1ec301f7be8c35cc073c54f41272e02ae7d2':
libc: add missing truncate() declaration
David 'Digit' Turner [Fri, 11 Jun 2010 21:44:20 +0000 (14:44 -0700)]
am
1b5b2305: am
ecb6d413: libc: Add missing <termio.h> header
Merge commit '
1b5b23059304cfcc8d7d180ffa28ad48d5f20ac5'
* commit '
1b5b23059304cfcc8d7d180ffa28ad48d5f20ac5':
libc: Add missing <termio.h> header
David 'Digit' Turner [Fri, 11 Jun 2010 21:42:58 +0000 (14:42 -0700)]
am
da3019b5: libc: add missing truncate() declaration
Merge commit '
da3019b55305ce51b1b483d8727641e791ce0941' into gingerbread-plus-aosp
* commit '
da3019b55305ce51b1b483d8727641e791ce0941':
libc: add missing truncate() declaration
David 'Digit' Turner [Fri, 11 Jun 2010 21:42:56 +0000 (14:42 -0700)]
am
ecb6d413: libc: Add missing <termio.h> header
Merge commit '
ecb6d4133477fef90c2fa23a40637d3c62681ee0' into gingerbread-plus-aosp
* commit '
ecb6d4133477fef90c2fa23a40637d3c62681ee0':
libc: Add missing <termio.h> header
David 'Digit' Turner [Fri, 11 Jun 2010 21:37:34 +0000 (14:37 -0700)]
libc: add missing truncate() declaration
Change-Id: Icb3601bbc9365b75b05ff443a39192f9cd3cbfb7
David 'Digit' Turner [Fri, 11 Jun 2010 20:30:25 +0000 (13:30 -0700)]
libc: Add missing <termio.h> header
Change-Id: Id4e020ed330b3eabf09324f9b6d44d3a0f336d87
David 'Digit' Turner [Fri, 11 Jun 2010 21:01:16 +0000 (14:01 -0700)]
am
c0b91e65: am
6c8a2f2a: libc: remove cutils dependencies
Merge commit '
c0b91e659abab740e99832a0dce7f9fd3e35d765'
* commit '
c0b91e659abab740e99832a0dce7f9fd3e35d765':
libc: remove cutils dependencies
David 'Digit' Turner [Fri, 11 Jun 2010 20:58:56 +0000 (13:58 -0700)]
am
6c8a2f2a: libc: remove cutils dependencies
Merge commit '
6c8a2f2a5bc8d612ee953f528f2b5eb35983656a' into gingerbread-plus-aosp
* commit '
6c8a2f2a5bc8d612ee953f528f2b5eb35983656a':
libc: remove cutils dependencies
David 'Digit' Turner [Fri, 11 Jun 2010 06:34:24 +0000 (23:34 -0700)]
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
Colin Cross [Fri, 11 Jun 2010 19:01:46 +0000 (12:01 -0700)]
Merge "Add headers for new sensors"
David 'Digit' Turner [Fri, 11 Jun 2010 01:29:33 +0000 (18:29 -0700)]
linker: remove libcutils dependency by re-implementing simpler socket_local_client.
Change-Id: I87f29fd59454d713b9ddfb13e6cf114822f52efd
David 'Digit' Turner [Thu, 10 Jun 2010 01:26:16 +0000 (18:26 -0700)]
resolved conflicts for merge of
43a3d66f to master
Change-Id: I5e09ee0778f6971ae2c34de23f719328035c61ed
David 'Digit' Turner [Thu, 10 Jun 2010 01:19:10 +0000 (18:19 -0700)]
am
038fbae5: sysconf(): Fix line parser for /proc files.
David 'Digit' Turner [Thu, 10 Jun 2010 01:15:57 +0000 (18:15 -0700)]
sysconf(): Fix line parser for /proc files.
Change-Id: I2678010ee95933de19c8a8e3b2fe65ceb9b86400
Bruce Beare [Wed, 9 Jun 2010 22:57:10 +0000 (15:57 -0700)]
am
cd11be09: (-s ours) am
9205fdf8: Add missing termios defns to bring on par with ARM - DO NOT MERGE
David 'Digit' Turner [Wed, 9 Jun 2010 22:55:25 +0000 (15:55 -0700)]
am
59e778eb: (-s ours) am
2beac0f5: DO NOT MERGE - add sincos.c to libm compilation
Bruce Beare [Wed, 9 Jun 2010 22:54:41 +0000 (15:54 -0700)]
am
9205fdf8: Add missing termios defns to bring on par with ARM - DO NOT MERGE
David 'Digit' Turner [Wed, 9 Jun 2010 22:53:03 +0000 (15:53 -0700)]
am
2beac0f5: DO NOT MERGE - add sincos.c to libm compilation
Bruce Beare [Fri, 4 Jun 2010 15:14:44 +0000 (08:14 -0700)]
Add missing termios defns to bring on par with ARM - DO NOT MERGE
Change-Id: I6e16e7ab117b6df07ef24f092de1511fe1e9e7b1
Colin Cross [Wed, 9 Jun 2010 22:51:43 +0000 (15:51 -0700)]
Add headers for new sensors
Change-Id: I1de2bf65310920b3496c58f05b3c39158de4c51d
David 'Digit' Turner [Wed, 9 Jun 2010 22:49:35 +0000 (15:49 -0700)]
DO NOT MERGE - add sincos.c to libm compilation
For some reason, a previous backport from master didn't get this.
Change-Id: I59eb96ad9de495a659808fdfb557033476c3d123
David 'Digit' Turner [Wed, 9 Jun 2010 21:47:39 +0000 (14:47 -0700)]
am
2837863f: (-s ours) am
20783c14: Update libthread_db for gdb-7.0 - DO NOT MERGE
David 'Digit' Turner [Wed, 9 Jun 2010 21:45:34 +0000 (14:45 -0700)]
am
20783c14: Update libthread_db for gdb-7.0 - DO NOT MERGE
David 'Digit' Turner [Fri, 19 Mar 2010 23:01:28 +0000 (16:01 -0700)]
Update libthread_db for gdb-7.0 - DO NOT MERGE
Change-Id: Id02b29314109ad1bf6de3388f856af6da3f90d33
David 'Digit' Turner [Wed, 9 Jun 2010 21:39:57 +0000 (14:39 -0700)]
am
0f9a0a02: (-s ours) am
410b2ae7: Add sincosl() function to bionic. So that sincos optimization can - DO NOT MERGE be enabled.
David 'Digit' Turner [Wed, 9 Jun 2010 21:38:40 +0000 (14:38 -0700)]
am
410b2ae7: Add sincosl() function to bionic. So that sincos optimization can - DO NOT MERGE be enabled.
David 'Digit' Turner [Wed, 9 Jun 2010 21:35:29 +0000 (14:35 -0700)]
Add sincosl() function to bionic. So that sincos optimization can - DO NOT MERGE
be enabled.
Change-Id: I672cb319689aa4fb3f1f7cd868dda76842bebae9
Jing Yu [Wed, 9 Jun 2010 20:28:48 +0000 (13:28 -0700)]
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]
Jing Yu [Wed, 9 Jun 2010 20:27:29 +0000 (13:27 -0700)]
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]
Jing Yu [Fri, 21 May 2010 03:25:48 +0000 (20:25 -0700)]
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
David 'Digit' Turner [Wed, 9 Jun 2010 20:23:12 +0000 (13:23 -0700)]
am
8946da4f: (-s ours) am
b8e6c50c: Fix setjmp()/longjmp() to save FP registers on ARMv7. - DO NOT MERGE
David 'Digit' Turner [Wed, 9 Jun 2010 20:21:51 +0000 (13:21 -0700)]
am
b8e6c50c: Fix setjmp()/longjmp() to save FP registers on ARMv7. - DO NOT MERGE
David 'Digit' Turner [Thu, 25 Mar 2010 16:54:33 +0000 (09:54 -0700)]
Fix setjmp()/longjmp() to save FP registers on ARMv7. - DO NOT MERGE
Change-Id: I3a0c2c05e295ac05ed51a531dabda668be204ca0
David 'Digit' Turner [Wed, 9 Jun 2010 20:16:37 +0000 (13:16 -0700)]
am
732d133c: (-s ours) am
aa4b1d04: Add missing sysinfo() implementation (already declared in <sys/sysinfo.h>) - DO NOT MERGE
David 'Digit' Turner [Wed, 9 Jun 2010 20:15:12 +0000 (13:15 -0700)]
am
aa4b1d04: Add missing sysinfo() implementation (already declared in <sys/sysinfo.h>) - DO NOT MERGE
David 'Digit' Turner [Thu, 20 May 2010 17:55:45 +0000 (10:55 -0700)]
Add missing sysinfo() implementation (already declared in <sys/sysinfo.h>) - DO NOT MERGE
Change-Id: Iac4eb5911ffe4a7ab72b84df44e907685ac816af
David 'Digit' Turner [Wed, 9 Jun 2010 00:40:11 +0000 (17:40 -0700)]
Resolved conflict fpr merge of
7d8574ce to master
Conflicts:
libc/docs/CHANGES.TXT
Change-Id: I3816ac8346be399b31167b0374a0f018451bb92d
David 'Digit' Turner [Wed, 9 Jun 2010 00:29:43 +0000 (17:29 -0700)]
am
6304d8b2: Use private futexes for semaphores, unless they are initialized with pshared != 0.
David 'Digit' Turner [Thu, 3 Jun 2010 01:12:12 +0000 (18:12 -0700)]
Use private futexes for semaphores, unless they are initialized with pshared != 0.
Change-Id: I534e36a7171cd37037ae03b910ba71ea6968286d
Note: previously, sem_init() would return an error if pshared != 0.
Jing Yu [Mon, 7 Jun 2010 20:14:45 +0000 (13:14 -0700)]
Merge "Add sincosl() function to bionic. So that sincos optimization can be enabled."
The Android Open Source Project [Mon, 7 Jun 2010 18:22:29 +0000 (11:22 -0700)]
am
7980f585: merge from froyo-plus-aosp
The Android Open Source Project [Mon, 7 Jun 2010 18:19:33 +0000 (11:19 -0700)]
merge from froyo-plus-aosp
Change-Id: I54d3b035f378d92f287b3dd08987c4041fda9997
The Android Open Source Project [Mon, 7 Jun 2010 18:01:49 +0000 (11:01 -0700)]
merge from open-source master
Change-Id: I1cc2f1123a296b05c4faaa419374376395e05936
David Turner [Sat, 5 Jun 2010 20:07:40 +0000 (13:07 -0700)]
Merge "Add missing termios defns to bring on par with ARM"
Bruce Beare [Fri, 4 Jun 2010 15:14:44 +0000 (08:14 -0700)]
Add missing termios defns to bring on par with ARM
Change-Id: Ied1871aa0a2e33473b89a4ac6d54e3c44be7f457
Jean-Baptiste Queru [Thu, 3 Jun 2010 22:08:23 +0000 (15:08 -0700)]
am
a8a21488: resolved conflicts for merge of
7b6e6fa5 to kraken
Jean-Baptiste Queru [Thu, 3 Jun 2010 22:05:04 +0000 (15:05 -0700)]
resolved conflicts for merge of
7b6e6fa5 to kraken
Change-Id: I2b9b80a7fa32c56be2b85ff8be0d6e7ac1848afe
The Android Open Source Project [Thu, 3 Jun 2010 21:39:20 +0000 (14:39 -0700)]
merge from open-source master
Change-Id: Ib7fc9c6f79f9b13e2175da137005d8968ea85eaf
Jing Yu [Thu, 3 Jun 2010 21:05:51 +0000 (14:05 -0700)]
Add sincosl() function to bionic. So that sincos optimization can
be enabled.
Change-Id: I19671a407dc96a92417c719da938ee0c1669bfb8
David Turner [Thu, 3 Jun 2010 20:11:52 +0000 (13:11 -0700)]
Merge "pthread: introduce pthread_setname_np() as a mean to give names to threads"
Colin Cross [Wed, 2 Jun 2010 02:24:33 +0000 (19:24 -0700)]
Merge "Add headers for new kernel drivers"
Colin Cross [Wed, 2 Jun 2010 00:45:50 +0000 (17:45 -0700)]
Add headers for new kernel drivers
Change-Id: I65e682cef2c20b12faa5e526e82e35ab3ca0c379
Andy McFadden [Tue, 1 Jun 2010 23:11:07 +0000 (16:11 -0700)]
am
fcd00ebb: Atomic/SMP update, part 3.
Andy McFadden [Fri, 28 May 2010 20:31:45 +0000 (13:31 -0700)]
Atomic/SMP update, part 3.
Update ARM atomic ops to use LDREX/STREX. Stripped out #if 0 chunk.
Insert explicit memory barriers in pthread and semaphore code.
For bug
2721865.
Change-Id: I0f153b797753a655702d8be41679273d1d5d6ae7
Andy McFadden [Fri, 21 May 2010 19:08:09 +0000 (12:08 -0700)]
am
4fdbadde: Atomic/SMP update.
Jing Yu [Fri, 21 May 2010 17:50:38 +0000 (10:50 -0700)]
Merge "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]"
Jing Yu [Fri, 21 May 2010 03:25:48 +0000 (20:25 -0700)]
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: Id9d2b0aeefdd9c37132da0f00c48387f7d897e83
Andy McFadden [Thu, 20 May 2010 05:38:07 +0000 (22:38 -0700)]
Atomic/SMP update.
Added an underscore to _ARM_HAVE_LDREX_STREX to make it match the others.
Added __ARM_HAVE_DMB and __ARM_HAVE_LDREXD when appropriate.
Fixed some typos.
Change-Id: I2f55febcff4aeb7de572a514fb2cd2f820dca27c
David 'Digit' Turner [Thu, 20 May 2010 17:55:45 +0000 (10:55 -0700)]
Add missing sysinfo() implementation (already declared in <sys/sysinfo.h>)
Change-Id: Ie9168238c3a8e77daab4f39939756d4c53d8af37
André Goddard Rosa [Thu, 20 May 2010 02:17:16 +0000 (23:17 -0300)]
pthread: introduce pthread_setname_np() as a mean to give names to threads
... so that each cloned process at the kernel level can be named
independently. Tools like 'top' can display the CPU/memory statistics
for each process's thread if "Show Threads" mode is on.
With this function in place, we can convert dalvik/Thread.c setThreadName()
function over this function. This feature ought to be provided by the
underlying C library and not coded directly in Dalvik.
Change-Id: Ifa997665dbaa114e0b126f8c667708be9a4137fd
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
David 'Digit' Turner [Wed, 19 May 2010 22:12:26 +0000 (15:12 -0700)]
am
8a1d2cf1: (-s ours) Add pthread_rwlock_t implementation to the C library (DO NOT MERGE)
David 'Digit' Turner [Tue, 11 May 2010 23:39:22 +0000 (16:39 -0700)]
Add pthread_rwlock_t implementation to the C library (DO NOT MERGE)
Change-Id: I756d8c26afc37cd7b71117ddbaa02a2cb40fdecb