diff --git a/src/lib/program.ld b/src/lib/program.ld
index 17aa3db72c..88a3126038 100644
--- a/src/lib/program.ld
+++ b/src/lib/program.ld
@@ -15,10 +15,7 @@
 	_text = .;
 	*(.text._start);
 	*(.text.stage_entry);
-#if (ENV_DECOMPRESSOR || ENV_BOOTBLOCK && \
-		!CONFIG(COMPRESS_BOOTBLOCK)) && \
-    !(CONFIG(ARCH_BOOTBLOCK_X86_32) || \
-      CONFIG(ARCH_BOOTBLOCK_X86_64))
+#if !ENV_X86 && (ENV_DECOMPRESSOR || ENV_BOOTBLOCK && !CONFIG(COMPRESS_BOOTBLOCK))
 	KEEP(*(.id));
 #endif
 	*(.text);