procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

out: Elf32, Elfx32, Elf64 -- more unifications

Browse source 
Some elf_ section numbers may be unused.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2016-03-13 13:43:14 +03:00
parent 784d10cb9a
commit d3ec4be590
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
output/outelf32.c
View file

@ -177,12 +177,11 @@ static void dwarf_findsect(const int);
/*
* Special NASM section numbers which are used to define ELF special
* symbols, which can be used with WRT to provide PIC and TLS
* relocation types.
* symbols.
*/
static int32_t elf_gotpc_sect, elf_gotoff_sect;
static int32_t elf_got_sect, elf_plt_sect;
static int32_t elf_sym_sect, elf_tlsie_sect;
static int32_t elf_sym_sect, elf_gottpoff_sect, elf_tlsie_sect;
static void elf_init(void)
{
@ -297,7 +296,7 @@ static int32_t elf_section_names(char *name, int pass, int *bits)
flags_and = flags_or = type = align = 0;
elf_section_attrib(name, p, pass, &flags_and,
&flags_or, &align, &type);
&flags_or, &align, &type);
if (!strcmp(name, ".shstrtab") ||
!strcmp(name, ".symtab") ||

12
output/outelf64.c
View file

@ -177,14 +177,12 @@ static void dwarf_findfile(const char *);
static void dwarf_findsect(const int);
/*
* Special section numbers which are used to define ELF special
* symbols, which can be used with WRT to provide PIC relocation
* types.
* Special NASM section numbers which are used to define ELF special
* symbols.
*/
static int32_t elf_gotpc_sect, elf_gotoff_sect;
static int32_t elf_got_sect, elf_plt_sect;
static int32_t elf_sym_sect;
static int32_t elf_gottpoff_sect;
static int32_t elf_sym_sect, elf_gottpoff_sect, elf_tlsie_sect;
static void elf_init(void)
{
@ -328,8 +326,8 @@ static int32_t elf_section_names(char *name, int pass, int *bits)
i = elf_make_section(name, type, flags, align);
} else if (pass == 1) {
if ((type && sects[i]->type != type)
|| (align && sects[i]->align != align)
|| (flags_and && ((sects[i]->flags & flags_and) != flags_or)))
|| (align && sects[i]->align != align)
|| (flags_and && ((sects[i]->flags & flags_and) != flags_or)))
nasm_error(ERR_WARNING, "incompatible section attributes ignored on"
" redeclaration of section `%s'", name);
}

6
output/outelfx32.c
View file

@ -299,7 +299,7 @@ static int32_t elf_section_names(char *name, int pass, int *bits)
flags_and = flags_or = type = align = 0;
elf_section_attrib(name, p, pass, &flags_and,
&flags_or, &align, &type);
&flags_or, &align, &type);
if (!strcmp(name, ".shstrtab") ||
!strcmp(name, ".symtab") ||
@ -328,8 +328,8 @@ static int32_t elf_section_names(char *name, int pass, int *bits)
i = elf_make_section(name, type, flags, align);
} else if (pass == 1) {
if ((type && sects[i]->type != type)
|| (align && sects[i]->align != align)
|| (flags_and && ((sects[i]->flags & flags_and) != flags_or)))
|| (align && sects[i]->align != align)
|| (flags_and && ((sects[i]->flags & flags_and) != flags_or)))
nasm_error(ERR_WARNING, "incompatible section attributes ignored on"
" redeclaration of section `%s'", name);
}