2 files changed, 24 insertions, 0 deletions

diff --git a/libtcc.c b/libtcc.c
index 9a04a9e..40b845e 100644
--- a/libtcc.c
+++ b/libtcc.c
@@ -1074,6 +1074,7 @@ static Sym *sym_push2(Sym **ps, int v, int t, long c)
     s = sym_malloc();
     s->v = v;
     s->type.t = t;
+    s->type.ref = NULL;
 #ifdef _WIN64
     s->d = NULL;
 #endif
diff --git a/tccpe.c b/tccpe.c
index 9b6c524..41de3f6 100644
--- a/tccpe.c
+++ b/tccpe.c
@@ -1185,6 +1185,21 @@ ST_FN void pe_relocate_rva (struct pe_info *pe, Section *s)
 }
 
 /*----------------------------------------------------------------------------*/
+static int pe_isafunc(int sym_index)
+{
+    Section *sr = text_section->reloc;
+    ElfW_Rel *rel, *rel_end;
+    Elf32_Word info = ELF32_R_INFO(sym_index, R_386_PC32);
+    if (!sr)
+        return 0;
+    rel_end = (ElfW_Rel *)(sr->data + sr->data_offset);
+    for (rel = (ElfW_Rel *)sr->data; rel < rel_end; rel++)
+        if (rel->r_info == info)
+            return 1;
+    return 0;
+}
+
+/*----------------------------------------------------------------------------*/
 ST_FN int pe_check_symbols(struct pe_info *pe)
 {
     ElfW(Sym) *sym;
@@ -1210,6 +1225,14 @@ ST_FN int pe_check_symbols(struct pe_info *pe)
             if (!is)
                 goto not_found;
 
+            if (type == STT_NOTYPE) {
+                /* symbols from assembler have no type, find out which */
+                if (pe_isafunc(sym_index))
+                    type = STT_FUNC;
+                else
+                    type = STT_OBJECT;
+            }
+
             if (type == STT_FUNC) {
                 unsigned long offset = is->thk_offset;
                 if (offset) {