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
David 'Digit' Turner
b8e6c50cfa
Fix setjmp()/longjmp() to save FP registers on ARMv7. - DO NOT MERGE
...
Change-Id: I3a0c2c05e295ac05ed51a531dabda668be204ca0
2010-06-09 13:18:29 -07:00
David 'Digit' Turner
de9a1e139e
am 732d133c
: (-s ours) am aa4b1d04
: Add missing sysinfo() implementation (already declared in <sys/sysinfo.h>) - DO NOT MERGE
2010-06-09 13:16:37 -07:00
David 'Digit' Turner
732d133c1d
am aa4b1d04
: Add missing sysinfo() implementation (already declared in <sys/sysinfo.h>) - DO NOT MERGE
2010-06-09 13:15:12 -07:00
David 'Digit' Turner
aa4b1d0429
Add missing sysinfo() implementation (already declared in <sys/sysinfo.h>) - DO NOT MERGE
...
Change-Id: Iac4eb5911ffe4a7ab72b84df44e907685ac816af
2010-06-09 13:12:15 -07:00
David 'Digit' Turner
53f3d63a18
Resolved conflict fpr merge of 7d8574ce
to master
...
Conflicts:
libc/docs/CHANGES.TXT
Change-Id: I3816ac8346be399b31167b0374a0f018451bb92d
2010-06-08 17:41:10 -07:00
David 'Digit' Turner
7d8574cefe
am 6304d8b2
: Use private futexes for semaphores, unless they are initialized with pshared != 0.
2010-06-08 17:29:43 -07:00
David 'Digit' Turner
6304d8b218
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.
2010-06-08 17:04:49 -07:00
Jing Yu
e4d8a9205a
Merge "Add sincosl() function to bionic. So that sincos optimization can be enabled."
2010-06-07 13:14:45 -07:00
The Android Open Source Project
d881b9e10a
am 7980f585
: merge from froyo-plus-aosp
2010-06-07 11:22:29 -07:00
The Android Open Source Project
7980f585f7
merge from froyo-plus-aosp
...
Change-Id: I54d3b035f378d92f287b3dd08987c4041fda9997
2010-06-07 11:19:33 -07:00
The Android Open Source Project
15956f9288
merge from open-source master
...
Change-Id: I1cc2f1123a296b05c4faaa419374376395e05936
2010-06-07 11:01:49 -07:00
David Turner
16c91eff09
Merge "Add missing termios defns to bring on par with ARM"
2010-06-05 13:07:40 -07:00