Changeset 53ad43c in mainline for boot/arch/mips32

Timestamp:

2018-03-08T18:54:30Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5ef16903

Parents:

e0a4686

Message:

Replace ASM macro with the standard ASSEMBLER.

At least, GCC claims it to be a standard predefined macro. I was unable
to find the relevant standard, but it's defined in both gcc and clang.

Location:

boot/arch/mips32

Files:

• include/arch/arch.h (modified) (1 diff)
• src/Makefile.build (modified) (1 diff)

boot/arch/mips32/include/arch/arch.h

@@ -55 +55 @@
 #endif
 
-#ifndef __ASM__
+#ifndef __ASSEMBLER__
 #define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
 #define PA2KSEG(addr)  (((uintptr_t) (addr)) + 0xa0000000)

boot/arch/mips32/src/Makefile.build

@@ -65 +65 @@
 
 %.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