Ignore:
Timestamp:
2011-03-30T17:25:52Z (14 years ago)
Author:
Jerome Portal <jeromeportal1@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1e2629f
Parents:
e3a3e3ad (diff), 917a8c8 (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    re3a3e3ad rbeb6b3d  
    2626       
    2727        .text : {
    28                 *(.text);
    29                 *(.rodata*);
     28                *(.text .text.*);
     29                *(.rodata .rodata.*);
    3030        } :text
    3131       
Note: See TracChangeset for help on using the changeset viewer.