[Commits] r25523 - in /fsf/glibc-2_19-branch/libc/ports: ChangeLog.aarch64 sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu May 22 00:02:04 2014
New Revision: 25523

Log:
Import glibc-2.19 for 2014-05-22

Modified:
    fsf/glibc-2_19-branch/libc/ports/ChangeLog.aarch64
    fsf/glibc-2_19-branch/libc/ports/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h

Modified: fsf/glibc-2_19-branch/libc/ports/ChangeLog.aarch64
==============================================================================
--- fsf/glibc-2_19-branch/libc/ports/ChangeLog.aarch64 (original)
+++ fsf/glibc-2_19-branch/libc/ports/ChangeLog.aarch64 Thu May 22 00:02:04 2014
@@ -1,3 +1,9 @@
+2014-05-21  Richard Henderson  <rth@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
+	(SINGLE_THREAD_P): Use the correct width load.  Fold an add
+	into the ldr offset.
+
 2014-01-22  Marcus Shawcroft  <marcus.shawcroft@xxxxxxx>
 
 	* sysdeps/aarch64/libm-test-ulps: Regenerated.

Modified: fsf/glibc-2_19-branch/libc/ports/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h
==============================================================================
--- fsf/glibc-2_19-branch/libc/ports/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h (original)
+++ fsf/glibc-2_19-branch/libc/ports/sysdeps/unix/sysv/linux/aarch64/nptl/sysdep-cancel.h Thu May 22 00:02:04 2014
@@ -162,9 +162,8 @@
 #  else
 #   define SINGLE_THREAD_P						\
   adrp	x16, __local_multiple_threads;					\
-  add	x16, x16, #:lo12:__local_multiple_threads;			\
-  ldr	x16, [x16];							\
-  cmp	x16, 0;
+  ldr	w16, [x16, :lo12:__local_multiple_threads];			\
+  cmp	w16, 0;
 #  endif
 # else
 /*  There is no __local_multiple_threads for librt, so use the TCB.  */
@@ -180,12 +179,12 @@
   cfi_rel_offset (x30, 8);						\
   bl	__read_tp;							\
   sub	x0, x0, PTHREAD_SIZEOF;						\
-  ldr	x16, [x0, PTHREAD_MULTIPLE_THREADS_OFFSET];			\
+  ldr	w16, [x0, PTHREAD_MULTIPLE_THREADS_OFFSET];			\
   ldp	x0, x30, [sp], 16;						\
   cfi_restore (x0);							\
   cfi_restore (x30);							\
   cfi_adjust_cfa_offset (-16);						\
-  cmp	x16, 0
+  cmp	w16, 0
 #   define SINGLE_THREAD_P_PIC(x) SINGLE_THREAD_P
 #  endif
 # endif

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits