summaryrefslogtreecommitdiffstats
path: root/cpukit/libdl/rtl-elf.c
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2018-04-12 17:46:49 +1000
committerChris Johns <chrisj@rtems.org>2018-04-12 17:57:40 +1000
commitf59d435d16261b04f97e293ab075e79624caf11d (patch)
treed37bc351bc95541388740069541f605af71203ff /cpukit/libdl/rtl-elf.c
parenttestsuites/dl06: Add a test for RAP format. (diff)
downloadrtems-f59d435d16261b04f97e293ab075e79624caf11d.tar.bz2
libdl: Remove _t from all structures as this is reserved for the standards
Diffstat (limited to 'cpukit/libdl/rtl-elf.c')
-rw-r--r--cpukit/libdl/rtl-elf.c148
1 files changed, 74 insertions, 74 deletions
diff --git a/cpukit/libdl/rtl-elf.c b/cpukit/libdl/rtl-elf.c
index 47c92d5f39..53f43aaeac 100644
--- a/cpukit/libdl/rtl-elf.c
+++ b/cpukit/libdl/rtl-elf.c
@@ -1,5 +1,5 @@
/*
- * COPYRIGHT (c) 2012-2014 Chris Johns <chrisj@rtems.org>
+ * COPYRIGHT (c) 2012-2018 Chris Johns <chrisj@rtems.org>
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
@@ -43,7 +43,7 @@
/**
* The ELF format signature.
*/
-static rtems_rtl_loader_format_t elf_sig =
+static rtems_rtl_loader_format elf_sig =
{
.label = "ELF",
.flags = RTEMS_RTL_FMT_ELF
@@ -65,19 +65,19 @@ rtems_rtl_elf_machine_check (Elf_Ehdr* ehdr)
}
bool
-rtems_rtl_elf_find_symbol (rtems_rtl_obj_t* obj,
- const Elf_Sym* sym,
- const char* symname,
- Elf_Word* value)
+rtems_rtl_elf_find_symbol (rtems_rtl_obj* obj,
+ const Elf_Sym* sym,
+ const char* symname,
+ Elf_Word* value)
{
- rtems_rtl_obj_sect_t* sect;
+ rtems_rtl_obj_sect* sect;
if (ELF_ST_TYPE(sym->st_info) == STT_NOTYPE)
{
/*
* Search the object file then the global table for the symbol.
*/
- rtems_rtl_obj_sym_t* symbol = rtems_rtl_symbol_obj_find (obj, symname);
+ rtems_rtl_obj_sym* symbol = rtems_rtl_symbol_obj_find (obj, symname);
if (!symbol)
{
rtems_rtl_set_error (EINVAL, "global symbol not found: %s", symname);
@@ -100,20 +100,20 @@ rtems_rtl_elf_find_symbol (rtems_rtl_obj_t* obj,
}
static bool
-rtems_rtl_elf_relocator (rtems_rtl_obj_t* obj,
- int fd,
- rtems_rtl_obj_sect_t* sect,
- void* data)
+rtems_rtl_elf_relocator (rtems_rtl_obj* obj,
+ int fd,
+ rtems_rtl_obj_sect* sect,
+ void* data)
{
- rtems_rtl_obj_cache_t* symbols;
- rtems_rtl_obj_cache_t* strings;
- rtems_rtl_obj_cache_t* relocs;
- rtems_rtl_obj_sect_t* targetsect;
- rtems_rtl_obj_sect_t* symsect;
- rtems_rtl_obj_sect_t* strtab;
- bool is_rela;
- size_t reloc_size;
- int reloc;
+ rtems_rtl_obj_cache* symbols;
+ rtems_rtl_obj_cache* strings;
+ rtems_rtl_obj_cache* relocs;
+ rtems_rtl_obj_sect* targetsect;
+ rtems_rtl_obj_sect* symsect;
+ rtems_rtl_obj_sect* strtab;
+ bool is_rela;
+ size_t reloc_size;
+ int reloc;
/*
* First check if the section the relocations are for exists. If it does not
@@ -215,8 +215,8 @@ rtems_rtl_elf_relocator (rtems_rtl_obj_t* obj,
{
if (!rtems_rtl_elf_find_symbol (obj, &sym, symname, &symvalue))
{
- uint16_t flags = 0;
- rtems_rtl_word_t rel_words[3];
+ uint16_t flags = 0;
+ rtems_rtl_word rel_words[3];
relocate = false;
@@ -282,12 +282,12 @@ rtems_rtl_elf_relocator (rtems_rtl_obj_t* obj,
}
bool
-rtems_rtl_obj_relocate_unresolved (rtems_rtl_unresolv_reloc_t* reloc,
- rtems_rtl_obj_sym_t* sym)
+rtems_rtl_obj_relocate_unresolved (rtems_rtl_unresolv_reloc* reloc,
+ rtems_rtl_obj_sym* sym)
{
- rtems_rtl_obj_sect_t* sect;
- bool is_rela;
- Elf_Word symvalue;
+ rtems_rtl_obj_sect* sect;
+ bool is_rela;
+ Elf_Word symvalue;
is_rela =reloc->flags & 1;
@@ -338,23 +338,23 @@ rtems_rtl_obj_relocate_unresolved (rtems_rtl_unresolv_reloc_t* reloc,
}
static bool
-rtems_rtl_elf_symbols (rtems_rtl_obj_t* obj,
- int fd,
- rtems_rtl_obj_sect_t* sect,
- void* data)
+rtems_rtl_elf_symbols (rtems_rtl_obj* obj,
+ int fd,
+ rtems_rtl_obj_sect* sect,
+ void* data)
{
- rtems_rtl_obj_cache_t* symbols;
- rtems_rtl_obj_cache_t* strings;
- rtems_rtl_obj_sect_t* strtab;
- int locals;
- int local_string_space;
- rtems_rtl_obj_sym_t* lsym;
- char* lstring;
- int globals;
- int global_string_space;
- rtems_rtl_obj_sym_t* gsym;
- char* gstring;
- int sym;
+ rtems_rtl_obj_cache* symbols;
+ rtems_rtl_obj_cache* strings;
+ rtems_rtl_obj_sect* strtab;
+ int locals;
+ int local_string_space;
+ rtems_rtl_obj_sym* lsym;
+ char* lstring;
+ int globals;
+ int global_string_space;
+ rtems_rtl_obj_sym* gsym;
+ char* gstring;
+ int sym;
strtab = rtems_rtl_obj_find_section (obj, ".strtab");
if (!strtab)
@@ -408,7 +408,7 @@ rtems_rtl_elf_symbols (rtems_rtl_obj_t* obj,
(ELF_ST_TYPE (symbol.st_info) == STT_FUNC) ||
(ELF_ST_TYPE (symbol.st_info) == STT_NOTYPE)))
{
- rtems_rtl_obj_sect_t* symsect;
+ rtems_rtl_obj_sect* symsect;
symsect = rtems_rtl_obj_find_section_by_index (obj, symbol.st_shndx);
if (symsect)
@@ -446,7 +446,7 @@ rtems_rtl_elf_symbols (rtems_rtl_obj_t* obj,
if (locals)
{
- obj->local_size = locals * sizeof (rtems_rtl_obj_sym_t) + local_string_space;
+ obj->local_size = locals * sizeof (rtems_rtl_obj_sym) + local_string_space;
obj->local_table = rtems_rtl_alloc_new (RTEMS_RTL_ALLOC_SYMBOL,
obj->local_size, true);
if (!obj->local_table)
@@ -461,7 +461,7 @@ rtems_rtl_elf_symbols (rtems_rtl_obj_t* obj,
if (globals)
{
- obj->global_size = globals * sizeof (rtems_rtl_obj_sym_t) + global_string_space;
+ obj->global_size = globals * sizeof (rtems_rtl_obj_sym) + global_string_space;
obj->global_table = rtems_rtl_alloc_new (RTEMS_RTL_ALLOC_SYMBOL,
obj->global_size, true);
if (!obj->global_table)
@@ -482,10 +482,10 @@ rtems_rtl_elf_symbols (rtems_rtl_obj_t* obj,
lsym = obj->local_table;
lstring =
- (((char*) obj->local_table) + (locals * sizeof (rtems_rtl_obj_sym_t)));
+ (((char*) obj->local_table) + (locals * sizeof (rtems_rtl_obj_sym)));
gsym = obj->global_table;
gstring =
- (((char*) obj->global_table) + (globals * sizeof (rtems_rtl_obj_sym_t)));
+ (((char*) obj->global_table) + (globals * sizeof (rtems_rtl_obj_sym)));
for (sym = 0; sym < (sect->size / sizeof (Elf_Sym)); ++sym)
{
@@ -530,9 +530,9 @@ rtems_rtl_elf_symbols (rtems_rtl_obj_t* obj,
(ELF_ST_BIND (symbol.st_info) == STB_WEAK) ||
(ELF_ST_BIND (symbol.st_info) == STB_LOCAL)))
{
- rtems_rtl_obj_sect_t* symsect;
- rtems_rtl_obj_sym_t* osym;
- char* string;
+ rtems_rtl_obj_sect* symsect;
+ rtems_rtl_obj_sym* osym;
+ char* string;
symsect = rtems_rtl_obj_find_section_by_index (obj, symbol.st_shndx);
if (symsect)
@@ -578,10 +578,10 @@ rtems_rtl_elf_symbols (rtems_rtl_obj_t* obj,
}
static bool
-rtems_rtl_elf_loader (rtems_rtl_obj_t* obj,
- int fd,
- rtems_rtl_obj_sect_t* sect,
- void* data)
+rtems_rtl_elf_loader (rtems_rtl_obj* obj,
+ int fd,
+ rtems_rtl_obj_sect* sect,
+ void* data)
{
uint8_t* base_offset;
size_t len;
@@ -611,14 +611,14 @@ rtems_rtl_elf_loader (rtems_rtl_obj_t* obj,
}
static bool
-rtems_rtl_elf_parse_sections (rtems_rtl_obj_t* obj, int fd, Elf_Ehdr* ehdr)
+rtems_rtl_elf_parse_sections (rtems_rtl_obj* obj, int fd, Elf_Ehdr* ehdr)
{
- rtems_rtl_obj_cache_t* sects;
- rtems_rtl_obj_cache_t* strings;
- int section;
- off_t sectstroff;
- off_t off;
- Elf_Shdr shdr;
+ rtems_rtl_obj_cache* sects;
+ rtems_rtl_obj_cache* strings;
+ int section;
+ off_t sectstroff;
+ off_t off;
+ Elf_Shdr shdr;
rtems_rtl_obj_caches (&sects, &strings, NULL);
@@ -772,10 +772,10 @@ rtems_rtl_elf_parse_sections (rtems_rtl_obj_t* obj, int fd, Elf_Ehdr* ehdr)
}
bool
-rtems_rtl_elf_file_check (rtems_rtl_obj_t* obj, int fd)
+rtems_rtl_elf_file_check (rtems_rtl_obj* obj, int fd)
{
- rtems_rtl_obj_cache_t* header;
- Elf_Ehdr ehdr;
+ rtems_rtl_obj_cache* header;
+ Elf_Ehdr ehdr;
rtems_rtl_obj_caches (&header, NULL, NULL);
@@ -803,7 +803,7 @@ rtems_rtl_elf_file_check (rtems_rtl_obj_t* obj, int fd)
}
static bool
-rtems_rtl_elf_load_linkmap (rtems_rtl_obj_t* obj)
+rtems_rtl_elf_load_linkmap (rtems_rtl_obj* obj)
{
rtems_chain_control* sections = NULL;
rtems_chain_node* node = NULL;
@@ -824,7 +824,7 @@ rtems_rtl_elf_load_linkmap (rtems_rtl_obj_t* obj)
node = rtems_chain_first (sections);
while (!rtems_chain_is_tail (sections, node))
{
- rtems_rtl_obj_sect_t* sect = (rtems_rtl_obj_sect_t*) node;
+ rtems_rtl_obj_sect* sect = (rtems_rtl_obj_sect*) node;
if ((sect->size != 0) && ((sect->flags & mask) != 0))
{
++sec_num;
@@ -867,7 +867,7 @@ rtems_rtl_elf_load_linkmap (rtems_rtl_obj_t* obj)
node = rtems_chain_first (sections);
while (!rtems_chain_is_tail (sections, node))
{
- rtems_rtl_obj_sect_t* sect = (rtems_rtl_obj_sect_t*) node;
+ rtems_rtl_obj_sect* sect = (rtems_rtl_obj_sect*) node;
if ((sect->size != 0) && ((sect->flags & mask) != 0))
{
@@ -904,10 +904,10 @@ rtems_rtl_elf_load_linkmap (rtems_rtl_obj_t* obj)
}
bool
-rtems_rtl_elf_file_load (rtems_rtl_obj_t* obj, int fd)
+rtems_rtl_elf_file_load (rtems_rtl_obj* obj, int fd)
{
- rtems_rtl_obj_cache_t* header;
- Elf_Ehdr ehdr;
+ rtems_rtl_obj_cache* header;
+ Elf_Ehdr ehdr;
rtems_rtl_obj_caches (&header, NULL, NULL);
@@ -994,13 +994,13 @@ rtems_rtl_elf_file_load (rtems_rtl_obj_t* obj, int fd)
}
bool
-rtems_rtl_elf_file_unload (rtems_rtl_obj_t* obj)
+rtems_rtl_elf_file_unload (rtems_rtl_obj* obj)
{
rtems_rtl_elf_unwind_deregister (obj);
return true;
}
-rtems_rtl_loader_format_t*
+rtems_rtl_loader_format*
rtems_rtl_elf_file_sig (void)
{
return &elf_sig;