Commit graph

638 commits

Author SHA1 Message Date
The Android Open Source Project
4918d4cb0c am 611793d6: merge from open-source master
Merge commit '611793d6abcf504544d6ebccb8c46da06464b701'

* commit '611793d6abcf504544d6ebccb8c46da06464b701':
  Fix missing NL
2010-07-09 10:49:04 -07:00
The Android Open Source Project
611793d6ab merge from open-source master
Change-Id: Ia22080192681c2ac596582d6cfdac732b1ff4c9f
2010-07-09 10:47:23 -07:00
David 'Digit' Turner
312d86493c am ea5adb57: am cb7e8c5e: libc: update alarm() implementation to return 0 on error.
Merge commit 'ea5adb571e664e5d0444230169062baaa996686f'

* commit 'ea5adb571e664e5d0444230169062baaa996686f':
  libc: update alarm() implementation to return 0 on error.
2010-07-08 19:10:55 -07:00
David 'Digit' Turner
85b0c388ed am 7ab9c068: am ab8b5410: libc: fix fstatfs() implementation.
Merge commit '7ab9c068aac3373fe35a94b01a36d360c2bcb97f'

* commit '7ab9c068aac3373fe35a94b01a36d360c2bcb97f':
  libc: fix fstatfs() implementation.
2010-07-08 19:10:52 -07:00
David 'Digit' Turner
ea5adb571e am cb7e8c5e: libc: update alarm() implementation to return 0 on error.
Merge commit 'cb7e8c5ef3f5f60a848e469ed40610c8946fe7ac' into gingerbread-plus-aosp

* commit 'cb7e8c5ef3f5f60a848e469ed40610c8946fe7ac':
  libc: update alarm() implementation to return 0 on error.
2010-07-08 17:24:45 -07:00
David 'Digit' Turner
7ab9c068aa am ab8b5410: libc: fix fstatfs() implementation.
Merge commit 'ab8b54101eed0a4b92ebf8fa6994cd1b4f22d8f4' into gingerbread-plus-aosp

* commit 'ab8b54101eed0a4b92ebf8fa6994cd1b4f22d8f4':
  libc: fix fstatfs() implementation.
2010-07-08 17:22:08 -07:00
David 'Digit' Turner
cb7e8c5ef3 libc: update alarm() implementation to return 0 on error.
This matches the GLibc behaviour, and allows alarm(0xFFFFFFFF) to return 0.

Change-Id: I419aa71b27d6bb2015d15ba6b6112bf62eadcbb8
2010-07-08 17:20:29 -07:00
David 'Digit' Turner
ab8b54101e libc: fix fstatfs() implementation.
The syscall expects the size of the buffer as the second argument.

Change-Id: I99ede2fec7fcd385ca03ff022c2cffa4297bea8d
2010-07-08 16:52:27 -07:00
Bruce Beare
16984423bc Fix missing NL
Change-Id: Ic210fe9f740b9a8235a66d479ad4eddc869998bb
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-08 11:12:36 -07:00
David 'Digit' Turner
8173ee9b38 am 973a83f0: am d466780c: Add missing SMP barriers to libstdc++
Merge commit '973a83f04d63a984be9ea7d4a8f8fea56ebe2133'

* commit '973a83f04d63a984be9ea7d4a8f8fea56ebe2133':
  Add missing SMP barriers to libstdc++
2010-07-07 14:22:28 -07:00
David 'Digit' Turner
973a83f04d am d466780c: Add missing SMP barriers to libstdc++
Merge commit 'd466780c7cedb41edcf13f28ad900556c6aaa5b2' into gingerbread-plus-aosp

* commit 'd466780c7cedb41edcf13f28ad900556c6aaa5b2':
  Add missing SMP barriers to libstdc++
2010-07-07 14:20:35 -07:00
David 'Digit' Turner
d466780c7c Add missing SMP barriers to libstdc++
Change-Id: I20a8dcd2e3316ac60237e800c682cacc8e59e187
2010-07-07 14:18:20 -07:00
David 'Digit' Turner
cf38531741 resolved conflicts for merge of 2576abf0 to master
Change-Id: Ibd3ed11f3cc27ff12c0464b0f56d7057be6a7b85
2010-07-02 15:22:19 -07:00
David 'Digit' Turner
2576abf0ed am 51976326: libc: Fix sem_post() implementation to wake up all waiting threads.
Merge commit '519763265ec0b634bd9c264a0aca034882458ecc' into gingerbread-plus-aosp

* commit '519763265ec0b634bd9c264a0aca034882458ecc':
  libc: Fix sem_post() implementation to wake up all waiting threads.
2010-07-02 15:12:00 -07:00
David 'Digit' Turner
519763265e libc: Fix sem_post() implementation to wake up all waiting threads.
This also allows us to optimize the case where we increment an
uncontended semaphore (no need to call futex_wake() then).

Change-Id: Iad48efe8551dc66dc89d3e3f18c001e5a6c1939f
2010-07-02 15:09:57 -07:00
The Android Open Source Project
cd122865a5 am 424d027b: merge from open-source master
Merge commit '424d027b6e9b2fff2e79b2d65575c00fcf67d915'

* commit '424d027b6e9b2fff2e79b2d65575c00fcf67d915':
  Regenerate linux/netfilter_ipv6/ip6_tables.h.
2010-07-02 11:43:48 -07:00
The Android Open Source Project
8a5705c7fa am d6f31851: merge from open-source master
Merge commit 'd6f3185148933e4bae17e8f6efe7610cd1cf7769'

* commit 'd6f3185148933e4bae17e8f6efe7610cd1cf7769':
  Allow dlclose() to properly call static C++ destructors.
2010-07-02 11:40:56 -07:00
The Android Open Source Project
424d027b6e merge from open-source master
Change-Id: I895b74454b35da7eba6c0f6250fe2ca6c9907f1d
2010-07-02 11:40:01 -07:00
The Android Open Source Project
d6f3185148 merge from open-source master
Change-Id: I6a15428fd9ce1f1dbbb702ff13c6af8da8f54a1e
2010-07-02 11:37:54 -07:00
Jean-Baptiste Queru
6fce15cea1 Merge "Regenerate linux/netfilter_ipv6/ip6_tables.h." 2010-07-02 10:34:04 -07:00
David 'Digit' Turner
3b43f87d29 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
2010-07-01 23:09:28 -07:00
David 'Digit' Turner
4e6043a355 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()
2010-06-29 12:55:34 -07:00
David 'Digit' Turner
7d1d98b97e 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()
2010-06-29 12:53:13 -07:00
David 'Digit' Turner
a02b93bd75 libc: add sanity checks to pthread_mutex_destroy()
Change-Id: Iddb2204fa792fa9aca5f19838926dddbb09b74a2
2010-06-28 14:20:22 -07:00
Wink Saville
68bcaa4a7b Merge "Use a recursive lock for pthread_once." 2010-06-28 12:13:00 -07:00
Wink Saville
ccc3d1eea1 Use a recursive lock for pthread_once.
bug: 2292366
Change-Id: I9fc8b790dcfcb30ca94a0beb340d43fe5cd6c22e
2010-06-28 11:41:16 -07:00
David 'Digit' Turner
06b48d847d 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.
2010-06-28 11:29:50 -07:00
David 'Digit' Turner
4a927712b7 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.
2010-06-28 11:27:32 -07:00
Vilmos Nebehaj
c1a534ba0b Regenerate linux/netfilter_ipv6/ip6_tables.h.
Add ip6t_get_target() to kernel_known_generic_statics in
libc/kernel/tools/defaults.py to be able to build ip6tables.

Change-Id: Iadb885db3faa85b2d0070dc2e0ac493af6e62bb6
2010-06-28 15:13:23 +02:00
David 'Digit' Turner
0621a279ad 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
2010-06-25 16:53:37 -07:00
Nick Pelly
1deef576b3 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.
2010-06-23 18:01:01 -07:00
Nick Pelly
0a79d2135c 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.
2010-06-23 17:58:38 -07:00
Nick Pelly
fa5755ae98 Merge "Add clean headers for 7x30 video codec." into gingerbread 2010-06-23 17:56:38 -07:00
Nick Pelly
21baae3d71 Add clean headers for 7x30 video codec.
Change-Id: Id4faa5bacb03cc42377527e05c53c6392c776e7d
2010-06-23 16:17:58 -07:00
David 'Digit' Turner
cb43ffeb10 am cb0f5ed8: am 50ace4fe: Remove compiler warnings when building Bionic.
Merge commit 'cb0f5ed8111d4305cf6798aefdb4f9623570c83a'

* commit 'cb0f5ed8111d4305cf6798aefdb4f9623570c83a':
  Remove compiler warnings when building Bionic.
2010-06-23 12:41:50 -07:00
David 'Digit' Turner
cb0f5ed811 am 50ace4fe: Remove compiler warnings when building Bionic.
Merge commit '50ace4fec5e8cb5afcbc656a4556fa528adfd760' into gingerbread-plus-aosp

* commit '50ace4fec5e8cb5afcbc656a4556fa528adfd760':
  Remove compiler warnings when building Bionic.
2010-06-23 11:17:07 -07:00
David 'Digit' Turner
55cb28032d 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().
2010-06-23 10:32:05 -07:00
David 'Digit' Turner
50ace4fec5 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
2010-06-22 17:51:41 -07:00
David 'Digit' Turner
e1a739ec38 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().
2010-06-22 11:19:25 -07:00
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