Changeset 53ad43c in mainline for boot/arch


Ignore:
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
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/arm32/include/arch/arch.h

    re0a4686 r53ad43c  
    6262#endif
    6363
    64 #ifndef __ASM__
     64#ifndef __ASSEMBLER__
    6565#define PA2KA(addr)  (((uintptr_t) (addr)) + PA_OFFSET)
    6666#else

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

    re0a4686 r53ad43c  
    5555#endif
    5656
    57 #ifndef __ASM__
     57#ifndef __ASSEMBLER__
    5858#define PA2KA(addr)    (((uintptr_t) (addr)) + 0x80000000)
    5959#define PA2KSEG(addr)  (((uintptr_t) (addr)) + 0xa0000000)

  • boot/arch/mips32/src/Makefile.build

    re0a4686 r53ad43c  
    6565
    6666%.o: %.S $(DEPEND)
    67         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
     67        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
    6868ifeq ($(PRECHECK),y)
    69         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
     69        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS)
    7070endif
    7171

  • boot/arch/ppc32/include/arch/arch.h

    re0a4686 r53ad43c  
    3737#define LOADER_ADDRESS  0x08000000
    3838
    39 #ifndef __ASM__
     39#ifndef __ASSEMBLER__
    4040#define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
    4141#else

  • boot/arch/riscv64/include/arch/mm.h

    re0a4686 r53ad43c  
    3333#define BOOT_riscv64_MM_H_
    3434
    35 #ifndef __ASM__
     35#ifndef __ASSEMBLER__
    3636#define KA2PA(x)  (((uintptr_t) (x)) - UINT64_C(0xffff800000000000))
    3737#define PA2KA(x)  (((uintptr_t) (x)) + UINT64_C(0xffff800000000000))
Note: See TracChangeset for help on using the changeset viewer.