From b535c63f7181edde75abcfece0f74671d6cfa565 Mon Sep 17 00:00:00 2001 From: Elyes Haouas Date: Wed, 15 May 2024 13:12:49 +0200 Subject: [PATCH] sbi/sbi_types.h: Don't unconditionally define '__always_inline' This is to fix update opensbi to upstream build for coreboot. https://qa.coreboot.org/job/coreboot-gerrit/257449/testReport/junit/(root)/clang/EMULATION_QEMU_RISCV_RV64_/ Signed-off-by: Elyes Haouas --- include/sbi/sbi_types.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/sbi/sbi_types.h b/include/sbi/sbi_types.h index def88bbad2c..a9943d299cd 100644 --- a/include/sbi/sbi_types.h +++ b/include/sbi/sbi_types.h @@ -69,7 +69,10 @@ typedef uint64_t be64_t; #define __packed __attribute__((packed)) #define __noreturn __attribute__((noreturn)) #define __aligned(x) __attribute__((aligned(x))) + +#ifndef __always_inline #define __always_inline inline __attribute__((always_inline)) +#endif #define likely(x) __builtin_expect((x), 1) #define unlikely(x) __builtin_expect((x), 0)