github-repos/tinycc
1
0
Fork 0
mirror of https://github.com/mirror/tinycc.git synced 2025-02-04 06:30:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

_end symbol definition fix - fixed section alignment logic

Browse Source
This commit is contained in:
bellard 2004-10-18 00:20:26 +00:00
parent 0bd402d2eb
commit ff3a5daf25
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tccelf.c
View File

@ -1081,8 +1081,11 @@ int tcc_output_file(TCCState *s1, const char *filename)
file_type = s1->output_type; file_type = s1->output_type;
s1->nb_errors = 0; s1->nb_errors = 0;
if (file_type != TCC_OUTPUT_OBJ) if (file_type != TCC_OUTPUT_OBJ) {
relocate_common_syms();
tcc_add_runtime(s1); tcc_add_runtime(s1);
}
phdr = NULL; phdr = NULL;
section_order = NULL; section_order = NULL;
@ -1093,8 +1096,6 @@ int tcc_output_file(TCCState *s1, const char *filename)
if (file_type != TCC_OUTPUT_OBJ) { if (file_type != TCC_OUTPUT_OBJ) {
relocate_common_syms();
if (!s1->static_link) { if (!s1->static_link) {
const char *name; const char *name;
int sym_index, index; int sym_index, index;
@ -1312,18 +1313,29 @@ int tcc_output_file(TCCState *s1, const char *filename)
file_offset = sizeof(Elf32_Ehdr) + phnum * sizeof(Elf32_Phdr); file_offset = sizeof(Elf32_Ehdr) + phnum * sizeof(Elf32_Phdr);
if (phnum > 0) { if (phnum > 0) {
/* compute section to program header mapping */ /* compute section to program header mapping */
if (file_type == TCC_OUTPUT_DLL) if (s1->has_text_addr) {
addr = 0; int a_offset, p_offset;
else addr = s1->text_addr;
addr = ELF_START_ADDR; /* we ensure that (addr % ELF_PAGE_SIZE) == file_offset %
ELF_PAGE_SIZE */
a_offset = addr & (ELF_PAGE_SIZE - 1);
p_offset = file_offset & (ELF_PAGE_SIZE - 1);
if (a_offset < p_offset)
a_offset += ELF_PAGE_SIZE;
file_offset += (a_offset - p_offset);
} else {
if (file_type == TCC_OUTPUT_DLL)
addr = 0;
else
addr = ELF_START_ADDR;
/* compute address after headers */
addr += (file_offset & (ELF_PAGE_SIZE - 1));
}
/* dynamic relocation table information, for .dynamic section */ /* dynamic relocation table information, for .dynamic section */
rel_size = 0; rel_size = 0;
rel_addr = 0; rel_addr = 0;
/* compute address after headers */
addr += (file_offset & (ELF_PAGE_SIZE - 1));
/* leave one program header for the program interpreter */ /* leave one program header for the program interpreter */
ph = &phdr[0]; ph = &phdr[0];
if (interp) if (interp)
@ -1374,11 +1386,11 @@ int tcc_output_file(TCCState *s1, const char *filename)
section_order[sh_order_index++] = i; section_order[sh_order_index++] = i;
/* section matches: we align it and add its size */ /* section matches: we align it and add its size */
tmp = file_offset; tmp = addr;
file_offset = (file_offset + s->sh_addralign - 1) & addr = (addr + s->sh_addralign - 1) &
~(s->sh_addralign - 1); ~(s->sh_addralign - 1);
file_offset += addr - tmp;
s->sh_offset = file_offset; s->sh_offset = file_offset;
addr += file_offset - tmp;
s->sh_addr = addr; s->sh_addr = addr;
/* update program header infos */ /* update program header infos */