Add .cantunwind to _dl_start_user

[platform/upstream/glibc.git] / elf / tls-macros.h

diff --git a/elf/tls-macros.h b/elf/tls-macros.h
index 35b57d4..e25e33b 100644 (file)
--- a/elf/tls-macros.h
+++ b/elf/tls-macros.h
@@ -9,92 +9,17 @@
 #define VAR_INT_DEF(x) \
   asm (".section .tdata\n\t"                                                 \
        ".globl " #x "\n"                                                     \
+       ".balign 4\n"                                                         \
        #x ":\t.long 0\n\t"                                                   \
        ".size " #x ",4\n\t"                                                  \
        ".previous")
 /* XXX Until we get compiler support we don't need declarations.  */
 #define VAR_INT_DECL(x)
 
+#include_next <tls-macros.h>
 
   /* XXX Each architecture must have its own asm for now.  */
-#ifdef __i386__
-# define TLS_LE(x) \
-  ({ int *__l;                                                               \
-     asm ("movl %%gs:0,%0\n\t"                                               \
-         "subl $" #x "@tpoff,%0"                                             \
-         : "=r" (__l));                                                      \
-     __l; })
-
-# ifdef PIC
-#  define TLS_IE(x) \
-  ({ int *__l;                                                               \
-     asm ("movl %%gs:0,%0\n\t"                                               \
-         "subl " #x "@gottpoff(%%ebx),%0"                                    \
-         : "=r" (__l));                                                      \
-     __l; })
-# else
-#  define TLS_IE(x) \
-  ({ int *__l, __b;                                                          \
-     asm ("call 1f\n\t"                                                              \
-         ".subsection 1\n"                                                   \
-         "1:\tmovl (%%esp), %%ebx\n\t"                                       \
-         "ret\n\t"                                                           \
-         ".previous\n\t"                                                     \
-         "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t"                            \
-         "movl %%gs:0,%0\n\t"                                                \
-         "subl " #x "@gottpoff(%%ebx),%0"                                    \
-         : "=r" (__l), "=&b" (__b));                                         \
-     __l; })
-# endif
-
-# ifdef PIC
-#  define TLS_LD(x) \
-  ({ int *__l;                                                               \
-     asm ("leal " #x "@tlsldm(%%ebx),%%eax\n\t"                                      \
-         "call ___tls_get_addr@plt\n\t"                                      \
-         "leal " #x "@dtpoff(%%eax), %%eax"                                  \
-         : "=a" (__l));                                                      \
-     __l; })
-# else
-#  define TLS_LD(x) \
-  ({ int *__l, __b;                                                          \
-     asm ("call 1f\n\t"                                                              \
-         ".subsection 1\n"                                                   \
-         "1:\tmovl (%%esp), %%ebx\n\t"                                       \
-         "ret\n\t"                                                           \
-         ".previous\n\t"                                                     \
-         "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t"                            \
-         "leal " #x "@tlsldm(%%ebx),%%eax\n\t"                               \
-         "call ___tls_get_addr@plt\n\t"                                      \
-         "leal " #x "@dtpoff(%%eax), %%eax"                                  \
-         : "=a" (__l), "=&b" (__b));                                         \
-     __l; })
-# endif
-
-# ifdef PIC
-#  define TLS_GD(x) \
-  ({ int *__l;                                                               \
-     asm ("leal " #x "@tlsgd(%%ebx),%%eax\n\t"                               \
-         "call ___tls_get_addr@plt\n\t"                                      \
-         "nop"                                                               \
-         : "=a" (__l));                                                      \
-     __l; })
-# else
-#  define TLS_GD(x) \
-  ({ int *__l, __b;                                                          \
-     asm ("call 1f\n\t"                                                              \
-         ".subsection 1\n"                                                   \
-         "1:\tmovl (%%esp), %%ebx\n\t"                                       \
-         "ret\n\t"                                                           \
-         ".previous\n\t"                                                     \
-         "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t"                            \
-         "leal " #x "@tlsgd(%%ebx),%%eax\n\t"                                \
-         "call ___tls_get_addr@plt\n\t"                                      \
-         "nop"                                                               \
-         : "=a" (__l), "=&b" (__b));                                         \
-     __l; })
-# endif
-
-#else
+#if !defined TLS_LE || !defined TLS_IE \
+      || !defined TLS_LD || !defined TLS_GD
 # error "No support for this architecture so far."
 #endif