merge from eclair

diff --cc libc/Android.mk
Simple merge

diff --cc libc/arch-arm/bionic/atomics_arm.S
Simple merge

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

diff --cc libc/private/bionic_tls.h
index 742ef8c,2e7a82b..2412577
--- 1/libc/private/bionic_tls.h
--- 2/libc/private/bionic_tls.h
+++ b/libc/private/bionic_tls.h
@@@ -87,10 -87,19 +87,20 @@@ extern void __init_tls(void**  tls, voi
  extern int __set_tls(void *ptr);
  
  /* get the TLS */
- /* Linux kernel helpers for its TLS implementation */
  #ifdef __arm__
- typedef void* (__kernel_get_tls_t)(void);
- #define __get_tls (*(__kernel_get_tls_t *)0xffff0fe0)
++/* Linux kernel helpers for its TLS implementation */
+ /* For performance reasons, avoid calling the kernel helper
+  * Note that HAVE_ARM_TLS_REGISTER is build-specific
+  * (it must match your kernel configuration)
+  */
+ #  ifdef HAVE_ARM_TLS_REGISTER
+ #    define __get_tls() \
+     ({ register unsigned int __val asm("r0"); \
+        asm ("mrc p15, 0, r0, c13, c0, 3" : "=r"(__val) ); \
+        (volatile void*)__val; })
+ #  else /* !HAVE_ARM_TLS_REGISTER */
+ #    define __get_tls() ( *((volatile void **) 0xffff0ff0) )
+ #  endif
  #else
  extern void*  __get_tls( void );
  #endif

diff --cc linker/dlfcn.c
Simple merge

diff --cc linker/linker.c
Simple merge

diff --cc linker/linker.h
Simple merge