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/sparc64/Makefile.common

    rad40b74b rbc73be3  
    3939ENDIANESS = BE
    4040
    41 BFD_NAME = elf64-sparc
    42 BFD_ARCH = sparc
    4341
    4442ifeq ($(PROCESSOR),us)
     
    5250ifeq ($(PROCESSOR),sun4v)
    5351        DEFS += -DSUN4V
     52        COMMON_CFLAGS += -Wl,-z,max-page-size=0x2000
     53else
     54        COMMON_CFLAGS += -Wl,-z,max-page-size=0x4000
    5455endif
Note: See TracChangeset for help on using the changeset viewer.