From 5775911dadef7c10eee8ee44db41c6aeb6b11e07 Mon Sep 17 00:00:00 2001 From: Andrew Mulbrook Date: Sat, 3 Mar 2012 10:12:06 -0600 Subject: Revert "Multiple fixes for 64 bit sections" This reverts commit d7a7c3769d0a1dcb8400258cd8adf78a8566de61. --- tcc.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tcc.h') diff --git a/tcc.h b/tcc.h index 18a6b91..d158829 100644 --- a/tcc.h +++ b/tcc.h @@ -313,8 +313,8 @@ typedef struct Section { 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_offset; /* file offset */ + unsigned long sh_addr; /* address at which the section is relocated */ + 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 */ @@ -531,7 +531,7 @@ struct TCCState { 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 */ @@ -872,7 +872,6 @@ enum tcc_token { #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 */ @@ -993,8 +992,8 @@ ST_FUNC void *section_ptr_add(Section *sec, unsigned long size); 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_sym(Sym *sym, Section *section, uplong value, unsigned long size); +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, 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); -- cgit v1.3.1