aarch64: Use PTR_REG macro to fix ILP32 bug and make code consistent

	* sysdeps/aarch64/dl-tlsdesc.S (_dl_tlsdesc_dynamic):
	Use PTR_REG macro in cmp instruction.

diff --git a/ChangeLog b/ChangeLog
index 1890507a018e9a56e1b0f45aa386b559bafd89cf..43c8880a76d22e52486714a4bcc23288f0030876 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-22  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+           Steve Ellcey  <sellcey@cavium.com>
+
+       * sysdeps/aarch64/dl-tlsdesc.S (_dl_tlsdesc_dynamic):
+       Use PTR_REG macro in cmp instruction.
+
 2017-08-22  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 
        * include/libc-symbols.h: [!defined HAVE_GCC_IFUNC] (__ifunc):

diff --git a/sysdeps/aarch64/dl-tlsdesc.S b/sysdeps/aarch64/dl-tlsdesc.S
index a70cfd513c8f7553041c3ee615133c5ef57f885d..3b2da62f39c6e7155d4fcda508b45af332656062 100644 (file)
--- a/sysdeps/aarch64/dl-tlsdesc.S
+++ b/sysdeps/aarch64/dl-tlsdesc.S
@@ -208,7 +208,7 @@ _dl_tlsdesc_dynamic:
        ldr     PTR_REG (2), [x1,#TLSDESC_MODID]
        add     PTR_REG (0), PTR_REG (0), PTR_REG (2), lsl #(PTR_LOG_SIZE + 1)
        ldr     PTR_REG (0), [x0] /* Load val member of DTV entry.  */
-       cmp     x0, #TLS_DTV_UNALLOCATED
+       cmp     PTR_REG (0), #TLS_DTV_UNALLOCATED
        b.eq    2f
        ldr     PTR_REG (1), [x1,#TLSDESC_MODOFF]
        add     PTR_REG (0), PTR_REG (0), PTR_REG (1)