From 23d24657209d810d39a16c561ea1f68f98f8237b Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 27 May 2022 19:07:14 -0700 Subject: 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 Change-Id: I9644da594bb69133843c6b7f12ce50b2e45fd24b Reviewed-on: https://review.coreboot.org/c/coreboot/+/64737 Tested-by: build bot (Jenkins) Reviewed-by: Yu-Ping Wu Reviewed-by: Elyes Haouas --- payloads/libpayload/bin/lpgcc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'payloads/libpayload/bin/lpgcc') diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index 77ceda3ed9..5e418e84bd 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -168,9 +168,11 @@ if [ $_LIBDIR = $_OBJ ]; then _CFLAGS="$_CFLAGS -I$BASE/../curses" fi + _CFLAGS="$_CFLAGS -include $BASE/../../../src/commonlib/bsd/include/commonlib/bsd/compiler.h" _CFLAGS="$_CFLAGS -I$BASE/../../../src/commonlib/bsd/include" _CFLAGS="$_CFLAGS -I$BASE/../../../3rdparty/vboot/firmware/include" else + _CFLAGS="$_CFLAGS -include $BASE/../include/commonlib/bsd/compiler.h" _CFLAGS="$_CFLAGS -I$_VBOOTINCDIR" fi @@ -179,7 +181,7 @@ fi trygccoption -fno-stack-protector [ $? -eq 0 ] && _CFLAGS="$_CFLAGS -fno-stack-protector" -_CFLAGS="$_CFLAGS -include $BASE/../include/kconfig.h -include $BASE/../include/compiler.h" +_CFLAGS="$_CFLAGS -include $BASE/../include/kconfig.h" _CFLAGS="$_CFLAGS -I`$DEFAULT_CC $_ARCHEXTRA -print-search-dirs | head -n 1 | cut -d' ' -f2`include" if [ "$CONFIG_LP_VBOOT_LIB" = y ]; then -- cgit v1.2.3