Ignore:
Timestamp:
2019-06-27T08:51:20Z (7 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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/ppc32/Makefile.common

    rad40b74b rbc73be3  
    3333endif
    3434
    35 COMMON_CFLAGS += -mcpu=powerpc -m$(FLOATS)-float -m32
    36 AFLAGS += -a32
    37 LDFLAGS += -Wl,--gc-sections
     35COMMON_CFLAGS += -mcpu=powerpc -m$(FLOATS)-float -m32 -Wa,-a32
     36LDFLAGS += -Wl,--gc-sections -Wl,-z,max-page-size=0x1000
    3837
    3938ENDIANESS = BE
    4039
    41 BFD_NAME = elf32-powerpc
    42 BFD_ARCH = powerpc:common
Note: See TracChangeset for help on using the changeset viewer.