commit d0d0b52da375bfa85947a4257198791f615f18a8
author Elliott Hughes <enh@google.com> Wed Oct 30 21:37:56 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 30 21:37:56 2013 +0000
tree 80ccee6c52b1aabfabefdfdf0f118309113decd2
parent 47a73363fcdb88811eedbe484720fb08dc30a995
parent b5b97f20a8225e6aad593b2d8f8eb6c0ac34cefe

Merge "Remove an obsolete ARM gdb hack."

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index df9805a..116e08f 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -414,23 +414,6 @@
     upstream-netbsd/libc/string/strxfrm.c \
     upstream-netbsd/libc/unistd/killpg.c \
 
-# These files need to be arm so that gdbserver
-# can set breakpoints in them without messing
-# up any thumb code.
-# TODO: is this actually necessary?
-ifeq ($(TARGET_ARCH),arm)
-libc_common_src_files += \
-    bionic/pthread-atfork.c.arm \
-    bionic/pthread-rwlocks.c.arm \
-    bionic/pthread-timers.c.arm \
-    bionic/ptrace.c.arm \
-
-libc_static_common_src_files += \
-    bionic/pthread.c.arm \
-    bionic/pthread_create.cpp.arm \
-    bionic/pthread_key.cpp.arm \
-
-else
 libc_common_src_files += \
     bionic/pthread-atfork.c \
     bionic/pthread-rwlocks.c \
@@ -442,9 +425,6 @@
     bionic/pthread_create.cpp \
     bionic/pthread_key.cpp \
 
-endif # arm
-
-
 # Architecture specific source files go here
 # =========================================================
 ifeq ($(TARGET_ARCH),arm)