factor out symbol weakening into new function

Joe Soroka committed 15 years ago

Commit 8bcb2ae1 parent 0f0c2d91 file · +17 −10Browse files

Unified · Split

     *ptop = b;
 }
+static void weaken_symbol(Sym *sym)
+{
+    sym->type.t |= VT_WEAK;
+    if (sym->c > 0) {
+        int esym_type;
+        ElfW(Sym) *esym;
+        esym = &((ElfW(Sym) *)symtab_section->data)[sym->c];
+        esym_type = ELFW(ST_TYPE)(esym->st_info);
+        esym->st_info = ELFW(ST_INFO)(STB_WEAK, esym_type);
+    }
+}
 /* ------------------------------------------------------------------------- */
 ST_FUNC void swap(int *p, int *q)
             vtop->sym = sym;
         }
         /* patch symbol weakness */
-        if (type->t & VT_WEAK) {
+        if (type->t & VT_WEAK)
-            unsigned char *st_info =
+            weaken_symbol(sym);
-                &((ElfW(Sym) *)symtab_section->data)[sym->c].st_info;
-            *st_info = ELF32_ST_INFO(STB_WEAK, ELF32_ST_TYPE(*st_info));
-        }
 #ifdef CONFIG_TCC_BCHECK
         /* handles bounds now because the symbol must be defined
            before for the relocation */
     ((ElfW(Sym) *)symtab_section->data)[sym->c].st_size =
         ind - func_ind;
     /* patch symbol weakness (this definition overrules any prototype) */
-    if (sym->type.t & VT_WEAK) {
+    if (sym->type.t & VT_WEAK)
-        unsigned char *st_info =
+        weaken_symbol(sym);
-            &((ElfW(Sym) *)symtab_section->data)[sym->c].st_info;
-        *st_info = ELF32_ST_INFO(STB_WEAK, ELF32_ST_TYPE(*st_info));
-    }
     if (tcc_state->do_debug) {
         put_stabn(N_FUN, 0, 0, ind - func_ind);
     }

Keyboard shortcuts