Changeset 3375bd4 in mainline for boot


Ignore:
Timestamp:
2011-05-17T07:44:17Z (15 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
04c418d, 2586860, 5e6e50b
Parents:
72cd53d (diff), 0d8a304 (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

Conflicts:
kernel/generic/src/console/console.c

size of klog, taken upstream

uspace/app/klog/klog.c

taken upstream (upstream fixed the broken output on huge load)

uspace/app/tester/Makefile
uspace/app/tester/tester.c
uspace/app/tester/tester.h

merged without problems

uspace/lib/c/include/as.h

merged without problems (upstream use bare declarations)

Also needed to fix some missing includes.

Location:
boot
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r72cd53d r3375bd4  
    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

    r72cd53d r3375bd4  
    4040        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    4141        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
    42         -Werror-implicit-function-declaration -Wwrite-strings \
     42        -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
    4343        -pipe
    4444
    … …  
    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

    r72cd53d r3375bd4  
    118118RD_DRV_CFG =
    119119
     120RD_LIBS =
     121
     122ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
     123        RD_LIBS += \
     124                $(USPACE_PATH)/lib/c/libc.so0 \
     125                $(USPACE_PATH)/lib/softint/libsofti.so0
     126        RD_APPS += \
     127                $(USPACE_PATH)/app/dltest/dltest
     128endif
     129
    120130RD_APPS_ESSENTIAL = \
    121131        $(USPACE_PATH)/app/bdsh/bdsh \
    … …  
    124134
    125135RD_APPS_NON_ESSENTIAL = \
     136        $(USPACE_PATH)/app/dltest/dltest \
     137        $(USPACE_PATH)/app/dltest2/dltest2 \
     138        $(USPACE_PATH)/app/dload/dload \
    126139        $(USPACE_PATH)/app/edit/edit \
    127140        $(USPACE_PATH)/app/kill/kill \

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

    r72cd53d r3375bd4  
    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

    r72cd53d r3375bd4  
    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.