resolved conflicts for merge of 4f086aeb to gingerbread-plus-aosp

Change-Id: Ice2a6d41a7e9d04eca02e15ed189d648d61b5801

diff --cc libc/Android.mk
index f54278a,568cc94..a40998d
--- 1/libc/Android.mk
--- 2/libc/Android.mk
+++ b/libc/Android.mk
@@@ -353,7 -324,7 +353,8 @@@ libc_common_src_files += 
  # up any thumb code.
  libc_common_src_files += \
        bionic/pthread.c.arm \
+       bionic/pthread-atfork.c.arm \
 +      bionic/pthread-rwlocks.c.arm \
        bionic/pthread-timers.c.arm \
        bionic/ptrace.c.arm
  
@@@ -388,7 -359,7 +389,8 @@@ libc_common_src_files += 
        arch-x86/string/strncmp_wrapper.S \
        arch-x86/string/strlen.S \
        bionic/pthread.c \
+       bionic/pthread-atfork.c \
 +      bionic/pthread-rwlocks.c \
        bionic/pthread-timers.c \
        bionic/ptrace.c
  
@@@ -425,7 -396,7 +427,8 @@@ libc_common_src_files += 
        string/memcmp.c \
        string/strlen.c \
        bionic/pthread.c \
+       bionic/pthread-atfork.c \
 +      bionic/pthread-rwlocks.c \
        bionic/pthread-timers.c \
        bionic/ptrace.c \
        unistd/socketcalls.c

diff --cc libc/bionic/fork.c
Simple merge

diff --cc libc/docs/CHANGES.TXT
index 96f25d3,b0725ed..b13d8f7
--- 1/libc/docs/CHANGES.TXT
--- 2/libc/docs/CHANGES.TXT
+++ b/libc/docs/CHANGES.TXT
@@@ -3,78 -3,11 +3,80 @@@ Bionic ChangeLog
  
  Differences between current and Android 2.2:
  
 +- <pthread.h>: Add reader/writer locks implementation. Add sanity
 +  checking to pthread_mutex_destroy() (e.g. a locked mutex will return
 +  EBUSY).
 +
 +- <semaphore.h>: Use private futexes for semaphore implementation,
 +  unless your set 'pshared' to non-0 when calling sem_init().
 +
 +  Also fixed a bug in sem_post() to make it wake up all waiting
 +  threads, instead of one. As a consequence, the maximum semaphore
 +  value is now reduced to 0x3fffffff.
 +
 +- <math.h>: Added sincos(), sincosf() and sincosl() (GLibc compatibility).
 +
 +- <sys/sysinfo.h>: Added missing sysinfo() system call implementation
 +  (the function was already declared in the header though).
 +
 +- sysconf() didn't work for some arguments due to a small bug in the
 +  /proc line parser.
 +
 +- <termio.h>: added missing header (just includes <termios.h>)
 +
 +- <unistd.h>: add missing declaration for truncate(). The implementation
 +  was already here since Android 1.5.
 +
 +  modify implementation of alarm() to return 0 in case of error (i.e.
 +  if a value larger than 0x7fffffff seconds is passed to it). This
 +  makes the implementation compliant with the GLibc behaviour.
 +
 +- <wchar.h>: small fixes to really support wchar_t in Bionic (not there yet).
 +
 +     the size of wchar_t is still 32-bit (decided by the compiler)
 +
 +     WCHAR_MIN: changed from 0 to INT_MIN
 +     WCHAR_MAX: changed from 255 to INT_MAX
 +
 +     wcpcpy(), wcpncpy(), wcscat(), wcschr(), wcscmp(),
 +     wcscpy(), wcscspn(), wcsdup(), wcslcat(), wcslcpy(),
 +     wcslen(), wcsncat(), wcsncmp(), wcsncpy(), wcsnlen(),
 +     wcspbrk(), wcsrchr(), wcsrchr(), wcsspn(), wcsstr(),
 +     wcstok(), wcswidth(), wmemchr(), wmemcmp(), wmemcpy(),
 +     wmemmove(), wmemset(): Added proper implementations.
 +
 +     wcscasecmp(), wcsncasecmp(): Added implementation limited
 +     to ASCII codes for lower/upper.
 +
 +     wcscoll(): added dummy implementation that calls wcscmp()
 +     wcsxfrm(): added dummy implementation that calls wcsncpy()
 +
 +  NOTE: Technically, this breaks the ABI, but we never claimed to support
 +        wchar_t anyway. The wchar_t support is still *NOT* official at this
 +        point. We need better multi-byte support code, and wprintf/wscanf
 +        stuff too.
 +
 +- <inttypes.h>: add missing declarations for strntoimax abd strntoumax.
 +
 +- <stdlib.h>: add missing declarations for drand48() and erand48().
 +
 +- clearerr(): fix broken implementation.
 +
 +- Feature test macros like _POSIX_C_SOURCE / _XOPEN_SOURCE / _C99_SOURCE
 +  are now handled correctly by our C library headers (see <sys/cdefs.h>)
 +
 +- <sys/select.h>: add missing declaration for pselect()
 +
 +- <sys/vfs.h>: fixed implementation of fstatfs() (also fixes fpathconf()
 +  which uses it).
 +
+ - Added an implementation of pthread_atfork()
+ 
  
  -------------------------------------------------------------------------------
 -Differences between Android 2.2 and Android 2.1:
 +Differences between Android 2.2. and Android 2.1:
 +
 +- Support FP register save/load in setjmp()/longjmp() on ARMv7 builds.
  
  - Add support for SH-4 CPU architecture !
  

diff --cc libc/include/pthread.h
Simple merge