diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-12-01 02:31:39 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-12-01 02:31:39 +0000 |
| commit | b6274a7a7890953c9906b12755fcee78330a02f2 (patch) | |
| tree | 7be96ca1cc61bbef1777c0c4c2738b68ac9b4dc1 | |
| parent | 61b0bea7d9bbcf22c33cdc729842f9dfd513b56b (diff) | |
| download | edk2-platforms-b6274a7a7890953c9906b12755fcee78330a02f2.tar.xz | |
BaseTools/GenFw ARM: allow R_ARM_REL32 relocations
R_ARM_REL32 are relative relocations, so we don't need to do anything
special when performing the ELF to PE/COFF conversion, since our memory
layout is identical between the two binary formats. So just allow them.
(Sync patch r18931 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19076 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | BaseTools/Source/C/GenFw/Elf32Convert.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c b/BaseTools/Source/C/GenFw/Elf32Convert.c index a7b077873b..469394540e 100644 --- a/BaseTools/Source/C/GenFw/Elf32Convert.c +++ b/BaseTools/Source/C/GenFw/Elf32Convert.c @@ -716,6 +716,7 @@ WriteSections32 ( // break skipped
case R_ARM_PC24:
+ case R_ARM_REL32:
case R_ARM_XPC25:
case R_ARM_THM_PC22:
case R_ARM_THM_JUMP19:
@@ -844,6 +845,7 @@ WriteRelocations32 ( // break skipped
case R_ARM_PC24:
+ case R_ARM_REL32:
case R_ARM_XPC25:
case R_ARM_THM_PC22:
case R_ARM_THM_JUMP19:
|