fix Issue 12092 - Wrong TLS access in PIC code (X86_32)

- Use RI_TYPE_TLS_GD (general dynamic) to access global TLS symbols in PIC code.
dlang · Dec 30, 2014 · cadc0f7 · cadc0f7
1 parent 22611aa
commit cadc0f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/backend/el.c b/src/backend/el.c
@@ -1472,11 +1472,7 @@ elem * el_var(symbol *s)
     //printf("el_var(s = '%s')\n", s->Sident);
     //printf("%x\n", s->Stype->Tty);
 #if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
-    // OSX is currently always pic
     if (config.flags3 & CFG3pic &&
-#if TARGET_LINUX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
-        (!(s->Stype->Tty & mTYthread) || I64) &&
-#endif
         !tyfunc(s->ty()))
         // Position Independent Code
         return el_picvar(s);

diff --git a/src/backend/elfobj.c b/src/backend/elfobj.c
@@ -2974,7 +2974,8 @@ int Obj::reftoident(int seg, targ_size_t offset, Symbol *s, targ_size_t val,
                             if (config.flags3 & CFG3pic)
                             {
                                 if (s->Sclass == SCstatic || s->Sclass == SClocstat)
-                                    relinfo = R_X86_64_TLSGD;  // TLS_GD?
+                                    // Could use 'local dynamic (LD)' to optimize multiple local TLS reads
+                                    relinfo = R_X86_64_TLSGD;
                                 else
                                     relinfo = R_X86_64_TLSGD;
                             }
@@ -2991,9 +2992,10 @@ int Obj::reftoident(int seg, targ_size_t offset, Symbol *s, targ_size_t val,
                             if (config.flags3 & CFG3pic)
                             {
                                 if (s->Sclass == SCstatic)
-                                    relinfo = R_386_TLS_LE;  // TLS_GD?
+                                    // Could use 'local dynamic (LD)' to optimize multiple local TLS reads
+                                    relinfo = R_386_TLS_GD;
                                 else
-                                    relinfo = R_386_TLS_IE;
+                                    relinfo = R_386_TLS_GD;
                             }
                             else
                             {