diff --git a/include/toolchain/gcc.h b/include/toolchain/gcc.h
index 6212ce0ae89..e9b167faca9 100644
--- a/include/toolchain/gcc.h
+++ b/include/toolchain/gcc.h
@@ -99,9 +99,17 @@ __extension__ ({							\
 
 #define _GENERIC_SECTION(segment) __attribute__((section(#segment)))
 
+/*
+ * Do not use either PACK_STRUCT or ALIGN_STRUCT(x).
+ * Use __packed or __aligned(x) instead.
+ */
+
 #define PACK_STRUCT     __attribute__((__packed__))
 #define ALIGN_STRUCT(x) __attribute__((aligned(x)))
 
+#define __packed        __attribute__((__packed__))
+#define __aligned(x)    __attribute__((aligned(x)))
+
 #define ARG_UNUSED(x) (void)(x)
 
 #define likely(x)   __builtin_expect((long)!!(x), 1L)