[edk2] GenFw: don't bail out on (certain) relative relocations

Message ID 1413288393-28773-1-git-send-email-leif.lindholm@linaro.org
State New
Headers show

Commit Message

Leif Lindholm Oct. 14, 2014, 12:06 p.m.
R_AARCH64_JUMP26/R_AARCH64_JUMP26 do not need fixups by GenFw,
but these are sometimes generated by GCC 4.9. Delete the check
aborting due to unhandled relocations.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
 BaseTools/Source/C/GenFw/Elf64Convert.c |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Patch

diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
index 526ab5d..a9f6fef 100644
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
@@ -709,16 +709,9 @@  WriteSections64 (
             }
             break;
 
+	  // These relative relocations do not require fixups 
           case R_AARCH64_CALL26:
-            if  (Rel->r_addend != 0 ) { /* TODO */
-              Error (NULL, 0, 3000, "Invalid", "AArch64: R_AARCH64_CALL26 Need to fixup with addend!.");
-            }
-            break;
-
           case R_AARCH64_JUMP26:
-            if  (Rel->r_addend != 0 ) { /* TODO : AArch64 '-O2' optimisation. */
-              Error (NULL, 0, 3000, "Invalid", "AArch64: R_AARCH64_JUMP26 Need to fixup with addend!.");
-            }
             break;
 
           case R_AARCH64_ADR_PREL_PG_HI21: