sigrid/tinycc

Makefile+0−3

 ifdef CONFIG_CROSS
 	mkdir -p "$(tccdir)/lib/32"
 	mkdir -p "$(tccdir)/lib/64"
-ifeq ($(ARCH),x86-64)
 	-$(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/lib/32"
-else
 	-$(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/lib/64"
 endif
-endif
 uninstall:
 	rm -rfv "$(tccdir)/*"

configure+3−9

   ;;
   --enable-cygwin) mingw32="yes" ; cygwin="yes" ; cross_prefix="mingw32-" ; cpu=x86
   ;;
-  --enable-cygwin64) mingw32="yes" ; cygwin="yes" ; cross_prefix="x86_64-w64-mingw32-" ; cpu="x86-64"
-  ;;
   --enable-cross) build_cross="yes"
   ;;
   --disable-static) disable_static="yes"
   echo "CONFIG_NOLDL=yes" >> config.mak
 fi
 if test "$mingw32" = "yes" ; then
-  if test "$cpu" = "x86-64" ; then
+  echo "CONFIG_WIN32=yes" >> config.mak
-    echo "CONFIG_WIN64=yes" >> config.mak
+  echo "#define CONFIG_WIN32 1" >> $TMPH
-    echo "#define CONFIG_WIN64 1" >> $TMPH
-  else
-    echo "CONFIG_WIN32=yes" >> config.mak
-    echo "#define CONFIG_WIN32 1" >> $TMPH
-  fi
 fi
 if test "$cygwin" = "yes" ; then
   echo "#ifndef _WIN32" >> $TMPH
   echo "#define _WIN32" >> $TMPH
   echo "#endif" >> $TMPH
+  echo "AR=ar" >> config.mak
 fi
 if test "$bigendian" = "yes" ; then
   echo "WORDS_BIGENDIAN=yes" >> config.mak

libtcc.c+5−4

@@ -425,7 +425,7 @@ ST_FUNC Section find_section(TCCState s1, const char *name) · 424 unmodified lines
425	/* update sym->c so that it points to an external symbol in section	425	/* update sym->c so that it points to an external symbol in section
426	'section' with value 'value' */	426	'section' with value 'value' */
427	ST_FUNC void put_extern_sym2(Sym sym, Section section,	427	ST_FUNC void put_extern_sym2(Sym sym, Section section,
428	uplong value, unsigned long size,	428	unsigned long value, unsigned long size,
429	int can_add_underscore)	429	int can_add_underscore)
430	{	430	{
431	int sym_type, sym_bind, sh_num, info, other;	431	int sym_type, sym_bind, sh_num, info, other;
@@ -529,7 +529,7 @@ ST_FUNC void put_extern_sym2(Sym sym, Section section, · 97 unmodified lines
529	}	529	}
530		530
531	ST_FUNC void put_extern_sym(Sym sym, Section section,	531	ST_FUNC void put_extern_sym(Sym sym, Section section,
532	uplong value, unsigned long size)	532	unsigned long value, unsigned long size)
533	{	533	{
534	put_extern_sym2(sym, section, value, size, 1);	534	put_extern_sym2(sym, section, value, size, 1);
535	}	535	}
@@ -1494,7 +1494,7 @@ PUB_FUNC const char * tcc_set_linker(TCCState s, char option, int multi) · 958 unmodified lines
1494	if (s->warn_unsupported)	1494	if (s->warn_unsupported)
1495	tcc_warning("ignoring -fini %s", p);	1495	tcc_warning("ignoring -fini %s", p);
1496	} else if (link_option(option, "image-base=", &p)) {	1496	} else if (link_option(option, "image-base=", &p)) {
1497	s->text_addr = strtoull(p, &end, 16);	1497	s->text_addr = strtoul(p, &end, 16);
1498	s->has_text_addr = 1;	1498	s->has_text_addr = 1;
1499	} else if (link_option(option, "init=", &p)) {	1499	} else if (link_option(option, "init=", &p)) {
1500	s->init_symbol = p;	1500	s->init_symbol = p;
@@ -1563,8 +1563,9 @@ PUB_FUNC const char * tcc_set_linker(TCCState s, char option, int multi) · 62 unmodified lines
1563	#endif	1563	#endif
1564		1564
1565	} else if (link_option(option, "Ttext=", &p)) {	1565	} else if (link_option(option, "Ttext=", &p)) {
1566	s->text_addr = strtoull(p, &end, 16);	1566	s->text_addr = strtoul(p, &end, 16);
1567	s->has_text_addr = 1;	1567	s->has_text_addr = 1;
		1568
1568	} else {	1569	} else {
1569	return option;	1570	return option;
1570	}	1571	}

tcc.h+5−6

     int sh_addralign;        /* elf section alignment */
     int sh_entsize;          /* elf entry size */
     unsigned long sh_size;   /* section size (only used during output) */
-    uplong sh_addr;          /* address at which the section is relocated */
+    unsigned long sh_addr;      /* address at which the section is relocated */
-    unsigned long sh_offset; /* file offset */
+    unsigned long sh_offset;    /* file offset */
     int nb_hashed_syms;      /* used to resize the hash table */
     struct Section *link;    /* link to another section */
     struct Section *reloc;   /* corresponding section for relocation, if any */
     int alacarte_link;
     /* address of text section */
-    uplong text_addr;
+    unsigned long text_addr;
     int has_text_addr;
     /* symbols to call at load-time / unload-time */
   #define strtold (long double)strtod
   #define strtof (float)strtod
   #define strtoll (long long)strtol
-  #define strtoull (unsigned long long)strtoull
 #endif
 #else
 /* XXX: need to define this to use them in non ISOC99 context */
 ST_FUNC void section_reserve(Section *sec, unsigned long size);
 ST_FUNC Section *find_section(TCCState *s1, const char *name);
-ST_FUNC void put_extern_sym2(Sym *sym, Section *section, uplong value, unsigned long size, int can_add_underscore);
+ST_FUNC void put_extern_sym2(Sym *sym, Section *section, unsigned long value, unsigned long size, int can_add_underscore);
-ST_FUNC void put_extern_sym(Sym *sym, Section *section, uplong value, unsigned long size);
+ST_FUNC void put_extern_sym(Sym *sym, Section *section, unsigned long value, unsigned long size);
 ST_FUNC void greloc(Section *s, Sym *sym, unsigned long offset, int type);
 ST_INLN void sym_free(Sym *sym);

tccelf.c+8−13

 }
 /* put dynamic tag */
-static void put_dt(Section *dynamic, int dt, uplong val)
+static void put_dt(Section *dynamic, int dt, unsigned long val)
 {
     ElfW(Dyn) *dyn;
     dyn = section_ptr_add(dynamic, sizeof(ElfW(Dyn)));
 	section_reserve(s1->got, offset + PTR_SIZE);
 #ifdef TCC_TARGET_X86_64
 	/* only works for x86-64 */
-	put32(s1->got->data + offset + 4, sym->st_value >> 32);
+	put32(s1->got->data + offset, sym->st_value >> 32);
 #endif
 	put32(s1->got->data + offset, sym->st_value & 0xffffffff);
 }
     FILE *f;
     int fd, mode, ret;
     int *section_order;
-    int shnum, i, phnum, file_offset, offset, size, j, sh_order_index, k;
+    int shnum, i, phnum, file_offset, offset, size, j, tmp, sh_order_index, k;
-    long long tmp;
+    unsigned long addr;
-    uplong addr;
     Section *strsec, *s;
     ElfW(Shdr) shdr, *sh;
     ElfW(Phdr) *phdr, *ph;
     unsigned long saved_dynamic_data_offset;
     ElfW(Sym) *sym;
     int type, file_type;
-    uplong rel_addr, rel_size;
+    unsigned long rel_addr, rel_size;
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-    uplong bss_addr, bss_size;
+    unsigned long bss_addr, bss_size;
 #endif
     file_type = s1->output_type;
             addr = s1->text_addr;
             /* we ensure that (addr % ELF_PAGE_SIZE) == file_offset %
                ELF_PAGE_SIZE */
-            a_offset = ((int) addr) & (s1->section_align - 1);
+            a_offset = addr & (s1->section_align - 1);
             p_offset = file_offset & (s1->section_align - 1);
             if (a_offset < p_offset)
                 a_offset += s1->section_align;
                     tmp = addr;
                     addr = (addr + s->sh_addralign - 1) &
                         ~(s->sh_addralign - 1);
-                    file_offset += (int) ( addr - tmp );
+                    file_offset += addr - tmp;
                     s->sh_offset = file_offset;
                     s->sh_addr = addr;
             ph->p_align = dynamic->sh_addralign;
             /* put GOT dynamic section address */
-#if defined(TCC_TARGET_X86_64)
-            put32(s1->got->data + 4, dynamic->sh_addr >> 32 );
-#endif
             put32(s1->got->data, dynamic->sh_addr);
             /* relocate the PLT */
             if (file_type == TCC_OUTPUT_EXE
 #if defined(TCC_OUTPUT_DLL_WITH_PLT)

tccrun.c+3−6

 static void rt_error(ucontext_t *uc, const char *fmt, ...);
 static int tcc_relocate_ex(TCCState *s1, void *ptr);
-#if defined TCC_TARGET_X86_64 && defined TCC_TARGET_PE
+#ifdef _WIN64
 static void win64_add_function_table(TCCState *s1);
 #endif
 /* ------------------------------------------------------------- */
 /* Do all relocations (needed before using tcc_get_symbol())
    Returns -1 on error. */
                          s1->runtime_plt_and_got_offset);
 #endif
-#if defined TCC_TARGET_X86_64 && defined TCC_TARGET_PE
+#ifdef _WIN64
     win64_add_function_table(s1);
 #endif
     return 0;
     SetUnhandledExceptionFilter(cpu_exception_handler);
 }
-#ifdef TCC_TARGET_PE
+#ifdef _WIN64
-#ifdef TCC_TARGET_X86_64
 static void win64_add_function_table(TCCState *s1)
 {
     RtlAddFunctionTable(
         );
 }
 #endif
-#endif
 /* return the PC at frame level 'level'. Return non zero if not found */
 static int rt_get_caller_pc(uplong *paddr, CONTEXT *uc, int level)

Revert "Multiple fixes for 64 bit sections"

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code