diff options
| author | Julius Werner <jwerner@chromium.org> | 2022-05-27 19:07:14 -0700 |
|---|---|---|
| committer | Hung-Te Lin <hungte@chromium.org> | 2022-06-07 12:34:35 +0000 |
| commit | 23d24657209d810d39a16c561ea1f68f98f8237b (patch) | |
| tree | 83b65b131687a2859d7d49aecedc202583876c50 /src/arch/riscv/opensbi.c | |
| parent | 6876f49b7e3e8e750dc40ddbe1c37b6ab12c0153 (diff) | |
commonlib: Clean up compiler.h
This patch contains several minor cleanups related to compiler.h:
- Replace __always_unused() (which is a Linux-specific concept that
doesn't make sense without also having __maybe_unused(), and had zero
uses in the codebase) with __unused() which moves here from helpers.h
- Add __underscores__ to the names of all attributes in the compiler
attribute shorthand macros. This is necessary to make them work in
files where the same name was already used for an identifier (e.g.
cbfstool/cbfs.h's `unused` array of file types).
- Remove libpayload's own copy of compiler.h and make it directly pull
in the commonlib/bsd copy.
Signed-off-by: Julius Werner <jwerner@chromium.org>
Change-Id: I9644da594bb69133843c6b7f12ce50b2e45fd24b
Reviewed-on: https://review.coreboot.org/c/coreboot/+/64737
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Diffstat (limited to 'src/arch/riscv/opensbi.c')
| -rw-r--r-- | src/arch/riscv/opensbi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/arch/riscv/opensbi.c b/src/arch/riscv/opensbi.c index 3a738ec83a..eb557d240a 100644 --- a/src/arch/riscv/opensbi.c +++ b/src/arch/riscv/opensbi.c @@ -1,5 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +/* OpenSBI wants to make its own definitions for some of our compiler.h macros. */ +#undef __packed +#undef __noreturn + #include <sbi/fw_dynamic.h> #include <arch/boot.h> /* DO NOT INCLUDE COREBOOT HEADERS HERE */ |