Changeset b2fb47f in mainline


Ignore:
Timestamp:
2011-04-13T19:40:50Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8b655705, e5a015b
Parents:
17279ead (diff), 18ba2e4f (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 from lp:~jakub/helenos/ia64-revival.

Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r17279ead rb2fb47f  
    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

    r17279ead rb2fb47f  
    3434.global start
    3535start:
    36         movl gp = LOADER_ADDRESS
     36        movl gp = __gp
    3737
    3838        #

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

    r17279ead rb2fb47f  
    3030                hardcoded_kdata_size = .;
    3131                QUAD(kdata_end - kdata_start);
     32                __gp = .;
    3233                *(.got .got.*)
    3334                *(.sdata)

  • kernel/arch/ia64/src/ivt.S

    r17279ead rb2fb47f  
    391391
    392392    /* 10. call handler */
    393         movl r1 = kernel_image_start
     393        movl r1 = __gp
    394394   
    395395        mov b1 = loc2

  • kernel/arch/ia64/src/start.S

    r17279ead rb2fb47f  
    174174       
    175175        # Initialize gp (Global Pointer) register
    176         movl gp = kernel_image_start
     176        movl gp = __gp
    177177       
    178         #       
     178        #
    179179        # Initialize bootinfo on BSP.
    180180        #

  • uspace/lib/c/arch/ia64/_link.ld.in

    r17279ead rb2fb47f  
    2222       
    2323        .got : {
    24                 _gp = .;
     24                /* Tell the linker where we expect GP to point. */
     25                __gp = .;
    2526                *(.got .got.*);
    2627        } :data

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

    r17279ead rb2fb47f  
    3939__entry:
    4040        alloc loc0 = ar.pfs, 0, 1, 2, 0
    41         movl gp = _gp
     41        movl gp = __gp
    4242       
    4343        # Pass PCB pointer as the first argument to __main

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

    r17279ead rb2fb47f  
    3737        alloc loc0 = ar.pfs, 0, 1, 1, 0
    3838
    39         movl gp = _gp
     39        movl gp = __gp
    4040       
    4141        #

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

    r17279ead rb2fb47f  
    2828       
    2929        .got : {
    30                 _gp = .;
     30                /* Tell the linker where we expect GP to point. */
     31                __gp = .;
    3132                *(.got .got.*);
    3233        } :data
Note: See TracChangeset for help on using the changeset viewer.