RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

libdl/arm: Fix ARM mode trampoline parsing of relocs

Browse Source 
- No need to dump globals syms in test dl01 when tracing

Closes #3775
This commit is contained in:
Chris Johns
2019-07-28 09:12:53 +10:00
parent 1e6380baf2
commit 5a678de90c
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cpukit/libdl/rtl-mdreloc-arm.c
View File

@@ -279,32 +279,32 @@ rtems_rtl_elf_reloc_rel (rtems_rtl_obj* obj,
case R_TYPE(V4BX):
/* Miscellaneous, ignore */
if (!parsing && rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC)) {
printf ("rtl: V4BX %p @ %p in %s\n",
(void *)*where, where, rtems_rtl_obj_oname (obj));
printf ("rtl: V4BX @ %p in %s\n",
where, rtems_rtl_obj_oname (obj));
}
break;
case R_TYPE(MOVT_ABS):
case R_TYPE(MOVW_ABS_NC):
insn = *where;
addend = ((insn >> 4) & 0xf000) | (insn & 0x0fff);
if (addend & 0x8000)
addend |= 0xffff0000;
tmp = symvalue + addend;
if (ELF_R_TYPE(rel->r_info) == R_TYPE(MOVW_ABS_NC))
tmp &= 0xffff;
else {
tmp = (Elf_Sword)tmp >> 16;
if (((Elf_Sword)tmp > 0x7fff) || ((Elf_Sword)tmp < -0x8000)) {
printf("MOVT_ABS Overflow\n");
return rtems_rtl_elf_rel_failure;
}
}
if (!parsing) {
insn = *where;
addend = ((insn >> 4) & 0xf000) | (insn & 0x0fff);
if (addend & 0x8000)
addend |= 0xffff0000;
tmp = symvalue + addend;
if (ELF_R_TYPE(rel->r_info) == R_TYPE(MOVW_ABS_NC))
tmp &= 0xffff;
else {
tmp = (Elf_Sword)tmp >> 16;
if (((Elf_Sword)tmp > 0x7fff) || ((Elf_Sword)tmp < -0x8000)) {
printf("MOVT_ABS Overflow\n");
return rtems_rtl_elf_rel_failure;
}
}
*where = (insn & 0xfff0f000) | ((tmp & 0xf000) << 4) | (tmp & 0xfff);
if (rtems_rtl_trace (RTEMS_RTL_TRACE_RELOC))

1
testsuites/libtests/dl01/dl-load.c
View File

@@ -26,7 +26,6 @@
RTEMS_RTL_TRACE_ALLOCATOR | \
RTEMS_RTL_TRACE_UNRESOLVED | \
RTEMS_RTL_TRACE_ARCHIVES | \
RTEMS_RTL_TRACE_GLOBAL_SYM | \
RTEMS_RTL_TRACE_DEPENDENCY)
#define DL_DEBUG_TRACE DEBUG_TRACE /* RTEMS_RTL_TRACE_ALL */
#define DL_RTL_CMDS 1