Ignore:
Timestamp:
2019-06-27T08:51:20Z (7 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8add15e0
Parents:
ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/arch/mips32/Makefile.common

    rad40b74b rbc73be3  
    3131LDFLAGS += -Wl,--gc-sections
    3232
    33 ENDIANESS = LE
    34 
    35 BFD_ARCH = mips
    36 BFD_NAME = elf32-tradlittlemips
    37 
    3833ifeq ($(MACHINE),msim)
     34        ENDIANESS = LE
    3935        COMMON_CFLAGS += -march=r4000
    4036endif
    4137
    4238ifeq ($(MACHINE),lmalta)
     39        ENDIANESS = LE
    4340        COMMON_CFLAGS += -march=4kc
    4441endif
    4542
     43ifeq ($(MACHINE),bmalta)
     44        ENDIANESS = BE
     45        COMMON_CFLAGS += -march=4kc
     46endif
Note: See TracChangeset for help on using the changeset viewer.