From 8340ffd2997feaca9074e0272e3c4663793baf77 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Dec 2015 23:51:12 +0100 Subject: test/tls: tls-macros*.h fixes from glibc glibc commits 4822a2a520 Add x32 support to TLS_LE/TLS_IE/TLS_GD 63fb881a04 tls-macros-mips.h: Load $gp as required. Merge 32-bit and 64-bit versions. Signed-off-by: Leonid Lisovskiy Signed-off-by: Waldemar Brodkorb --- test/tls/tls-macros.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'test/tls/tls-macros.h') diff --git a/test/tls/tls-macros.h b/test/tls/tls-macros.h index d2437431c..e4d87f26d 100644 --- a/test/tls/tls-macros.h +++ b/test/tls/tls-macros.h @@ -111,15 +111,15 @@ # define TLS_LE(x) \ ({ int *__l; \ - __asm__ ("movq %%fs:0,%0\n\t" \ - "leaq " #x "@tpoff(%0), %0" \ + __asm__ ("mov %%fs:0,%0\n\t" \ + "lea " #x "@tpoff(%0), %0" \ : "=r" (__l)); \ __l; }) # define TLS_IE(x) \ ({ int *__l; \ - __asm__ ("movq %%fs:0,%0\n\t" \ - "addq " #x "@gottpoff(%%rip),%0" \ + __asm__ ("mov %%fs:0,%0\n\t" \ + "add " #x "@gottpoff(%%rip),%0" \ : "=r" (__l)); \ __l; }) @@ -132,9 +132,15 @@ : : "rdi", "rsi", "r8", "r9", "r10", "r11"); \ __l; }) +# ifdef __ILP32__ +# define TLS_GD_PREFIX +# else +# define TLS_GD_PREFIX ".byte 0x66\n\t" +# endif + # define TLS_GD(x) \ ({ int *__l, __c, __d; \ - __asm__ (".byte 0x66\n\t" \ + __asm__ (TLS_GD_PREFIX \ "leaq " #x "@tlsgd(%%rip),%%rdi\n\t" \ ".word 0x6666\n\t" \ "rex64\n\t" \ -- cgit v1.2.3