about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard Henderson <rth@redhat.com>2014-05-20 16:17:20 -0400
committerRichard Henderson <rth@redhat.com>2014-05-29 12:39:03 -0400
commita17e5ffb80a17449add001ff7901e317afa6f632 (patch)
treef348aa50e000c1392863dc495b7a6a7a08f8f6f0
parentb5be4597716eff94149f5529c8eb2cd3b4296188 (diff)
downloadglibc-a17e5ffb80a17449add001ff7901e317afa6f632.tar.gz
glibc-a17e5ffb80a17449add001ff7901e317afa6f632.tar.xz
glibc-a17e5ffb80a17449add001ff7901e317afa6f632.zip
aarch64: Use tpidr_el0 rather than __read_tp in librt
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h14
2 files changed, 7 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 26812de5f1..5b9b820b45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-05-29  Richard Henderson  <rth@twiddle.net>
 
+	* sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
+	[!NOT_IN_libc] (SINGLE_THREAD_P): Use tpidr_el0 instead of a
+	call to __read_tp.
+
 	* sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h (PSEUDO):
 	Always allocate 64 bytes of stack frame.  Use ldp/stp to create
 	it and break it down.
diff --git a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
index 0f5bb514e3..546ed7b55c 100644
--- a/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
@@ -113,17 +113,9 @@ extern int __local_multiple_threads attribute_hidden;
 				   header.multiple_threads) == 0, 1)
 #  else
 #   define SINGLE_THREAD_P(R)						\
-	stp	x0, x30, [sp, -16]!;					\
-	cfi_adjust_cfa_offset (16);					\
-	cfi_rel_offset (x0, 0);						\
-	cfi_rel_offset (x30, 8);					\
-	bl	__read_tp;						\
-	sub	x0, x0, PTHREAD_SIZEOF;					\
-	ldr	w##R, [x0, PTHREAD_MULTIPLE_THREADS_OFFSET];		\
-	ldp	x0, x30, [sp], 16;					\
-	cfi_restore (x0);						\
-	cfi_restore (x30);						\
-	cfi_adjust_cfa_offset (-16)
+	mrs     x##R, tpidr_el0;					\
+	sub	x##R, x##R, PTHREAD_SIZEOF;				\
+	ldr	w##R, [x##R, PTHREAD_MULTIPLE_THREADS_OFFSET]
 #  endif
 # endif