Changeset 72d120e in mainline for boot


Ignore:
Timestamp:
2014-06-16T20:17:44Z (12 years ago)
Author:
Agnieszka Tabaka <nufcia@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5a78e4e
Parents:
9d653e3 (diff), 334bf28 (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:

Integrate from mainline.

Location:
boot
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    r9d653e3 r72d120e  
    219219        $(USPACE_PATH)/app/df/df
    220220
    221 ifeq ($(CONFIG_PCC),y)
    222 RD_APPS_NON_ESSENTIAL += \
    223         $(USPACE_PATH)/app/cc/cc \
    224         $(USPACE_PATH)/app/ccom/ccom \
    225         $(USPACE_PATH)/app/ccom/mkext/cc_mkext \
    226         $(USPACE_PATH)/app/cpp/cpp
    227 endif
    228 
    229 ifeq ($(CONFIG_BINUTILS),y)
    230 RD_APPS_NON_ESSENTIAL += \
    231         $(USPACE_PATH)/app/binutils/bin/as \
    232         $(USPACE_PATH)/app/binutils/bin/ld
    233 endif
    234 
    235 ifeq ($(CONFIG_MSIM),y)
    236 RD_APPS_NON_ESSENTIAL += \
    237         $(USPACE_PATH)/app/msim/msim
    238 endif
    239 
    240221COMPONENTS = \
    241222        $(KERNEL_PATH)/kernel.bin \

  • boot/arch/ia64/Makefile.inc

    r9d653e3 r72d120e  
    3131BFD_ARCH = ia64
    3232
    33 #
    34 # FIXME:
    35 #
    36 # The -fno-selective-scheduling and -fno-selective-scheduling2 options
    37 # should be removed as soon as a bug in GCC concerning unchecked
    38 # speculative loads is fixed.
    39 #
    40 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53975 for reference.
    41 #
    42 
    4333BITS = 64
    4434ENDIANESS = LE
    45 EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata -fno-selective-scheduling -fno-selective-scheduling2
     35EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
    4636
    4737RD_SRVS_NON_ESSENTIAL +=

  • boot/genarch/src/ofw.c

    r9d653e3 r72d120e  
    377377            (map->cnt < MEMMAP_MAX_RECORDS); pos += ac + sc) {
    378378                void *start = (void *) (buf[pos + ac - 1]);
    379                 uint32_t size = buf[pos + ac + sc - 1];
     379                uintptr_t size = buf[pos + ac + sc - 1];
    380380               
    381381                /*
Note: See TracChangeset for help on using the changeset viewer.