From 162279b680a0438b428e7f04bc12205dbb7e5598 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sat, 6 Apr 2019 08:54:41 -0500 Subject: [PATCH] kernel/arm: Fix a few build regressions around types Change-Id: I577e64397610bc48e4b7646c533de95d0024dd63 --- src/system/kernel/arch/arm/arch_debug.cpp | 2 +- src/system/kernel/arch/arm/arch_elf.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/system/kernel/arch/arm/arch_debug.cpp b/src/system/kernel/arch/arm/arch_debug.cpp index 1832ca2962..2df2fa3ea7 100644 --- a/src/system/kernel/arch/arm/arch_debug.cpp +++ b/src/system/kernel/arch/arm/arch_debug.cpp @@ -30,7 +30,7 @@ extern struct iframe_stack gBootFrameStack; static bool -already_visited(uint32 *visited, int32 *_last, int32 *_num, uint32 fp) +already_visited(addr_t *visited, int32 *_last, int32 *_num, addr_t fp) { int32 last = *_last; int32 num = *_num; diff --git a/src/system/kernel/arch/arm/arch_elf.cpp b/src/system/kernel/arch/arm/arch_elf.cpp index 237a26fcc3..e8d46b9494 100644 --- a/src/system/kernel/arch/arm/arch_elf.cpp +++ b/src/system/kernel/arch/arm/arch_elf.cpp @@ -174,7 +174,7 @@ arch_elf_relocate_rel(struct elf_image_info *image, struct elf_image_info *resolveImage, Elf32_Rel *rel, int relLength) #endif { - addr_t S; + elf_addr S; addr_t A; addr_t P; addr_t finalAddress; @@ -321,7 +321,7 @@ arch_elf_relocate_rela(struct elf_image_info *image, int i; Elf32_Sym *sym; int vlErr; - addr_t S = 0; // symbol address + elf_addr S = 0; // symbol address addr_t R = 0; // section relative symbol address addr_t G = 0; // GOT address