diff --git a/src/soc/amd/common/block/apob/apob_cache.c b/src/soc/amd/common/block/apob/apob_cache.c
index 06dc597..713826a 100644
--- a/src/soc/amd/common/block/apob/apob_cache.c
+++ b/src/soc/amd/common/block/apob/apob_cache.c
@@ -113,7 +113,7 @@
 }
 
 static struct apob_thread_context {
-	uint8_t buffer[DEFAULT_MRC_CACHE_SIZE] __attribute__((aligned(64)));
+	uint8_t buffer[DEFAULT_MRC_CACHE_SIZE] __aligned(64);
 	struct thread_handle handle;
 	struct region_device apob_rdev;
 } global_apob_thread;
diff --git a/src/soc/amd/common/block/include/amdblocks/psp_efs.h b/src/soc/amd/common/block/include/amdblocks/psp_efs.h
index 02f027c..d0b9b01 100644
--- a/src/soc/amd/common/block/include/amdblocks/psp_efs.h
+++ b/src/soc/amd/common/block/include/amdblocks/psp_efs.h
@@ -24,7 +24,7 @@
 struct second_gen_efs { /* todo: expand for Server products */
 	uint32_t gen:1; /* Client products only use bit 0 */
 	uint32_t reserved:31;
-} __attribute__((packed));
+} __packed;
 
 #define EFS_SECOND_GEN 0
 
@@ -59,7 +59,7 @@
 	uint8_t reserved_4Ah;
 	uint8_t reserved_4Bh;
 	uint32_t reserved_4Ch;
-} __attribute__((packed, aligned(16)));
+} __packed __aligned(16);
 
 bool read_efs_spi_settings(uint8_t *mode, uint8_t *speed);
 
diff --git a/src/soc/amd/common/block/psp/psp_def.h b/src/soc/amd/common/block/psp/psp_def.h
index 773a944..9def98b 100644
--- a/src/soc/amd/common/block/psp/psp_def.h
+++ b/src/soc/amd/common/block/psp/psp_def.h
@@ -58,7 +58,7 @@
 
 struct mbox_default_buffer {	/* command-response buffer unused by command */
 	struct mbox_buffer_header header;
-} __attribute__((packed, aligned(32)));
+} __packed __aligned(32);
 
 struct smm_req_buffer {
 	uint64_t smm_base;		/* TSEG base */
@@ -76,17 +76,17 @@
 struct mbox_cmd_smm_info_buffer {
 	struct mbox_buffer_header header;
 	struct smm_req_buffer req;
-} __attribute__((packed, aligned(32)));
+} __packed __aligned(32);
 
 struct mbox_cmd_sx_info_buffer {
 	struct mbox_buffer_header header;
 	u8 sleep_type;
-} __attribute__((packed, aligned(32)));
+} __packed __aligned(32);
 
 struct mbox_cmd_late_spl_buffer {
 	struct mbox_buffer_header header;
 	uint32_t	spl_value;
-} __attribute__((packed, aligned(32)));
+} __packed __aligned(32);
 
 struct dtpm_config {
 	uint32_t gpio;
diff --git a/src/soc/amd/common/block/psp/psp_smm.c b/src/soc/amd/common/block/psp/psp_smm.c
index 49e48e3..2112e86 100644
--- a/src/soc/amd/common/block/psp/psp_smm.c
+++ b/src/soc/amd/common/block/psp/psp_smm.c
@@ -16,11 +16,11 @@
 
 struct {
 	u8 buffer[C2P_BUFFER_MAXSIZE];
-} __attribute__((aligned(32))) c2p_buffer;
+} __aligned(32) c2p_buffer;
 
 struct {
 	u8 buffer[P2C_BUFFER_MAXSIZE];
-} __attribute__((aligned(32))) p2c_buffer;
+} __aligned(32) p2c_buffer;
 
 static uint32_t smm_flag; /* Non-zero for SMM, clear when not */
 
diff --git a/src/soc/amd/common/psp_verstage/vboot_crypto.c b/src/soc/amd/common/psp_verstage/vboot_crypto.c
index 8c1f313..b2c0c56 100644
--- a/src/soc/amd/common/psp_verstage/vboot_crypto.c
+++ b/src/soc/amd/common/psp_verstage/vboot_crypto.c
@@ -15,7 +15,7 @@
 
 static struct sha_generic_data sha_op;
 static uint32_t sha_op_size_remaining;
-static uint8_t __attribute__((aligned(32))) sha_hash[64];
+static uint8_t __aligned(32) sha_hash[64];
 
 vb2_error_t vb2ex_hwcrypto_digest_init(enum vb2_hash_algorithm hash_alg, uint32_t data_size)
 {