Everyone has a TLS register.
Change-Id: Id7cdf67087aa7d5074c9c59b7e595bc391d9f146
diff --git a/libc/Android.mk b/libc/Android.mk
index 9e6f4dd..606fda2 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -270,6 +270,7 @@
bionic/brk.cpp \
bionic/debug_format.cpp \
bionic/dirent.cpp \
+ bionic/__errno.c \
bionic/eventfd.cpp \
bionic/__fgets_chk.cpp \
bionic/getauxval.cpp \
@@ -299,6 +300,7 @@
bionic/__strncpy_chk.cpp \
bionic/strsignal.cpp \
bionic/stubs.cpp \
+ bionic/sysconf.cpp \
bionic/tdestroy.cpp \
bionic/tmpfile.cpp \
bionic/__umask_chk.cpp \
@@ -349,23 +351,6 @@
upstream-netbsd/libc/string/strxfrm.c \
upstream-netbsd/libc/unistd/killpg.c \
-# The following files are common, but must be compiled
-# with different C flags when building a static C library.
-#
-# The reason for this is the implementation of __get_tls()
-# that will differ between the shared and static versions
-# of the library.
-#
-# See comments in private/bionic_tls.h for more details.
-#
-# NOTE: bionic/pthread.c is added later to this list
-# because it needs special handling on ARM, see
-# below.
-#
-libc_static_common_src_files := \
- bionic/__errno.c \
- bionic/sysconf.cpp \
-
# Architecture specific source files go here
# =========================================================
ifeq ($(TARGET_ARCH),arm)
@@ -545,18 +530,8 @@
libc_common_cflags += -fstrict-aliasing
libc_crt_target_cflags := -mthumb-interwork
#
- # Define HAVE_ARM_TLS_REGISTER macro to indicate to the C library
- # that it should access the hardware TLS register directly in
- # private/bionic_tls.h
- #
- # The value must match your kernel configuration
- #
- ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
- libc_common_cflags += -DHAVE_ARM_TLS_REGISTER
- endif
- #
- # Define HAVE_32_BYTE_CACHE_LINES to indicate to C
- # library it should use to 32-byte version of memcpy, and not
+ # Define HAVE_32_BYTE_CACHE_LINES to indicate to the C library
+ # that it should use the 32-byte version of memcpy, not
# the 64-byte version.
#
ifeq ($(ARCH_ARM_HAVE_32_BYTE_CACHE_LINES),true)
@@ -822,10 +797,10 @@
# ========================================================
#
# This is a version of the static C library that does not
-# include malloc. It's useful in situations when calling
-# the user wants to provide their own malloc implementation,
-# or wants to explicitly disallow the use of the use of malloc,
-# like the dynamic loader.
+# include malloc. It's useful in situations when the user wants
+# to provide their own malloc implementation, or wants to
+# explicitly disallow the use of the use of malloc,
+# such as in the dynamic loader.
include $(CLEAR_VARS)