Changeset 694ca93f in mainline for boot


Ignore:
Timestamp:
2011-05-01T19:34:26Z (14 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0e26444
Parents:
1ff896e (diff), 042fbe0 (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

Location:
boot
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r1ff896e r694ca93f  
    5555                cp "$$file" "$(DIST_PATH)/srv/" ; \
    5656        done
     57        for file in $(RD_LIBS) ; do \
     58                cp "$$file" "$(DIST_PATH)/lib/" ; \
     59        done
    5760        for file in $(RD_APPS) ; do \
    5861                cp "$$file" "$(DIST_PATH)/app/" ; \
    … …  
    8386        rm -f $(USPACE_PATH)/dist/srv/*
    8487        rm -rf $(USPACE_PATH)/dist/drv/*
     88        rm -f $(USPACE_PATH)/dist/lib/*
    8589        rm -f $(USPACE_PATH)/dist/app/*
    8690        rm -f $(USPACE_PATH)/dist/cfg/net/*

  • boot/Makefile.build

    r1ff896e r694ca93f  
    111111
    112112$(RAW): $(OBJECTS) $(COMPONENT_OBJECTS) $(LINK)
    113         $(LD) -N $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(COMPONENT_OBJECTS) $(OBJECTS)
     113        $(LD) -n $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@ $(COMPONENT_OBJECTS) $(OBJECTS)
    114114
    115115$(LINK): $(LINK).comp $(DEPEND)

  • boot/Makefile.common

    r1ff896e r694ca93f  
    120120RD_DRV_CFG =
    121121
     122RD_LIBS =
     123
     124ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
     125        RD_LIBS += \
     126                $(USPACE_PATH)/lib/c/libc.so0 \
     127                $(USPACE_PATH)/lib/softint/libsofti.so0
     128        RD_APPS += \
     129                $(USPACE_PATH)/app/dltest/dltest
     130endif
     131
    122132RD_APPS_ESSENTIAL = \
    123133        $(USPACE_PATH)/app/bdsh/bdsh \
    … …  
    127137RD_APPS_NON_ESSENTIAL = \
    128138        $(USPACE_PATH)/app/blkdump/blkdump \
     139        $(USPACE_PATH)/app/dltest/dltest \
     140        $(USPACE_PATH)/app/dltest2/dltest2 \
     141        $(USPACE_PATH)/app/dload/dload \
    129142        $(USPACE_PATH)/app/edit/edit \
    130143        $(USPACE_PATH)/app/ext2info/ext2info \

  • boot/arch/ia64/_link.ld.in

    r1ff896e r694ca93f  
    1111                *(.rodata);
    1212                *(.rodata.*);
    13                 *(.data);               /* initialized data */
    14                 _got = . ;
     13                *(.data .data.*);       /* initialized data */
     14                __gp = . ;
    1515                *(.got .got.*);
    1616                *(.bss);                /* uninitialized static variables */
    … …  
    2020
    2121        /DISCARD/ : {
    22                 *(.comment);
    23                 *(.note*);
     22                *(.*);
    2423        }
    2524}

  • boot/arch/ia64/src/boot.S

    r1ff896e r694ca93f  
    3434.global start
    3535start:
    36         movl gp = LOADER_ADDRESS
     36        movl gp = __gp
    3737
    3838        #
Note: See TracChangeset for help on using the changeset viewer.