From 9cd26c4d61d3ea81ddb1bd8c418475c4508fc593 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Thu, 21 Apr 2016 09:10:44 +0200 Subject: [PATCH] Prevent compiler warnings --- repos/base-hw/include/spec/riscv/cpu/consts.h | 2 +- repos/base-hw/src/core/include/spec/riscv/pic.h | 2 +- repos/base/include/spec/arm/cpu/consts.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repos/base-hw/include/spec/riscv/cpu/consts.h b/repos/base-hw/include/spec/riscv/cpu/consts.h index 11a945abf..9300b462a 100644 --- a/repos/base-hw/include/spec/riscv/cpu/consts.h +++ b/repos/base-hw/include/spec/riscv/cpu/consts.h @@ -23,7 +23,7 @@ namespace Abi { * On RISC-V we align the stack top to 16-byte. As a call (or branch) will * not change the stack pointer, we need no further stack adjustment. */ - static Genode::addr_t stack_align(Genode::addr_t addr) { + inline Genode::addr_t stack_align(Genode::addr_t addr) { return (addr & ~0xf); } /** diff --git a/repos/base-hw/src/core/include/spec/riscv/pic.h b/repos/base-hw/src/core/include/spec/riscv/pic.h index a82c124d4..378e80c2b 100644 --- a/repos/base-hw/src/core/include/spec/riscv/pic.h +++ b/repos/base-hw/src/core/include/spec/riscv/pic.h @@ -35,7 +35,7 @@ class Genode::Pic }; Pic() { } - bool take_request(unsigned & i) { return true; } + bool take_request(unsigned & i) { i = 0; return true; } void unmask(unsigned const i, unsigned) { } void mask(unsigned const i) { } void finish_request() { } diff --git a/repos/base/include/spec/arm/cpu/consts.h b/repos/base/include/spec/arm/cpu/consts.h index a0354b954..84d6e3572 100644 --- a/repos/base/include/spec/arm/cpu/consts.h +++ b/repos/base/include/spec/arm/cpu/consts.h @@ -22,7 +22,7 @@ namespace Abi { * On ARM we align the stack top to 16-byte. As a call (or branch) will not * change the stack pointer, we need no further stack adjustment. */ - static inline Genode::addr_t stack_align(Genode::addr_t addr) { + inline Genode::addr_t stack_align(Genode::addr_t addr) { return (addr & ~0xf); } /**