3 files changed, 13 insertions, 13 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 */
diff --git a/src/commonlib/bsd/include/commonlib/bsd/compiler.h b/src/commonlib/bsd/include/commonlib/bsd/compiler.h
index ebf017900d..42f9235e8e 100644
--- a/src/commonlib/bsd/include/commonlib/bsd/compiler.h
+++ b/src/commonlib/bsd/include/commonlib/bsd/compiler.h
@@ -5,34 +5,34 @@
 
 #ifndef __packed
 #if defined(__WIN32) || defined(__WIN64)
-#define __packed __attribute__((gcc_struct, packed))
+#define __packed __attribute__((__gcc_struct__, __packed__))
 #else
-#define __packed __attribute__((packed))
+#define __packed __attribute__((__packed__))
 #endif
 #endif
 
 #ifndef __aligned
-#define __aligned(x) __attribute__((aligned(x)))
+#define __aligned(x) __attribute__((__aligned__(x)))
 #endif
 
-#ifndef __always_unused
-#define __always_unused __attribute__((unused))
+#ifndef __unused
+#define __unused __attribute__((__unused__))
 #endif
 
 #ifndef __must_check
-#define __must_check __attribute__((warn_unused_result))
+#define __must_check __attribute__((__warn_unused_result__))
 #endif
 
 #ifndef __weak
-#define __weak __attribute__((weak))
+#define __weak __attribute__((__weak__))
 #endif
 
 #ifndef __noreturn
-#define __noreturn __attribute__((noreturn))
+#define __noreturn __attribute__((__noreturn__))
 #endif
 
 #ifndef __always_inline
-#define __always_inline inline __attribute__((always_inline))
+#define __always_inline inline __attribute__((__always_inline__))
 #endif
 
 #ifndef __fallthrough
diff --git a/src/commonlib/include/commonlib/helpers.h b/src/commonlib/include/commonlib/helpers.h
index b073e0e492..c294bee117 100644
--- a/src/commonlib/include/commonlib/helpers.h
+++ b/src/commonlib/include/commonlib/helpers.h
@@ -34,10 +34,6 @@
 	const __typeof__(((type *)0)->member) *__mptr = (ptr);	\
 	(type *)((char *)__mptr - offsetof(type, member)); })
 
-#ifndef __unused
-#define __unused __attribute__((unused))
-#endif
-
 #ifndef alloca
 #define alloca(x) __builtin_alloca(x)
 #endif