tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-09-24 02:07:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

ImageTool: Dropped MOVW/T relocs.

Browse Source
This commit is contained in:
Mikhail Krichanov 2023-04-12 16:08:01 +03:00 committed by MikhailKrichanov
parent 7ae4bf8995
commit b58fc72d8a
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BaseTools/ImageTool/ElfScan.c
View File

@ -528,20 +528,6 @@ SetRelocs (
case R_ARM_TLS_LDM32: case R_ARM_TLS_LDM32:
case R_ARM_TLS_IE32: case R_ARM_TLS_IE32:
break; break;
case R_ARM_THM_MOVW_ABS_NC:
mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_ARM_MOV32T;
mImageInfo.RelocInfo.Relocs[RelNum].Target = Rel->r_offset;
++RelNum;
break;
case R_ARM_THM_MOVT_ABS:
//
// The immediate fields of a contiguous MOVW+MOVT pair in Thumb mode
// is treated as a single 64-bit instruction starting at the address
// provided by R_ARM_THM_MOVW_ABS_NC relocation.
//
break;
case R_ARM_ABS32: case R_ARM_ABS32:
mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_HIGHLOW; mImageInfo.RelocInfo.Relocs[RelNum].Type = EFI_IMAGE_REL_BASED_HIGHLOW;
@ -621,8 +607,7 @@ CreateIntermediate (
++NumRelocs; ++NumRelocs;
} }
} else if (mEhdr->e_machine == EM_ARM) { } else if (mEhdr->e_machine == EM_ARM) {
if ((ELF_R_TYPE(Rel->r_info) == R_ARM_THM_MOVW_ABS_NC) if (ELF_R_TYPE(Rel->r_info) == R_ARM_ABS32) {
|| (ELF_R_TYPE(Rel->r_info) == R_ARM_ABS32)) {
++NumRelocs; ++NumRelocs;
} }
} }