Revert "Add support for thread-local storage variables"

TLS support in tinyCC is absolutely not ready: - segment register not select in load and store - no relocation added for computing offset of per-thread symbol - no support for TLS-specific relocations - no program header added as per Drepper document about TLS This reverts commit 1c4afd13501f07a673aed5f130166f2ee0f30927.

Thomas Preud'homme committed 13 years ago

Commit cf02f921 parent 1c4afd15 files · +14 −54Browse files

Unified · Split

5 files

elf.h +1 −3
libtcc.c +1 −4
tccelf.c +8 −21
tccgen.c +4 −25
tcctok.h +0 −1

elf.h+1−3

 #define STT_SECTION     3               /* Symbol associated with a section */
 #define STT_FILE        4               /* Symbol's name is file name */
 #define STT_NUM         5               /* Number of defined types.  */
-#define STT_TLS         6               /* Symbol is a thread-local data object */
 #define STT_GNU_IFUNC   10              /* Symbol is a indirect code object */
 #define STT_LOOS        11              /* Start of OS-specific */
 #define STT_HIOS        12              /* End of OS-specific */
 #define PT_NOTE         4               /* Auxiliary information */
 #define PT_SHLIB        5               /* Reserved */
 #define PT_PHDR         6               /* Entry for header table itself */
-#define PT_TLS          7               /* Thread-local program segment */
+#define PT_NUM          7               /* Number of defined types.  */
-#define PT_NUM          8               /* Number of defined types.  */
 #define PT_LOOS         0x60000000      /* Start of OS-specific */
 #define PT_HIOS         0x6fffffff      /* End of OS-specific */
 #define PT_LOPROC       0x70000000      /* Start of processor-specific */

libtcc.c+1−4

     } else if ((sym->type.t & VT_BTYPE) == VT_VOID) {
         sym_type = STT_NOTYPE;
     } else {
-        if (section && section->sh_flags & SHF_TLS)
+        sym_type = STT_OBJECT;
-            sym_type = STT_TLS;
-        else
-            sym_type = STT_OBJECT;
     }
     if (sym->type.t & VT_STATIC)

tccelf.c+8−21

     int fd, mode, ret;
     int *section_order;
     int shnum, i, phnum, file_offset, offset, size, j, sh_order_index, k;
-    int have_tls_section = 0;
     long long tmp;
     addr_t addr;
     Section *strsec, *s;
             /* we output all sections if debug or object file */
             s->sh_size = s->data_offset;
         }
-        /* if tls section we'll need to add one segment */
-        if (s->sh_flags & SHF_TLS) {
-          have_tls_section = 1;
-          phnum++;
-        }
     }
     /* allocate program segment headers */
         if (interp)
             ph += 1 + HAVE_PHDR;
-        for(j = 0; j < 2 + have_tls_section; j++) {
+        for(j = 0; j < 2; j++) {
-            if (j != 2)
+            ph->p_type = PT_LOAD;
-                ph->p_type = PT_LOAD;
-            else
-                ph->p_type = PT_TLS;
-            ph->p_flags = PF_R;
             if (j == 0)
-                ph->p_flags |= PF_X;
+                ph->p_flags = PF_R | PF_X;
-            else if (j == 1)
+            else
-                ph->p_flags |= PF_W;
+                ph->p_flags = PF_R | PF_W;
             ph->p_align = s1->section_align;
             /* we do the following ordering: interp, symbol tables,
                     s = s1->sections[i];
                     /* compute if section should be included */
                     if (j == 0) {
-                        if ((s->sh_flags & (SHF_ALLOC | SHF_WRITE | SHF_TLS)) !=
+                        if ((s->sh_flags & (SHF_ALLOC | SHF_WRITE)) !=
                             SHF_ALLOC)
                             continue;
-                    } else if (j == 1) {
-                        if ((s->sh_flags & (SHF_ALLOC | SHF_WRITE | SHF_TLS)) !=
-                            (SHF_ALLOC | SHF_WRITE))
-                            continue;
                     } else {
-                        if ((s->sh_flags & SHF_TLS) != SHF_TLS)
+                        if ((s->sh_flags & (SHF_ALLOC | SHF_WRITE)) !=
+                            (SHF_ALLOC | SHF_WRITE))
                             continue;
                     }
                     if (s == interp) {

tccgen.c+4−25

 ST_DATA int rsym, anon_sym, ind, loc;
 ST_DATA Section *text_section, *data_section, *bss_section; /* predefined sections */
-ST_DATA Section *tdata_section, *tbss_section; /* thread-local storage sections */
 ST_DATA Section *cur_text_section; /* current section where function code is generated */
 #ifdef CONFIG_TCC_ASM
 ST_DATA Section *last_text_section; /* to handle .previous asm directive */
             t |= VT_INLINE;
             next();
             break;
-        case TOK_THREAD:
-            t |= VT_TLS;
-            next();
-            break;
             /* GNUC attribute */
         case TOK_ATTRIBUTE1:
         /* allocate symbol in corresponding section */
         sec = ad->section;
         if (!sec) {
-            if (has_init) {
+            if (has_init)
-                if (type->t & VT_TLS) {
+                sec = data_section;
-                    if (!tdata_section)
+            else if (tcc_state->nocommon)
-                        tdata_section = new_section(tcc_state, ".tdata",
+                sec = bss_section;
-                                               SHT_PROGBITS,
-                                               SHF_ALLOC | SHF_WRITE | SHF_TLS);
-                    sec = tdata_section;
-		} else
-                    sec = data_section;
-            }
-            else if (tcc_state->nocommon) {
-                if (type->t & VT_TLS) {
-                    if (!tbss_section)
-                        tbss_section = new_section(tcc_state, ".tbss",
-                                               SHT_NOBITS,
-                                               SHF_ALLOC | SHF_WRITE | SHF_TLS);
-                    sec = tbss_section;
-                } else
-                    sec = bss_section;
-            }
         }
         if (sec) {
             data_offset = sec->data_offset;

tcctok.h+0−1

@@ -10,7 +10,6 @@ · 9 unmodified lines
10	DEF(TOK_FOR, "for")	10	DEF(TOK_FOR, "for")
11	DEF(TOK_EXTERN, "extern")	11	DEF(TOK_EXTERN, "extern")
12	DEF(TOK_STATIC, "static")	12	DEF(TOK_STATIC, "static")
13	DEF(TOK_THREAD, "__thread")
14	DEF(TOK_UNSIGNED, "unsigned")	13	DEF(TOK_UNSIGNED, "unsigned")
15	DEF(TOK_GOTO, "goto")	14	DEF(TOK_GOTO, "goto")
16	DEF(TOK_DO, "do")	15	DEF(TOK_DO, "do")

Revert "Add support for thread-local storage variables"

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code