about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/src/__set_thread_area.c3
-rw-r--r--arch/arm/src/arm/atomics.s8
-rw-r--r--src/thread/arm/tls.s4
3 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/src/__set_thread_area.c b/arch/arm/src/__set_thread_area.c
index 680510ea..61d02827 100644
--- a/arch/arm/src/__set_thread_area.c
+++ b/arch/arm/src/__set_thread_area.c
@@ -9,7 +9,7 @@ extern const unsigned char __attribute__((__visibility__("hidden")))
 	__a_barrier_dummy[], __a_barrier_oldkuser[],
 	__a_barrier_v6[], __a_barrier_v7[],
 	__a_cas_dummy[], __a_cas_v6[], __a_cas_v7[],
-	__a_gettp_dummy[], __a_gettp_native[];
+	__a_gettp_dummy[];
 
 #define __a_barrier_kuser 0xffff0fa0
 #define __a_cas_kuser 0xffff0fc0
@@ -26,7 +26,6 @@ int __set_thread_area(void *p)
 #if !__ARM_ARCH_7A__ && !__ARM_ARCH_7R__ && __ARM_ARCH < 7
 	if (__hwcap & HWCAP_TLS) {
 		size_t *aux;
-		SET(gettp, native);
 		SET(cas, v7);
 		SET(barrier, v7);
 		for (aux=libc.auxv; *aux; aux+=2) {
diff --git a/arch/arm/src/arm/atomics.s b/arch/arm/src/arm/atomics.s
index 9fcc7bd7..f241cc02 100644
--- a/arch/arm/src/arm/atomics.s
+++ b/arch/arm/src/arm/atomics.s
@@ -81,6 +81,10 @@ __a_cas_v7:
 	.word 0xf57ff05b        /* dmb ish */
 	bx lr
 
+.global __aeabi_read_tp
+.type __aeabi_read_tp,%function
+__aeabi_read_tp:
+
 .global __a_gettp
 .hidden __a_gettp
 .type __a_gettp,%function
@@ -92,10 +96,6 @@ __a_gettp:
 .global __a_gettp_dummy
 .hidden __a_gettp_dummy
 __a_gettp_dummy:
-	.word 0xe7fddef1
-.global __a_gettp_native
-.hidden __a_gettp_native
-__a_gettp_native:
 	mrc p15,0,r0,c13,c0,3
 	bx lr
 
diff --git a/src/thread/arm/tls.s b/src/thread/arm/tls.s
deleted file mode 100644
index 59736ac2..00000000
--- a/src/thread/arm/tls.s
+++ /dev/null
@@ -1,4 +0,0 @@
-.global __aeabi_read_tp
-.type __aeabi_read_tp,%function
-__aeabi_read_tp:
-	ldr pc,=0xffff0fe0