Changeset 59b2adb in mainline


Ignore:
Timestamp:
2009-01-06T21:14:07Z (16 years ago)
Author:
Jiri Svoboda <jirik.svoboda@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5f8fd72
Parents:
acee917
Message:

Fix loader problem on ia64 and remove workaround.

Files:
4 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/ia64/loader/Makefile

    racee917 r59b2adb  
    9797        $(USPACEDIR)/srv/devmap/devmap \
    9898        $(USPACEDIR)/srv/rd/rd \
    99         $(USPACEDIR)/srv/vfs/vfs \
    100         $(USPACEDIR)/srv/fb/fb \
    101         $(USPACEDIR)/srv/kbd/kbd
     99        $(USPACEDIR)/srv/vfs/vfs
    102100ifeq ($(RDFMT),tmpfs)
    103101        COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
    … …  
    106104        COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
    107105endif
    108 COMPONENTS += \
    109         $(USPACEDIR)/srv/console/console
    110106
    111107RD_SRVS = \
     108        $(USPACEDIR)/srv/fb/fb \
     109        $(USPACEDIR)/srv/kbd/kbd \
     110        $(USPACEDIR)/srv/console/console \
    112111        $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
    113112        $(USPACEDIR)/srv/fs/fat/fat

  • uspace/lib/libc/arch/ia64/src/entry.s

    racee917 r59b2adb  
    3939__entry:
    4040        alloc loc0 = ar.pfs, 0, 1, 2, 0
    41         mov r1 = _gp
     41        movl r1 = _gp
    4242
    4343        # Pass PCB pointer as the first argument to __main

  • uspace/lib/libc/arch/ia64/src/thread_entry.s

    racee917 r59b2adb  
    3737        alloc loc0 = ar.pfs, 0, 1, 1, 0
    3838
    39         mov r1 = _gp
     39        movl r1 = _gp
    4040       
    4141        #

  • uspace/srv/loader/arch/ia64/_link.ld.in

    racee917 r59b2adb  
    1313        } :interp
    1414
    15         . = 0x00084000 + SIZEOF_HEADERS;
     15        /* On Itanium code sections must be aligned to 16 bytes. */
     16        . = ALIGN(0x800000000 + SIZEOF_HEADERS, 16);
    1617
    1718        .init : {
    18                 LONG(0);
    19                 LONG(0);
    20                 LONG(0);
    21                 LONG(0);
    22                 LONG(0);
    23                 LONG(0);
    2419                *(.init);
    2520        } : text
Note: See TracChangeset for help on using the changeset viewer.