cbfstool: Add relocation codes for arm mode
Add relocation codes required for arm mode. These are required by armv4.
BUG=chrome-os-partner:30784
BRANCH=None
TEST=Compiles successfully for rush
Original-Change-Id: Ie7c5b3e07689c85091036a619a65f9fea1918b6b
Original-Signed-off-by: Furquan Shaikh <furquan@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/209973
Original-Tested-by: Furquan Shaikh <furquan@chromium.org>
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Commit-Queue: Aaron Durbin <adurbin@chromium.org>
(cherry picked from commit dc5f411f95e02a02b4a4ef4652303ce62aa220c2)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Change-Id: Ie62ed730080299e474c256371ab88f605b54c10f
Reviewed-on: http://review.coreboot.org/8675
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
diff --git a/util/cbfstool/rmodule.c b/util/cbfstool/rmodule.c
index 966c364..1c8aea7 100644
--- a/util/cbfstool/rmodule.c
+++ b/util/cbfstool/rmodule.c
@@ -88,9 +88,10 @@
type = ELF64_R_TYPE(rel->r_info);
- /* Only these 3 relocations are expected to be found. */
+ /* Only these 6 relocations are expected to be found. */
return (type == R_ARM_ABS32 || type == R_ARM_THM_PC22 ||
- type == R_ARM_THM_JUMP24);
+ type == R_ARM_THM_JUMP24 || type == R_ARM_V4BX ||
+ type == R_ARM_CALL || type == R_ARM_JUMP24);
}
static int should_emit_arm(struct rmod_context *ctx, Elf64_Rela *rel)