Index: boot/arch/arm32/include/arch/arch.h
===================================================================
--- boot/arch/arm32/include/arch/arch.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ boot/arch/arm32/include/arch/arch.h	(revision 6c87f3a34f7e36abc7f9987485446ede08d5d3fe)
@@ -62,5 +62,5 @@
 #endif
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #define PA2KA(addr)  (((uintptr_t) (addr)) + PA_OFFSET)
 #else
Index: boot/arch/mips32/include/arch/arch.h
===================================================================
--- boot/arch/mips32/include/arch/arch.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ boot/arch/mips32/include/arch/arch.h	(revision 6c87f3a34f7e36abc7f9987485446ede08d5d3fe)
@@ -55,5 +55,5 @@
 #endif
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
 #define PA2KSEG(addr)  (((uintptr_t) (addr)) + 0xa0000000)
Index: boot/arch/mips32/src/Makefile.build
===================================================================
--- boot/arch/mips32/src/Makefile.build	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ boot/arch/mips32/src/Makefile.build	(revision 6c87f3a34f7e36abc7f9987485446ede08d5d3fe)
@@ -65,7 +65,7 @@
 
 %.o: %.S $(DEPEND)
-	$(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
+	$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
 ifeq ($(PRECHECK),y)
-	$(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
+	$(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS)
 endif
 
Index: boot/arch/ppc32/include/arch/arch.h
===================================================================
--- boot/arch/ppc32/include/arch/arch.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ boot/arch/ppc32/include/arch/arch.h	(revision 6c87f3a34f7e36abc7f9987485446ede08d5d3fe)
@@ -37,5 +37,5 @@
 #define LOADER_ADDRESS  0x08000000
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
 #else
Index: boot/arch/riscv64/include/arch/mm.h
===================================================================
--- boot/arch/riscv64/include/arch/mm.h	(revision f1380b76772fb5d1aa03637b5e57bd9b929fea61)
+++ boot/arch/riscv64/include/arch/mm.h	(revision 6c87f3a34f7e36abc7f9987485446ede08d5d3fe)
@@ -33,5 +33,5 @@
 #define BOOT_riscv64_MM_H_
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
 #define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))