Changeset 06b0211b in mainline for kernel/arch/mips32/Makefile.inc


Ignore:
Timestamp:
2013-04-29T11:29:45Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
aa2b32c
Parents:
ba4799a (diff), df956b9b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/mips32/Makefile.inc

    rba4799a r06b0211b  
    2929BFD_ARCH = mips
    3030BFD = binary
    31 GCC_CFLAGS += -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
     31GCC_CFLAGS += -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mabi=32
    3232
    3333BITS = 32
     
    3636#
    3737
    38 ifeq ($(MACHINE),lgxemul)
    39         BFD_NAME = elf32-tradlittlemips
    40         ENDIANESS = LE
    41 endif
    42 ifeq ($(MACHINE),bgxemul)
    43         BFD_NAME = elf32-tradbigmips
    44         ENDIANESS = BE
    45         GCC_CFLAGS += -D__BE__
    46 endif
    4738ifeq ($(MACHINE),msim)
    4839        BFD_NAME = elf32-tradlittlemips
    4940        ENDIANESS = LE
     41        GCC_CFLAGS += -march=r4000
     42endif
     43ifeq ($(MACHINE),bmalta)
     44        BFD_NAME = elf32-tradbigmips
     45        ENDIANESS = BE
     46        GCC_CFLAGS += -D__BE__ -march=4kc
     47endif
     48ifeq ($(MACHINE),lmalta)
     49        BFD_NAME = elf32-tradlittlemips
     50        ENDIANESS = LE
     51        GCC_CFLAGS += -march=4kc
    5052endif
    5153
     
    6971        arch/$(KARCH)/src/fpu_context.c \
    7072        arch/$(KARCH)/src/ddi/ddi.c \
    71         arch/$(KARCH)/src/smp/dorder.c \
    72         arch/$(KARCH)/src/smp/smp.c
     73        arch/$(KARCH)/src/smp/smp.c \
     74        arch/$(KARCH)/src/machine_func.c
     75
     76ifeq ($(MACHINE),msim)
     77        ARCH_SOURCES += \
     78                arch/$(KARCH)/src/smp/dorder.c
     79endif
     80
     81ifeq ($(MACHINE),$(filter lmalta bmalta,$(MACHINE)))
     82        ARCH_SOURCES += arch/$(KARCH)/src/mach/malta/malta.c
     83endif
     84ifeq ($(MACHINE),msim)
     85        ARCH_SOURCES += arch/$(KARCH)/src/mach/msim/msim.c
     86endif
     87
Note: See TracChangeset for help on using the changeset viewer.