Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
vppinfra: remove dead code in elf.c
[vpp.git]
/
src
/
vppinfra
/
elf.c
diff --git
a/src/vppinfra/elf.c
b/src/vppinfra/elf.c
index
a8c5d30
..
7a74fad
100644
(file)
--- a/
src/vppinfra/elf.c
+++ b/
src/vppinfra/elf.c
@@
-43,7
+43,7
@@
elf_swap_verneed_aux (elf_dynamic_version_need_aux_t * n)
#undef _
}
#undef _
}
-clib_error_t *
+
__clib_export
clib_error_t *
elf_get_section_by_name (elf_main_t * em, char *section_name,
elf_section_t ** result)
{
elf_get_section_by_name (elf_main_t * em, char *section_name,
elf_section_t ** result)
{
@@
-65,9
+65,9
@@
elf_get_section_by_start_address_no_check (elf_main_t * em,
return p ? vec_elt_at_index (em->sections, p[0]) : 0;
}
return p ? vec_elt_at_index (em->sections, p[0]) : 0;
}
-clib_error_t *
-elf_get_section_by_start_address (elf_main_t *
em, uword start_address,
- elf_section_t **
result)
+
__clib_export
clib_error_t *
+elf_get_section_by_start_address (elf_main_t *em, uword start_address,
+ elf_section_t **result)
{
elf_section_t *s =
elf_get_section_by_start_address_no_check (em, start_address);
{
elf_section_t *s =
elf_get_section_by_start_address_no_check (em, start_address);
@@
-541,8
+541,8
@@
elf_segment_va_compare (void *a1, void *a2)
(i64) s2->header.virtual_address);
}
(i64) s2->header.virtual_address);
}
-u8 *
-format_elf_main (u8 *
s, va_list *
args)
+
__clib_export
u8 *
+format_elf_main (u8 *
s, va_list *
args)
{
elf_main_t *em = va_arg (*args, elf_main_t *);
u32 verbose = va_arg (*args, u32);
{
elf_main_t *em = va_arg (*args, elf_main_t *);
u32 verbose = va_arg (*args, u32);
@@
-895,8
+895,8
@@
elf_parse_symbols (elf_main_t * em)
}
}
}
}
-void
-elf_set_dynamic_entries (elf_main_t *
em)
+
__clib_export
void
+elf_set_dynamic_entries (elf_main_t *em)
{
uword i;
{
uword i;
@@
-1325,7
+1325,7
@@
elf_parse_dynamic (elf_main_t * em)
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <fcntl.h>
-clib_error_t *
+
__clib_export
clib_error_t *
elf_read_file (elf_main_t * em, char *file_name)
{
int fd;
elf_read_file (elf_main_t * em, char *file_name)
{
int fd;
@@
-1357,6
+1357,8
@@
elf_read_file (elf_main_t * em, char *file_name)
goto done;
}
goto done;
}
+ CLIB_MEM_UNPOISON (data, mmap_length);
+
em->file_name = file_name;
error = elf_parse (em, data, mmap_length);
em->file_name = file_name;
error = elf_parse (em, data, mmap_length);
@@
-1453,7
+1455,6
@@
static void
layout_sections (elf_main_t * em)
{
elf_section_t *s;
layout_sections (elf_main_t * em)
{
elf_section_t *s;
- u32 n_sections_with_changed_exec_address = 0;
u32 *deferred_symbol_and_string_sections = 0;
u32 n_deleted_sections = 0;
/* note: rebuild is always zero. Intent lost in the sands of time */
u32 *deferred_symbol_and_string_sections = 0;
u32 n_deleted_sections = 0;
/* note: rebuild is always zero. Intent lost in the sands of time */
@@
-1612,7
+1613,6
@@
layout_sections (elf_main_t * em)
if (s->header.flags & ELF_SECTION_FLAG_ALLOC)
{
s->exec_address_change = exec_address - s->header.exec_address;
if (s->header.flags & ELF_SECTION_FLAG_ALLOC)
{
s->exec_address_change = exec_address - s->header.exec_address;
- n_sections_with_changed_exec_address += s->exec_address_change != 0;
s->header.exec_address = exec_address;
}
s->header.exec_address = exec_address;
}
@@
-1703,7
+1703,7
@@
layout_sections (elf_main_t * em)
s_lo = s_hi = 0;
/* *INDENT-OFF* */
s_lo = s_hi = 0;
/* *INDENT-OFF* */
- clib_bitmap_foreach (si, g->section_index_bitmap
, (
{
+ clib_bitmap_foreach (si, g->section_index_bitmap
)
{
u64 lo, hi;
s = vec_elt_at_index (em->sections, si);
u64 lo, hi;
s = vec_elt_at_index (em->sections, si);
@@
-1726,7
+1726,7
@@
layout_sections (elf_main_t * em)
if (hi > s_hi)
s_hi = hi;
}
if (hi > s_hi)
s_hi = hi;
}
- }
));
+ }
/* *INDENT-ON* */
if (n_sections == 0)
/* *INDENT-ON* */
if (n_sections == 0)
@@
-1748,8
+1748,8
@@
layout_sections (elf_main_t * em)
}
}
}
}
-clib_error_t *
-elf_write_file (elf_main_t *
em, char *file_name)
+
__clib_export
clib_error_t *
+elf_write_file (elf_main_t *em, char *file_name)
{
int fd;
FILE *f;
{
int fd;
FILE *f;